Skip to content

Commit

Permalink
qdisc: fix build with !CONFIG_NET_SCHED
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Aug 31, 2013
1 parent d2a7f26 commit 34aedd3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 0 additions & 5 deletions net/sched/sch_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions net/sched/sch_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 34aedd3

Please sign in to comment.