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/ipv4/inet_diag.c | |
| parent | ipv4: Add a missing rcu_assign_pointer() in routing cache. (diff) | |
| download | linux-dev-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.xz linux-dev-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/ipv4/inet_diag.c')
| -rw-r--r-- | net/ipv4/inet_diag.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 89cb047ab314..564230dabcb8 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -53,11 +53,9 @@ static DEFINE_MUTEX(inet_diag_table_mutex); static const struct inet_diag_handler *inet_diag_lock_handler(int type) { -#ifdef CONFIG_KMOD if (!inet_diag_table[type]) request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, NETLINK_INET_DIAG, type); -#endif mutex_lock(&inet_diag_table_mutex); if (!inet_diag_table[type]) |