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
@@ -128,8 +128,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol)
|
||||
if (net != &init_net)
|
||||
return -EAFNOSUPPORT;
|
||||
|
||||
#ifdef CONFIG_KMOD
|
||||
/* try to load protocol module, when CONFIG_KMOD is defined */
|
||||
#ifdef CONFIG_MODULES
|
||||
/* try to load protocol module kernel is modular */
|
||||
if (!proto_tab[protocol]) {
|
||||
err = request_module("can-proto-%d", protocol);
|
||||
|
||||
|
Reference in New Issue
Block a user