Commit f2abce48 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 7bcba5b0 40c7d502
...@@ -1836,7 +1836,6 @@ static void net_rx_action(struct softirq_action *h) ...@@ -1836,7 +1836,6 @@ static void net_rx_action(struct softirq_action *h)
int budget = netdev_max_backlog; int budget = netdev_max_backlog;
preempt_disable();
local_irq_disable(); local_irq_disable();
while (!list_empty(&queue->poll_list)) { while (!list_empty(&queue->poll_list)) {
...@@ -1865,7 +1864,6 @@ static void net_rx_action(struct softirq_action *h) ...@@ -1865,7 +1864,6 @@ static void net_rx_action(struct softirq_action *h)
} }
out: out:
local_irq_enable(); local_irq_enable();
preempt_enable();
return; return;
softnet_break: 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