diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-17 00:24:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-17 00:24:51 +0200 |
| commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
| tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/bluetooth | |
| parent | ipv4: Add a missing rcu_assign_pointer() in routing cache. (diff) | |
| download | linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.xz linux-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/bluetooth')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index f6348e078aa4..8f9431a12c6f 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -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; |