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

into kernel.bkbits.net:/home/davem/net-2.6

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
40c7d502 · David S. Miller · 4112c3d3 · 4abdd528 · 40c7d502
Commit 40c7d502 authored Mar 18, 2004 by David S. Miller
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: