summaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_netlink.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 00:55:06 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-16 00:56:37 -0700
commit65d292a2ef2df66fd1ab83447afee71ef3720ded (patch)
treed3ac632109448ab07f0fef3fe767dca66d183149 /net/8021q/vlan_netlink.c
parent7a17a2f79f54a988d08ffa33ec9e1038bffec42b (diff)
downloadblackbird-op-linux-65d292a2ef2df66fd1ab83447afee71ef3720ded.tar.gz
blackbird-op-linux-65d292a2ef2df66fd1ab83447afee71ef3720ded.zip
[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.c2
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,
if (!tb[IFLA_LINK])
return -EINVAL;
- real_dev = __dev_get_by_index(&init_net, nla_get_u32(tb[IFLA_LINK]));
+ real_dev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));
if (!real_dev)
return -ENODEV;
OpenPOWER on IntegriCloud