From: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>

Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/net/core/pktgen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN net/core/pktgen.c~kill-softirq_pending-fix net/core/pktgen.c
--- 25/net/core/pktgen.c~kill-softirq_pending-fix	2005-01-22 18:31:17.718109528 -0800
+++ 25-akpm/net/core/pktgen.c	2005-01-22 18:31:17.723108768 -0800
@@ -2801,7 +2801,7 @@ static void pktgen_thread_worker(struct 
 			tx_since_softirq += pkt_dev->last_ok;
 
 			if (tx_since_softirq > max_before_softirq) {
-				if(softirq_pending(smp_processor_id()))  
+				if (local_softirq_pending())
 					do_softirq();
 				tx_since_softirq = 0;
 			}
_