Merge branch 'linus'

1 files changed, 4 insertions, 2 deletions

diff --git a/net/key/af_key.c b/net/key/af_key.c
index b2d4d1dd21..859582275c 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -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);
+        case XFRM_MSG_NEWAE: /* not yet supported */
+                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;
 
-        down(&xfrm_cfg_sem);
+        mutex_lock(&xfrm_cfg_mutex);
         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)