summaryrefslogtreecommitdiffstats
path: root/net/decnet/dn_dev.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-16 15:24:51 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-16 15:24:51 -0700
commit95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch)
tree15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/decnet/dn_dev.c
parent00269b54edbf25f3bb0dccb558ae23a6fc77ed86 (diff)
downloadlinux-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/decnet/dn_dev.c')
-rw-r--r--net/decnet/dn_dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index ba352588e344..4fd4a4f74e82 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -490,9 +490,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
return -EFAULT;
ifr->ifr_name[IFNAMSIZ-1] = 0;
-#ifdef CONFIG_KMOD
dev_load(&init_net, ifr->ifr_name);
-#endif
switch(cmd) {
case SIOCGIFADDR: