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/sched/ematch.c | |
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/sched/ematch.c')
-rw-r--r-- | net/sched/ematch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index 5e6f82e0e6f3..e82519e548d7 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c | |||
@@ -224,7 +224,7 @@ static int tcf_em_validate(struct tcf_proto *tp, | |||
224 | 224 | ||
225 | if (em->ops == NULL) { | 225 | if (em->ops == NULL) { |
226 | err = -ENOENT; | 226 | err = -ENOENT; |
227 | #ifdef CONFIG_KMOD | 227 | #ifdef CONFIG_MODULES |
228 | __rtnl_unlock(); | 228 | __rtnl_unlock(); |
229 | request_module("ematch-kind-%u", em_hdr->kind); | 229 | request_module("ematch-kind-%u", em_hdr->kind); |
230 | rtnl_lock(); | 230 | rtnl_lock(); |