Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

torvalds · torvalds · commit d1671a9c15f5 · 2008-07-20T21:17:20.000-07:00
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pkt_sched: Fix build with NET_SCHED disabled.
diff --git 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);
 }
 
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,10 @@ static inline unsigned int qdisc_pkt_len(struct sk_buff *skb)`
`333`	`333`
`334`	`334`	`static inline int qdisc_enqueue(struct sk_buff skb, struct Qdisc sch)`
`335`	`335`	`{`
	`336`	`+#ifdef CONFIG_NET_SCHED`
`336`	`337`	`if (sch->stab)`
`337`	`338`	`qdisc_calculate_pkt_len(skb, sch->stab);`
	`339`	`+#endif`
`338`	`340`	`return sch->enqueue(skb, sch);`
`339`	`341`	`}`
`340`	`342`