diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-07 22:53:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-08 18:45:27 -0400 |
commit | 9785e10aedfa0fad5c1aac709dce5ada1b123783 (patch) | |
tree | ca523e084318b6e908b18c6f3e9e53ea7e9a1c49 /lib/kobject_uevent.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 'lib/kobject_uevent.c')
-rw-r--r-- | lib/kobject_uevent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 0401d2916d9f..c2e97787d01e 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
@@ -375,6 +375,7 @@ static int uevent_net_init(struct net *net) | |||
375 | struct uevent_sock *ue_sk; | 375 | struct uevent_sock *ue_sk; |
376 | struct netlink_kernel_cfg cfg = { | 376 | struct netlink_kernel_cfg cfg = { |
377 | .groups = 1, | 377 | .groups = 1, |
378 | .flags = NL_CFG_F_NONROOT_RECV, | ||
378 | }; | 379 | }; |
379 | 380 | ||
380 | ue_sk = kzalloc(sizeof(*ue_sk), GFP_KERNEL); | 381 | ue_sk = kzalloc(sizeof(*ue_sk), GFP_KERNEL); |
@@ -422,7 +423,6 @@ static struct pernet_operations uevent_net_ops = { | |||
422 | 423 | ||
423 | static int __init kobject_uevent_init(void) | 424 | static int __init kobject_uevent_init(void) |
424 | { | 425 | { |
425 | netlink_set_nonroot(NETLINK_KOBJECT_UEVENT, NL_NONROOT_RECV); | ||
426 | return register_pernet_subsys(&uevent_net_ops); | 426 | return register_pernet_subsys(&uevent_net_ops); |
427 | } | 427 | } |
428 | 428 | ||