1 files changed, 3 insertions, 5 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7bae576ac115..36fdea71d742 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -380,7 +380,6 @@ struct pktgen_thread {
         /* Field for thread to receive "posted" events terminate, stop ifs etc. */
 
         u32 control;
-        int pid;
         int cpu;
 
         wait_queue_head_t queue;
@@ -3331,8 +3330,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)) {
@@ -3462,8 +3462,6 @@ static int pktgen_thread_worker(void *arg)
 
         init_waitqueue_head(&t->queue);
 
-        t->pid = current->pid;
-
         pr_debug("pktgen: starting pktgen/%d:  pid=%d\n", cpu, current->pid);
 
         max_before_softirq = t->max_before_softirq;