diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 11:12:37 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 11:12:37 +0300 |
commit | 1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch) | |
tree | 170002288786f702e1d4ca638b53d1594a7caa16 /net/netlink | |
parent | 03d85a63ee3e2d3a43460f936b86334b32f88c89 (diff) | |
parent | 8482716b9d865db34c55d4bf2fed19498e7195b9 (diff) | |
download | linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 215fc08c02ab..330ebd600f25 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -688,7 +688,7 @@ static int netlink_release(struct socket *sock) skb_queue_purge(&sk->sk_write_queue); - if (nlk->portid) { + if (nlk->portid && nlk->bound) { struct netlink_notify n = { .net = sock_net(sk), .protocol = sk->sk_protocol, |