lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)

Browse Source 
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:
Johannes Berg
2008-10-16 15:24:51 -07:00
committed by David S. Miller
parent 00269b54ed
commit 95a5afca4a
20 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/af_bluetooth.c
View File

@@ -37,10 +37,7 @@
#include <linux/poll.h>
#include <net/sock.h>
#include <asm/ioctls.h>
#if defined(CONFIG_KMOD)
#include <linux/kmod.h>
#endif
#include <net/bluetooth/bluetooth.h>
@@ -145,11 +142,8 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto)
if (proto < 0 || proto >= BT_MAX_PROTO)
return -EINVAL;
#if defined(CONFIG_KMOD)
if (!bt_proto[proto]) {
if (!bt_proto[proto])
request_module("bt-proto-%d", proto);
}
#endif
err = -EPROTONOSUPPORT;