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/bridge/netfilter | |
| parent | 00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff) | |
| download | linux-stable-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.gz linux-stable-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.bz2 linux-stable-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/bridge/netfilter')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 5bb88eb0aad4..0fa208e86405 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -305,23 +305,14 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error, return NULL; } -#ifndef CONFIG_KMOD -#define find_inlist_lock(h,n,p,e,m) find_inlist_lock_noload((h),(n),(e),(m)) -#else static void * find_inlist_lock(struct list_head *head, const char *name, const char *prefix, int *error, struct mutex *mutex) { - void *ret; - - ret = find_inlist_lock_noload(head, name, error, mutex); - if (!ret) { - request_module("%s%s", prefix, name); - ret = find_inlist_lock_noload(head, name, error, mutex); - } - return ret; + return try_then_request_module( + find_inlist_lock_noload(head, name, error, mutex), + "%s%s", prefix, name); } -#endif static inline struct ebt_table * find_table_lock(const char *name, int *error, struct mutex *mutex) |