diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-16 15:24:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-16 15:24:51 -0700 |
| commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
| tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/sched/act_api.c | |
| parent | 00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff) | |
| download | kernel_samsung_aries-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.zip kernel_samsung_aries-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.gz kernel_samsung_aries-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.bz2 | |
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/act_api.c')
| -rw-r--r-- | net/sched/act_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 9974b3f..8f457f1 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -494,7 +494,7 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est, a_o = tc_lookup_action_n(act_name); if (a_o == NULL) { -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES rtnl_unlock(); request_module("act_%s", act_name); rtnl_lock(); |