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/ipv4/devinet.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/ipv4/devinet.c')
-rw-r--r-- | net/ipv4/devinet.c | 2 |
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) | |||
613 | if (colon) | 613 | if (colon) |
614 | *colon = 0; | 614 | *colon = 0; |
615 | 615 | ||
616 | #ifdef CONFIG_KMOD | ||
617 | dev_load(net, ifr.ifr_name); | 616 | dev_load(net, ifr.ifr_name); |
618 | #endif | ||
619 | 617 | ||
620 | switch (cmd) { | 618 | switch (cmd) { |
621 | case SIOCGIFADDR: /* Get interface address */ | 619 | case SIOCGIFADDR: /* Get interface address */ |