diff options
author | Johannes Berg | 2008-10-17 00:24:51 +0200 |
---|---|---|
committer | David S. Miller | 2008-10-17 00:24:51 +0200 |
commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/netfilter/nf_conntrack_netlink.c | |
parent | ipv4: Add a missing rcu_assign_pointer() in routing cache. (diff) | |
download | kernel-qcow2-linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.gz kernel-qcow2-linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.xz kernel-qcow2-linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.zip |
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/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 08e82d64eb6f..2e4ad9671e19 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -822,7 +822,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, parse_nat_setup = rcu_dereference(nfnetlink_parse_nat_setup_hook); if (!parse_nat_setup) { -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES rcu_read_unlock(); nfnl_unlock(); if (request_module("nf-nat-ipv4") < 0) { |