aboutsummaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-16 18:24:51 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-16 18:24:51 -0400
commit95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch)
tree15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/can
parent00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (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/can')
-rw-r--r--net/can/af_can.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 8035fbf526ae..7d4d2b3c137e 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -128,8 +128,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol)
128 if (net != &init_net) 128 if (net != &init_net)
129 return -EAFNOSUPPORT; 129 return -EAFNOSUPPORT;
130 130
131#ifdef CONFIG_KMOD 131#ifdef CONFIG_MODULES
132 /* try to load protocol module, when CONFIG_KMOD is defined */ 132 /* try to load protocol module kernel is modular */
133 if (!proto_tab[protocol]) { 133 if (!proto_tab[protocol]) {
134 err = request_module("can-proto-%d", protocol); 134 err = request_module("can-proto-%d", protocol);
135 135