diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-19 22:51:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-11-19 22:51:24 -0800 |
| commit | 1f8170b0ecd8363847792b3b1f269e9d8e10391a (patch) | |
| tree | 5b95a155c43486007e83ead6e7d76c8c6b9d089e | |
| parent | 9055fa1f3ded5ad858a55ae18439ed55227ee7eb (diff) | |
| download | op-kernel-dev-1f8170b0ecd8363847792b3b1f269e9d8e10391a.zip op-kernel-dev-1f8170b0ecd8363847792b3b1f269e9d8e10391a.tar.gz | |
[PKTGEN]: Fix double unlock of xfrm_state->lock
The pktgen_output_ipsec() function can unlock this lock twice
due to merged error and plain paths. Remove one of the calls
to spin_unlock.
Other possible solution would be to place "return 0" right
after the first unlock, but at this place the err is known
to be 0, so these solutions are the same except for this one
makes the code shorter.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/pktgen.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index de33f36..285ec3e 100644 --- a/net/core/pktgen.c +++ b/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; |
