summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2016-03-01 22:19:05 +0100
committerAntonio Quartulli <a@unstable.cc>2016-05-10 18:26:44 +0800
commit0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896 (patch)
tree7755549ddcb87ec2c30d3fe2513c0c1b05c5f987 /net/batman-adv
parent7142fc107274a0ebfd31e995de61e71a1e84770f (diff)
downloadlinux-0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896.tar.gz
linux-0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896.tar.bz2
linux-0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896.zip
batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves
The batX soft interface should not be moved between network name spaces. This is similar to bridges, bonds, tunnels, which are not allowed to move between network namespaces. Suggested-by: Daniel Ehlers <danielehlers@mindeye.net> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Antonio Quartulli <a@unstable.cc> Reviewed-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <a@unstable.cc>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/soft-interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index d72f88707736..66dd0aac480a 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -972,7 +972,7 @@ static void batadv_softif_init_early(struct net_device *dev)
dev->netdev_ops = &batadv_netdev_ops;
dev->destructor = batadv_softif_free;
- dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+ dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL;
dev->priv_flags |= IFF_NO_QUEUE;
/* can't call min_mtu, because the needed variables