aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@intel.com>2007-06-24 02:09:23 -0400
committerDavid S. Miller <davem@davemloft.net>2007-06-24 02:09:23 -0400
commit515e06c4556bd8388db6b2bb2cd8859126932946 (patch)
tree6585ad45e803219a3d635836afddb8eeab35b282 /net/core
parentddb61a57bb6df673986e6476407f97d28b02031f (diff)
[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 <shannon.nelson@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 26090621ea6b..ee051bb398a0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2009,6 +2009,7 @@ static void net_rx_action(struct softirq_action *h)
2009 } 2009 }
2010 } 2010 }
2011out: 2011out:
2012 local_irq_enable();
2012#ifdef CONFIG_NET_DMA 2013#ifdef CONFIG_NET_DMA
2013 /* 2014 /*
2014 * There may not be any more sk_buffs coming right now, so push 2015 * There may not be any more sk_buffs coming right now, so push
@@ -2022,7 +2023,6 @@ out:
2022 rcu_read_unlock(); 2023 rcu_read_unlock();
2023 } 2024 }
2024#endif 2025#endif
2025 local_irq_enable();
2026 return; 2026 return;
2027 2027
2028softnet_break: 2028softnet_break: