diff --git a/[refs] b/[refs] index 9edac7cfae1c..2858f4c4179e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9055fa1f3ded5ad858a55ae18439ed55227ee7eb +refs/heads/master: 1f8170b0ecd8363847792b3b1f269e9d8e10391a diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index de33f36947e9..285ec3ed9b37 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -2463,8 +2463,6 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev) x->curlft.bytes +=skb->len; x->curlft.packets++; - spin_unlock(&x->lock); - error: spin_unlock(&x->lock); return err;