diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-16 18:24:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-16 18:24:51 -0400 |
commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/netlink | |
parent | 00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff) |
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
Some code here depends on CONFIG_KMOD to not try to load
protocol modules or similar, replace by CONFIG_MODULES
where more than just request_module depends on CONFIG_KMOD
and and also use try_then_request_module in ebtables.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2fd8afac5f71..480184a857d2 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -435,7 +435,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol) | |||
435 | return -EPROTONOSUPPORT; | 435 | return -EPROTONOSUPPORT; |
436 | 436 | ||
437 | netlink_lock_table(); | 437 | netlink_lock_table(); |
438 | #ifdef CONFIG_KMOD | 438 | #ifdef CONFIG_MODULES |
439 | if (!nl_table[protocol].registered) { | 439 | if (!nl_table[protocol].registered) { |
440 | netlink_unlock_table(); | 440 | netlink_unlock_table(); |
441 | request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol); | 441 | request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol); |