From 515e06c4556bd8388db6b2bb2cd8859126932946 Mon Sep 17 00:00:00 2001 From: Shannon Nelson Date: Sat, 23 Jun 2007 23:09:23 -0700 Subject: [PATCH] [NET]: Re-enable irqs before pushing pending DMA requests This moves the local_irq_enable() call in net_rx_action() to before calling the CONFIG_NET_DMA's dma_async_memcpy_issue_pending() rather than after. This shortens the irq disabled window and allows for DMA drivers that need to do their own irq hold. Signed-off-by: Shannon Nelson Signed-off-by: David S. Miller --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 26090621ea6b6b..ee051bb398a02f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2009,6 +2009,7 @@ static void net_rx_action(struct softirq_action *h) } } out: + local_irq_enable(); #ifdef CONFIG_NET_DMA /* * There may not be any more sk_buffs coming right now, so push @@ -2022,7 +2023,6 @@ static void net_rx_action(struct softirq_action *h) rcu_read_unlock(); } #endif - local_irq_enable(); return; softnet_break: