mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[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>
This commit is contained in:
Pavel Emelyanov 2008-04-16 00:55:06 -07:00 committed by David S. Miller
parent 7a17a2f79f
commit 65d292a2ef
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/8021q/vlan.c
View File

@ -340,6 +340,7 @@ static int register_vlan_device(struct net_device *real_dev,
if (new_dev == NULL) if (new_dev == NULL)
return -ENOBUFS; return -ENOBUFS;
dev_net_set(new_dev, net);
/* need 4 bytes for extra VLAN header info, /* need 4 bytes for extra VLAN header info,
* hope the underlying device can handle it. * hope the underlying device can handle it.
*/ */
@ -406,9 +407,6 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
int i, flgs; int i, flgs;
struct net_device *vlandev; struct net_device *vlandev;
if (dev_net(dev) != &init_net)
return NOTIFY_DONE;
if (is_vlan_dev(dev)) { if (is_vlan_dev(dev)) {
__vlan_device_event(dev, event); __vlan_device_event(dev, event);
goto out; goto out;
@ -534,7 +532,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
case GET_VLAN_REALDEV_NAME_CMD: case GET_VLAN_REALDEV_NAME_CMD:
case GET_VLAN_VID_CMD: case GET_VLAN_VID_CMD:
err = -ENODEV; err = -ENODEV;
dev = __dev_get_by_name(&init_net, args.device1); dev = __dev_get_by_name(net, args.device1);
if (!dev) if (!dev)
goto out; goto out;
@ -665,6 +663,7 @@ static void vlan_exit_net(struct net *net)
struct vlan_net *vn; struct vlan_net *vn;
vn = net_generic(net, vlan_net_id); vn = net_generic(net, vlan_net_id);
rtnl_kill_links(net, &vlan_link_ops);
vlan_proc_cleanup(net); vlan_proc_cleanup(net);
kfree(vn); kfree(vn);
} }

3
net/8021q/vlan_dev.c
View File

@ -153,9 +153,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
struct net_device_stats *stats; struct net_device_stats *stats;
unsigned short vlan_TCI; unsigned short vlan_TCI;
if (dev_net(dev) != &init_net)
goto err_free;
skb = skb_share_check(skb, GFP_ATOMIC); skb = skb_share_check(skb, GFP_ATOMIC);
if (skb == NULL) if (skb == NULL)
goto err_free; goto err_free;

2
net/8021q/vlan_netlink.c
View File

@ -113,7 +113,7 @@ static int vlan_newlink(struct net_device *dev,
if (!tb[IFLA_LINK]) if (!tb[IFLA_LINK])
return -EINVAL; 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) if (!real_dev)
return -ENODEV; return -ENODEV;