diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
| commit | 9f5a405b6843933c1cae5826046a5dd6357f142a (patch) | |
| tree | bcdbb0175d37b780551b71c40abcde964a8905eb /net/key/af_key.c | |
| parent | b7cffb028abbffff3ba0b87268ecb775ed354049 (diff) | |
| parent | 051d3cbd96909b2fe6b5038e7bbe77f41356db05 (diff) | |
Merge branch 'from-linus'
Diffstat (limited to 'net/key/af_key.c')
| -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 ae86d237a456..b2d4d1dd2116 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -1423,7 +1423,7 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, | |||
| 1423 | 1423 | ||
| 1424 | if (err < 0) { | 1424 | if (err < 0) { |
| 1425 | x->km.state = XFRM_STATE_DEAD; | 1425 | x->km.state = XFRM_STATE_DEAD; |
| 1426 | xfrm_state_put(x); | 1426 | __xfrm_state_put(x); |
| 1427 | goto out; | 1427 | goto out; |
| 1428 | } | 1428 | } |
| 1429 | 1429 | ||