projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.18' into for_next
[firefly-linux-kernel-4.4.55.git]
/
net
/
netlink
/
af_netlink.c
diff --git
a/net/netlink/af_netlink.c
b/net/netlink/af_netlink.c
index f1de72de273e20e7422bf6de42ebbca712affacf..0007b818039708bf447d74252712d93f9a8889e0 100644
(file)
--- a/
net/netlink/af_netlink.c
+++ b/
net/netlink/af_netlink.c
@@
-1440,7
+1440,7
@@
static void netlink_unbind(int group, long unsigned int groups,
return;
for (undo = 0; undo < group; undo++)
return;
for (undo = 0; undo < group; undo++)
- if (test_bit(
group
, &groups))
+ if (test_bit(
undo
, &groups))
nlk->netlink_unbind(undo);
}
nlk->netlink_unbind(undo);
}
@@
-1492,7
+1492,7
@@
static int netlink_bind(struct socket *sock, struct sockaddr *addr,
netlink_insert(sk, net, nladdr->nl_pid) :
netlink_autobind(sock);
if (err) {
netlink_insert(sk, net, nladdr->nl_pid) :
netlink_autobind(sock);
if (err) {
- netlink_unbind(nlk->ngroups
- 1
, groups, nlk);
+ netlink_unbind(nlk->ngroups, groups, nlk);
return err;
}
}
return err;
}
}
@@
-2509,6
+2509,7
@@
__netlink_kernel_create(struct net *net, int unit, struct module *module,
nl_table[unit].module = module;
if (cfg) {
nl_table[unit].bind = cfg->bind;
nl_table[unit].module = module;
if (cfg) {
nl_table[unit].bind = cfg->bind;
+ nl_table[unit].unbind = cfg->unbind;
nl_table[unit].flags = cfg->flags;
if (cfg->compare)
nl_table[unit].compare = cfg->compare;
nl_table[unit].flags = cfg->flags;
if (cfg->compare)
nl_table[unit].compare = cfg->compare;