diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-08 02:53:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-08 18:45:27 -0400 |
| commit | 9785e10aedfa0fad5c1aac709dce5ada1b123783 (patch) | |
| tree | ca523e084318b6e908b18c6f3e9e53ea7e9a1c49 /net/netlink/genetlink.c | |
| parent | 16fa9e1d104e6f2c18005a4ac7ea60e4c7fc1286 (diff) | |
netlink: kill netlink_set_nonroot
Replace netlink_set_nonroot by one new field `flags' in
struct netlink_kernel_cfg that is passed to netlink_kernel_create.
This patch also renames NL_NONROOT_* to NL_CFG_F_NONROOT_* since
now the flags field in nl_table is generic (so we can add more
flags if needed in the future).
Also adjust all callers in the net-next tree to use these flags
instead of netlink_set_nonroot.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/genetlink.c')
| -rw-r--r-- | net/netlink/genetlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index fda497412fc..c1b71aef9f7 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -918,6 +918,7 @@ static int __net_init genl_pernet_init(struct net *net) struct netlink_kernel_cfg cfg = { .input = genl_rcv, .cb_mutex = &genl_mutex, + .flags = NL_CFG_F_NONROOT_RECV, }; /* we'll bump the group number right afterwards */ @@ -955,8 +956,6 @@ static int __init genl_init(void) if (err < 0) goto problem; - netlink_set_nonroot(NETLINK_GENERIC, NL_NONROOT_RECV); - err = register_pernet_subsys(&genl_pernet_ops); if (err) goto problem; |