Commit 40c7d502 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6

into kernel.bkbits.net:/home/davem/net-2.6
parents 4112c3d3 4abdd528
......@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment