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_dev.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_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4ae0d7ef62c1..c961f0826005 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, | |||
153 | struct net_device_stats *stats; | 153 | struct net_device_stats *stats; |
154 | unsigned short vlan_TCI; | 154 | unsigned short vlan_TCI; |
155 | 155 | ||
156 | if (dev_net(dev) != &init_net) | ||
157 | goto err_free; | ||
158 | |||
159 | skb = skb_share_check(skb, GFP_ATOMIC); | 156 | skb = skb_share_check(skb, GFP_ATOMIC); |
160 | if (skb == NULL) | 157 | if (skb == NULL) |
161 | goto err_free; | 158 | goto err_free; |