diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-16 18:24:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-16 18:24:51 -0400 |
commit | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch) | |
tree | 15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/sunrpc/auth.c | |
parent | 00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff) |
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/sunrpc/auth.c')
-rw-r--r-- | net/sunrpc/auth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 6bfea9ed6869..436bf1b4b76c 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
@@ -83,10 +83,8 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt) | |||
83 | if (flavor >= RPC_AUTH_MAXFLAVOR) | 83 | if (flavor >= RPC_AUTH_MAXFLAVOR) |
84 | goto out; | 84 | goto out; |
85 | 85 | ||
86 | #ifdef CONFIG_KMOD | ||
87 | if ((ops = auth_flavors[flavor]) == NULL) | 86 | if ((ops = auth_flavors[flavor]) == NULL) |
88 | request_module("rpc-auth-%u", flavor); | 87 | request_module("rpc-auth-%u", flavor); |
89 | #endif | ||
90 | spin_lock(&rpc_authflavor_lock); | 88 | spin_lock(&rpc_authflavor_lock); |
91 | ops = auth_flavors[flavor]; | 89 | ops = auth_flavors[flavor]; |
92 | if (ops == NULL || !try_module_get(ops->owner)) { | 90 | if (ops == NULL || !try_module_get(ops->owner)) { |