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>
This commit is contained in:
committed by
David S. Miller
parent
00269b54ed
commit
95a5afca4a
@@ -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])
|
||||
|
Reference in New Issue
Block a user