aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-09-17 03:22:19 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-17 16:46:04 -0700
commit3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b (patch)
tree5603f5c9322f40d40a63efe5519c0a9bf164b972 /net/core/dev.c
parentb71c7aaa1e2a9858f0c469026098fbd6e046d7bb (diff)
downloadkernel_samsung_tuna-3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b.zip
kernel_samsung_tuna-3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b.tar.gz
kernel_samsung_tuna-3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b.tar.bz2
netns: keep vlan slaves on master netns move
previously, if a vlan master device was moved from one network namespace to another, all 802.1q and macvlan slaves were deleted. we can use dev->reg_state to figure out whether dev_change_net_namespace is happening, since that won't set dev->reg_state NETREG_UNREGISTERING. so, this changes 8021q and macvlan to ignore NETDEV_UNREGISTER when reg_state is not NETREG_UNREGISTERING. Signed-off-by: David Lamparter <equinox@diac24.net> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Daniel Lezcano <daniel.lezcano@free.fr> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index c09ff09..2c7934f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5686,6 +5686,10 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
/* Notify protocols, that we are about to destroy
this device. They should clean all the things.
+
+ Note that dev->reg_state stays at NETREG_REGISTERED.
+ This is wanted because this way 8021q and macvlan know
+ the device is just moving and can keep their slaves up.
*/
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);