lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pkt_sched: Fix build with NET_SCHED disabled.
This commit is contained in:
Linus Torvalds
2008-07-20 21:17:20 -07:00
parent ae0645a451 3a682fbd73
commit d1671a9c15
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sch_generic.h
View File

@@ -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);
} }

2
net/sched/sch_generic.c
View File

@@ -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);