summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-03-18 22:20:52 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2004-03-18 22:20:52 -0800
commit4abdd5284c07bcc46cbc3d0160c481bb6a316f1f (patch)
tree620377ff28aec14dc4f43ab49fe569fd20ada835
parent27cd7e0feb7d4e8ddc87296bf30ad0de3b19f4c0 (diff)
[NET]: Preemption disabling is superfluous in net_rx_action().
Noticed by Jan Glauber, confirmed by Stephen Hemminger.
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 201878db9853..e5a87037af19 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1836,7 +1836,6 @@ static void net_rx_action(struct softirq_action *h)
int budget = netdev_max_backlog;
- preempt_disable();
local_irq_disable();
while (!list_empty(&queue->poll_list)) {
@@ -1865,7 +1864,6 @@ static void net_rx_action(struct softirq_action *h)
}
out:
local_irq_enable();
- preempt_enable();
return;
softnet_break: