aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_dev.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_dev.c
parent7a17a2f79f54a988d08ffa33ec9e1038bffec42b (diff)
downloadkernel_samsung_aries-65d292a2ef2df66fd1ab83447afee71ef3720ded.zip
kernel_samsung_aries-65d292a2ef2df66fd1ab83447afee71ef3720ded.tar.gz
kernel_samsung_aries-65d292a2ef2df66fd1ab83447afee71ef3720ded.tar.bz2
[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_dev.c')
-rw-r--r--net/8021q/vlan_dev.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4ae0d7e..c961f08 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -153,9 +153,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
struct net_device_stats *stats;
unsigned short vlan_TCI;
- if (dev_net(dev) != &init_net)
- goto err_free;
-
skb = skb_share_check(skb, GFP_ATOMIC);
if (skb == NULL)
goto err_free;