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/sched/sch_api.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/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 1122c952aa99..b16ad2972c6b 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -764,7 +764,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
764 | struct qdisc_size_table *stab; | 764 | struct qdisc_size_table *stab; |
765 | 765 | ||
766 | ops = qdisc_lookup_ops(kind); | 766 | ops = qdisc_lookup_ops(kind); |
767 | #ifdef CONFIG_KMOD | 767 | #ifdef CONFIG_MODULES |
768 | if (ops == NULL && kind != NULL) { | 768 | if (ops == NULL && kind != NULL) { |
769 | char name[IFNAMSIZ]; | 769 | char name[IFNAMSIZ]; |
770 | if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { | 770 | if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { |