projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus'
[powerpc.git]
/
net
/
key
/
af_key.c
diff --git
a/net/key/af_key.c
b/net/key/af_key.c
index
ae86d23
..
8595822
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;
if (err < 0) {
x->km.state = XFRM_STATE_DEAD;
- xfrm_state_put(x);
+
__
xfrm_state_put(x);
goto out;
}
goto out;
}
@@
-2651,6
+2651,8
@@
static int pfkey_send_notify(struct xfrm_state *x, struct km_event *c)
return key_notify_sa(x, c);
case XFRM_MSG_FLUSHSA:
return key_notify_sa_flush(c);
return key_notify_sa(x, c);
case XFRM_MSG_FLUSHSA:
return key_notify_sa_flush(c);
+ case XFRM_MSG_NEWAE: /* not yet supported */
+ break;
default:
printk("pfkey: Unknown SA event %d\n", c->event);
break;
default:
printk("pfkey: Unknown SA event %d\n", c->event);
break;
@@
-3078,9
+3080,9
@@
static int pfkey_sendmsg(struct kiocb *kiocb,
if (!hdr)
goto out;
if (!hdr)
goto out;
-
down(&xfrm_cfg_sem
);
+
mutex_lock(&xfrm_cfg_mutex
);
err = pfkey_process(sk, skb, hdr);
err = pfkey_process(sk, skb, hdr);
-
up(&xfrm_cfg_sem
);
+
mutex_unlock(&xfrm_cfg_mutex
);
out:
if (err && hdr && pfkey_error(hdr, err, sk) == 0)
out:
if (err && hdr && pfkey_error(hdr, err, sk) == 0)