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

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
f2abce48 · Linus Torvalds · 7bcba5b0 · 40c7d502 · f2abce48
Commit f2abce48 authored Mar 18, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

net/core/dev.c net/core/dev.c +0 -2

No files found.
--- 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: