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
@@ -67,11 +67,10 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
|
||||
}
|
||||
|
||||
pnp = phonet_proto_get(protocol);
|
||||
#ifdef CONFIG_KMOD
|
||||
if (pnp == NULL &&
|
||||
request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0)
|
||||
pnp = phonet_proto_get(protocol);
|
||||
#endif
|
||||
|
||||
if (pnp == NULL)
|
||||
return -EPROTONOSUPPORT;
|
||||
if (sock->type != pnp->sock_type) {
|
||||
|
Reference in New Issue
Block a user