diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /net/sched/sch_hfsc.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'net/sched/sch_hfsc.c')
| -rw-r--r-- | net/sched/sch_hfsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 2e45791d4f6c..14a799de1c35 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
| @@ -1600,7 +1600,6 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 1600 | set_active(cl, qdisc_pkt_len(skb)); | 1600 | set_active(cl, qdisc_pkt_len(skb)); |
| 1601 | 1601 | ||
| 1602 | bstats_update(&cl->bstats, skb); | 1602 | bstats_update(&cl->bstats, skb); |
| 1603 | qdisc_bstats_update(sch, skb); | ||
| 1604 | sch->q.qlen++; | 1603 | sch->q.qlen++; |
| 1605 | 1604 | ||
| 1606 | return NET_XMIT_SUCCESS; | 1605 | return NET_XMIT_SUCCESS; |
| @@ -1666,6 +1665,7 @@ hfsc_dequeue(struct Qdisc *sch) | |||
| 1666 | } | 1665 | } |
| 1667 | 1666 | ||
| 1668 | sch->flags &= ~TCQ_F_THROTTLED; | 1667 | sch->flags &= ~TCQ_F_THROTTLED; |
| 1668 | qdisc_bstats_update(sch, skb); | ||
| 1669 | sch->q.qlen--; | 1669 | sch->q.qlen--; |
| 1670 | 1670 | ||
| 1671 | return skb; | 1671 | return skb; |