diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-16 03:55:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-16 03:56:37 -0400 |
commit | 65d292a2ef2df66fd1ab83447afee71ef3720ded (patch) | |
tree | d3ac632109448ab07f0fef3fe767dca66d183149 /net/8021q/vlan_netlink.c | |
parent | 7a17a2f79f54a988d08ffa33ec9e1038bffec42b (diff) |
[VLAN]: Allow vlan devices registration in net namespaces.
This one is similar to what I've done for TUN - set the proper
net after device allocation and clean VLANs on net exit (use the
rtnl_kill_links helper finally).
Plus, drop explicit init_net usage and net != &init_net checks.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_netlink.c')
-rw-r--r-- | net/8021q/vlan_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index e32eeb37987e..c93e69ec28ed 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c | |||
@@ -113,7 +113,7 @@ static int vlan_newlink(struct net_device *dev, | |||
113 | 113 | ||
114 | if (!tb[IFLA_LINK]) | 114 | if (!tb[IFLA_LINK]) |
115 | return -EINVAL; | 115 | return -EINVAL; |
116 | real_dev = __dev_get_by_index(&init_net, nla_get_u32(tb[IFLA_LINK])); | 116 | real_dev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK])); |
117 | if (!real_dev) | 117 | if (!real_dev) |
118 | return -ENODEV; | 118 | return -ENODEV; |
119 | 119 | ||