[linux-next] LinuxNextTracking branch, master, updated. next-20160512

batman at open-mesh.org batman at open-mesh.org
Fri May 13 00:15:40 CEST 2016

The following commit has been merged in the master branch:
commit 0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896
Author: Andrew Lunn <andrew at 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 at mindeye.net>
    Signed-off-by: Andrew Lunn <andrew at lunn.ch>
    Acked-by: Antonio Quartulli <a at unstable.cc>
    Reviewed-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index d72f887..66dd0aa 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->priv_flags |= IFF_NO_QUEUE;
 	/* can't call min_mtu, because the needed variables


More information about the linux-merge mailing list