diff --git a/[refs] b/[refs] index 4fe8f5f0a7ff..8e26298dcb7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a289d70d74c39a8e6938619f967fc6cd70ce1798 +refs/heads/master: 88282c6ecf0dacefda6090b0289d35e8a3cc6221 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 4ad62d375373..36fdea71d742 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/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; @@ -3463,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;