summaryrefslogtreecommitdiffstats
path: root/net/ipv4/devinet.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-17 00:24:51 +0200
committerDavid S. Miller <davem@davemloft.net>2008-10-17 00:24:51 +0200
commit95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (patch)
tree15452d28df4e4d76fc1276e791a7cc3c6e1a9b3a /net/ipv4/devinet.c
parentipv4: Add a missing rcu_assign_pointer() in routing cache. (diff)
downloadlinux-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/ipv4/devinet.c')
-rw-r--r--net/ipv4/devinet.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index b12dae2b0b2d..abef49376ac8 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -613,9 +613,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
if (colon)
*colon = 0;
-#ifdef CONFIG_KMOD
dev_load(net, ifr.ifr_name);
-#endif
switch (cmd) {
case SIOCGIFADDR: /* Get interface address */