diff --git a/[refs] b/[refs] index bed4e18a9bb8..b5dddf089af6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069 +refs/heads/master: fa84309533025eb3f03dc1d2d2be1c3ca206882a diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c index 21a82410ec7c..a403b618faa5 100644 --- a/trunk/net/netlink/genetlink.c +++ b/trunk/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; }