summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-08-31 17:15:33 (GMT)
committerDavid S. Miller <davem@davemloft.net>2013-08-31 22:09:45 (GMT)
commit34aedd3f3b289edba118e66450e95790ccab5091 (patch)
tree487ccefb99181c3ae0b1615498b3b23622e11c68 /net/sched
parentd2a7f269f91299b8e5f6c7d2a41ba46248d73d24 (diff)
downloadlinux-34aedd3f3b289edba118e66450e95790ccab5091.tar.xz
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.c5
-rw-r--r--net/sched/sch_generic.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 812e579..2adda7f 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -131,11 +131,6 @@ static DEFINE_RWLOCK(qdisc_mod_lock);
************************************************/
-/* Qdisc to use by default */
-
-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
-EXPORT_SYMBOL(default_qdisc_ops);
-
/* The list of all installed queueing disciplines. */
static struct Qdisc_ops *qdisc_base;
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 6b02110..a74e278 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -30,6 +30,10 @@
#include <net/pkt_sched.h>
#include <net/dst.h>
+/* Qdisc to use by default */
+const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
+EXPORT_SYMBOL(default_qdisc_ops);
+
/* Main transmission queue. */
/* Modifications to data participating in scheduling must be protected with