From fa84309533025eb3f03dc1d2d2be1c3ca206882a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 28 Dec 2011 13:48:55 -0500 Subject: 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 Signed-off-by: David S. Miller --- net/netlink/genetlink.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'net') diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 21a82410ec7..a403b618faa 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; } -- cgit v1.2.3-18-g5258