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

batman at open-mesh.org batman at open-mesh.org
Tue Aug 16 00:15:43 CEST 2016


The following commit has been merged in the master branch:
commit 9791860ce5438da65f4f5c38c282fdc45e30dd97
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jun 10 23:00:55 2016 +0200

    batman-adv: Define module rtnl link name
    
    The batman-adv module can automatically be loaded when operations over the
    rtnl link are triggered. This requires only the correct rtnl link name in
    the module header.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index fe4c5e2..f61479b 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -638,3 +638,4 @@ MODULE_AUTHOR(BATADV_DRIVER_AUTHOR);
 MODULE_DESCRIPTION(BATADV_DRIVER_DESC);
 MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE);
 MODULE_VERSION(BATADV_SOURCE_VERSION);
+MODULE_ALIAS_RTNL_LINK("batadv");

-- 
LinuxNextTracking


More information about the linux-merge mailing list