diff --git a/[refs] b/[refs] index b30bd460ae95..93e45ad0633a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc6cffd177f9266af38dba96a2cea06c1e7ff932 +refs/heads/master: 99c6f60e72f112b57ddb07abb2e5f771ee211f43 diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c index 9bba7ac5fee0..7470e367272b 100644 --- a/trunk/net/key/af_key.c +++ b/trunk/net/key/af_key.c @@ -3030,6 +3030,9 @@ static int key_notify_sa_expire(struct xfrm_state *x, struct km_event *c) static int pfkey_send_notify(struct xfrm_state *x, struct km_event *c) { + if (atomic_read(&pfkey_socks_nr) == 0) + return 0; + switch (c->event) { case XFRM_MSG_EXPIRE: return key_notify_sa_expire(x, c);