Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1671a9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents ae0645a4 3a682fbd

include/net/sch_generic.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -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)

static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)

{

{

#ifdef CONFIG_NET_SCHED

	if (sch->stab)

	if (sch->stab)

		qdisc_calculate_pkt_len(skb, sch->stab);

		qdisc_calculate_pkt_len(skb, sch->stab);

#endif

	return sch->enqueue(skb, sch);

	return sch->enqueue(skb, sch);

}

}

net/sched/sch_generic.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -469,7 +469,9 @@ static void __qdisc_destroy(struct rcu_head *head) 
	struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu);

	struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu);

	const struct Qdisc_ops  *ops = qdisc->ops;

	const struct Qdisc_ops  *ops = qdisc->ops;





#ifdef CONFIG_NET_SCHED

	qdisc_put_stab(qdisc->stab);

	qdisc_put_stab(qdisc->stab);

#endif

	gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);

	gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);

	if (ops->reset)

	if (ops->reset)

		ops->reset(qdisc);

		ops->reset(qdisc);