---

yaml --- r: 64592 b: refs/heads/master c: 378be2c h: refs/heads/master v: v3
git-mirror · Aug 28, 2007 · 1217325 · 1217325
1 parent 54fb139
commit 1217325
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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)) {