summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-12-28 13:48:55 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-28 13:48:55 -0500
commitfa84309533025eb3f03dc1d2d2be1c3ca206882a (patch)
treed023095d481cb331e8cfc569de18ea89a04eb7fd /net
parent7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069 (diff)
downloadlinux-fa84309533025eb3f03dc1d2d2be1c3ca206882a.tar.gz
linux-fa84309533025eb3f03dc1d2d2be1c3ca206882a.tar.bz2
linux-fa84309533025eb3f03dc1d2d2be1c3ca206882a.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/netlink/genetlink.c9
1 files changed, 9 insertions, 0 deletions
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;
}