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

batman at open-mesh.org batman at open-mesh.org
Fri Aug 19 00:15:38 CEST 2016

The following commit has been merged in the master branch:
commit 4c09a08b47ffac9aa3bc91870aa54c9ae39d9674
Author: Andrew Lunn <andrew at lunn.ch>
Date:   Sun Jul 3 13:31:48 2016 +0200

    batman-adv: Indicate netlink socket can be used with netns.
    Set the netnsof flag on the family structure, indicating it can
    be used with different network name spaces.
    Signed-off-by: Andrew Lunn <andrew at lunn.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index c3f6816..18831e7 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -54,6 +54,7 @@ struct genl_family batadv_netlink_family = {
 	.name = BATADV_NL_NAME,
 	.version = 1,
 	.maxattr = BATADV_ATTR_MAX,
+	.netnsok = true,
 /* multicast groups */


More information about the linux-merge mailing list