diff options
author | stephen hemminger <stephen@networkplumber.org> | 2013-08-31 13:15:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-31 18:09:45 -0400 |
commit | 34aedd3f3b289edba118e66450e95790ccab5091 (patch) | |
tree | 487ccefb99181c3ae0b1615498b3b23622e11c68 /net/sched | |
parent | d2a7f269f91299b8e5f6c7d2a41ba46248d73d24 (diff) |
qdisc: fix build with !CONFIG_NET_SCHED
Multiqueue scheduler refers to default_qdisc_ops; therefore the
variable definition needs to be moved to handle case where net
scheduler API is not available.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_api.c | 5 | ||||
-rw-r--r-- | net/sched/sch_generic.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 812e57900591..2adda7fa2d39 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -131,11 +131,6 @@ static DEFINE_RWLOCK(qdisc_mod_lock); | |||
131 | ************************************************/ | 131 | ************************************************/ |
132 | 132 | ||
133 | 133 | ||
134 | /* Qdisc to use by default */ | ||
135 | |||
136 | const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops; | ||
137 | EXPORT_SYMBOL(default_qdisc_ops); | ||
138 | |||
139 | /* The list of all installed queueing disciplines. */ | 134 | /* The list of all installed queueing disciplines. */ |
140 | 135 | ||
141 | static struct Qdisc_ops *qdisc_base; | 136 | static struct Qdisc_ops *qdisc_base; |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 6b021106542c..a74e278654aa 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -30,6 +30,10 @@ | |||
30 | #include <net/pkt_sched.h> | 30 | #include <net/pkt_sched.h> |
31 | #include <net/dst.h> | 31 | #include <net/dst.h> |
32 | 32 | ||
33 | /* Qdisc to use by default */ | ||
34 | const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops; | ||
35 | EXPORT_SYMBOL(default_qdisc_ops); | ||
36 | |||
33 | /* Main transmission queue. */ | 37 | /* Main transmission queue. */ |
34 | 38 | ||
35 | /* Modifications to data participating in scheduling must be protected with | 39 | /* Modifications to data participating in scheduling must be protected with |