summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 21:17:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 21:17:20 -0700
commitd1671a9c15f55a1475d41269494518e348880c33 (patch)
tree140dec7fc0a8eaddc0f529e1790f888811de53a7 /net
parentae0645a451b02ad35c520b01177b70ebd59c91ab (diff)
parent3a682fbd732d3d27bec722a923952b0938e8a404 (diff)
downloadop-kernel-dev-d1671a9c15f55a1475d41269494518e348880c33.zip
op-kernel-dev-d1671a9c15f55a1475d41269494518e348880c33.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: pkt_sched: Fix build with NET_SCHED disabled.
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_generic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 27a51f0..0ddf692 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -469,7 +469,9 @@ static void __qdisc_destroy(struct rcu_head *head)
struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu);
const struct Qdisc_ops *ops = qdisc->ops;
+#ifdef CONFIG_NET_SCHED
qdisc_put_stab(qdisc->stab);
+#endif
gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);
if (ops->reset)
ops->reset(qdisc);
OpenPOWER on IntegriCloud