summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorFrancesco Ruggeri <fruggeri@arista.com>2014-09-17 19:40:44 +0200
committerDavid S. Miller <davem@davemloft.net>2014-09-19 23:07:20 +0200
commit0d0162e7a33d3710b9604e7c68c0f31f5c457428 (patch)
tree1605a683d6d154b868cf3f49db00454a4e131843 /drivers/net/macvlan.c
parentMerge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-0d0162e7a33d3710b9604e7c68c0f31f5c457428.tar.xz
linux-0d0162e7a33d3710b9604e7c68c0f31f5c457428.zip
net: allow macvlans to move to net namespace
I cannot move a macvlan interface created on top of a bonding interface to a different namespace: % ip netns add dummy0 % ip link add link bond0 mac0 type macvlan % ip link set mac0 netns dummy0 RTNETLINK answers: Invalid argument % The problem seems to be that commit f9399814927a ("bonding: Don't allow bond devices to change network namespaces.") sets NETIF_F_NETNS_LOCAL on bonding interfaces, and commit 797f87f83b60 ("macvlan: fix netdev feature propagation from lower device") causes macvlan interfaces to inherit its features from the lower device. NETIF_F_NETNS_LOCAL should not be inherited from the lower device by a macvlan. Patch tested on 3.16. Signed-off-by: Francesco Ruggeri <fruggeri@arista.com> Acked-by: Cong Wang <cwang@twopensource.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index a96955597755..7652fd152109 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -806,6 +806,7 @@ static netdev_features_t macvlan_fix_features(struct net_device *dev,
features,
mask);
features |= ALWAYS_ON_FEATURES;
+ features &= ~NETIF_F_NETNS_LOCAL;
return features;
}