summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentae0645a451b02ad35c520b01177b70ebd59c91ab (diff)
parent3a682fbd732d3d27bec722a923952b0938e8a404 (diff)
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 'include')
-rw-r--r--include/net/sch_generic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index db9ad655eb8..b5f40d7ef72 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -333,8 +333,10 @@ static inline unsigned int qdisc_pkt_len(struct sk_buff *skb)
static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
{
+#ifdef CONFIG_NET_SCHED
if (sch->stab)
qdisc_calculate_pkt_len(skb, sch->stab);
+#endif
return sch->enqueue(skb, sch);
}