From 1217325ff9256c722a90ff4d7e937c2c9f9004b1 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert.olsson@its.uu.se>
Date: Tue, 28 Aug 2007 15:43:14 -0700
Subject: [PATCH] --- yaml --- r: 64592 b: refs/heads/master c:
 378be2c08314fc46e3f814fa264ff8ebdb79712f h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/pktgen.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72b2af703133..025028e3629f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 594a9dfae7113d9601b2c353754c40d0b7e00a03
+refs/heads/master: 378be2c08314fc46e3f814fa264ff8ebdb79712f
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 7bae576ac115..4ad62d375373 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/net/core/pktgen.c
@@ -3331,8 +3331,9 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
 	}
 
 	if ((netif_queue_stopped(odev) ||
-	     netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) ||
-	     need_resched()) {
+	     (pkt_dev->skb &&
+	      netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping))) ||
+	    need_resched()) {
 		idle_start = getCurUs();
 
 		if (!netif_running(odev)) {