diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-16 15:24:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-16 15:24:51 -0700 |
| commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
| tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/phonet/af_phonet.c | |
| parent | 00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff) | |
| download | linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.gz linux-95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a.tar.bz2 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/phonet/af_phonet.c')
| -rw-r--r-- | net/phonet/af_phonet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 9e9c6fce11aa..b9d97effebe3 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -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) { |