The following commit has been merged in the merge/master branch: commit 34199a6677e8105204ec12978f67381e7715e0ec Author: Andrew Lunn andrew@lunn.ch Date: Tue Mar 1 22:19:05 2016 +0100

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

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 674f24b..f1ac60e 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