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

batman at open-mesh.org batman at open-mesh.org
Wed Nov 23 00:16:00 CET 2016


The following commit has been merged in the master branch:
commit 2c0c06ff442313c639018d97a8212dd825cb7b4c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Oct 29 13:56:23 2016 +0200

    batman-adv: Add module alias for batadv netlink family
    
    The batman-adv module has to be loaded to fulfill genl request by the
    userspace. When it is not loaded then requests will fail. It is therefore
    useful to get the module automatically loaded when such a request is made.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 6b5dae6..d46415e 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -23,6 +23,7 @@
 #include <linux/crc32c.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/genetlink.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
 #include <linux/init.h>
@@ -44,6 +45,7 @@
 #include <linux/workqueue.h>
 #include <net/dsfield.h>
 #include <net/rtnetlink.h>
+#include <uapi/linux/batman_adv.h>
 
 #include "bat_algo.h"
 #include "bat_iv_ogm.h"
@@ -648,3 +650,4 @@ MODULE_DESCRIPTION(BATADV_DRIVER_DESC);
 MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE);
 MODULE_VERSION(BATADV_SOURCE_VERSION);
 MODULE_ALIAS_RTNL_LINK("batadv");
+MODULE_ALIAS_GENL_FAMILY(BATADV_NL_NAME);

-- 
LinuxNextTracking


More information about the linux-merge mailing list