Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index ae86d237a4569b47e764db78ebe359390bc63359..b2d4d1dd2116fb64212b2c4d33f1d8a2196b42e6 100644 (file)
--- 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;
        }