diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:21:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:21:01 -0500 |
commit | 50a30657fd7ee77a94a6bf0ad86eba7c37c3032e (patch) | |
tree | 7eb9165881b9082588eb2c373e9ed2ebc013321e /net/key | |
parent | c78371441c0d957f54c9f8a35b3ee5a378d14808 (diff) |
netns xfrm: per-netns km_waitq
Disallow spurious wakeups in __xfrm_lookup().
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index bde8aad4cc93..f202ba6c8dcb 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -1411,7 +1411,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, struct sadb_msg * | |||
1411 | spin_lock_bh(&x->lock); | 1411 | spin_lock_bh(&x->lock); |
1412 | if (x->km.state == XFRM_STATE_ACQ) { | 1412 | if (x->km.state == XFRM_STATE_ACQ) { |
1413 | x->km.state = XFRM_STATE_ERROR; | 1413 | x->km.state = XFRM_STATE_ERROR; |
1414 | wake_up(&km_waitq); | 1414 | wake_up(&init_net.xfrm.km_waitq); |
1415 | } | 1415 | } |
1416 | spin_unlock_bh(&x->lock); | 1416 | spin_unlock_bh(&x->lock); |
1417 | xfrm_state_put(x); | 1417 | xfrm_state_put(x); |