Messages in this thread | | | Date | Mon, 28 Apr 2014 12:57:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in net/netlink/af_netlink.c between commit 5187cd055b6e ("netlink: Rename netlink_capable netlink_allowed") from the net tree and commit 4f520900522f ("netlink: have netlink per-protocol bind function return an error code") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/netlink/af_netlink.c index 81dca96d2be6,92f4b6915e89..000000000000 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@@ -1492,8 -1445,8 +1510,8 @@@ static int netlink_bind(struct socket * return -EINVAL; /* Only superuser is allowed to listen multicasts */ - if (nladdr->nl_groups) { + if (groups) { - if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV)) + if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV)) return -EPERM; err = netlink_realloc_groups(sk); if (err) [unhandled content-type:application/pgp-signature] | |