From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 28 Dec 2011 18:48:55 +0000 (-0500)
Subject: genetlink: add auto module loading
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa84309533025eb3f03dc1d2d2be1c3ca206882a;p=openwrt%2Fstaging%2Fblogic.git

genetlink: add auto module loading

When testing L2TP support, I discovered that the l2tp module is not autoloaded
as are other netlink interfaces. There is because of lack of hook in genetlink to call
request_module and load the module.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 21a82410ec7c..a403b618faa5 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -792,6 +792,15 @@ static int ctrl_getfamily(struct sk_buff *skb, struct genl_info *info)
 
 		name = nla_data(info->attrs[CTRL_ATTR_FAMILY_NAME]);
 		res = genl_family_find_byname(name);
+#ifdef CONFIG_MODULES
+		if (res == NULL) {
+			genl_unlock();
+			request_module("net-pf-%d-proto-%d-type-%s",
+				       PF_NETLINK, NETLINK_GENERIC, name);
+			genl_lock();
+			res = genl_family_find_byname(name);
+		}
+#endif
 		err = -ENOENT;
 	}