summaryrefslogtreecommitdiffstats
path: root/net/key/af_key.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-02-27 17:33:51 +0100
committerJeff Garzik <jeff@garzik.org>2006-02-27 17:33:51 +0100
commitdbfedbb98145375106cee7ec7269611d553819dc (patch)
tree81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /net/key/af_key.c
parentMerge branch 'upstream-fixes' (diff)
parentMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
downloadlinux-dbfedbb98145375106cee7ec7269611d553819dc.tar.xz
linux-dbfedbb98145375106cee7ec7269611d553819dc.zip
Merge branch 'master'
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r--net/key/af_key.c2
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,
if (err < 0) {
x->km.state = XFRM_STATE_DEAD;
- xfrm_state_put(x);
+ __xfrm_state_put(x);
goto out;
}