Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkt_sched: Fix qdisc len in qdisc_peek_dequeued()

Browse source 
A packet dequeued and stored as gso_skb in qdisc_peek_dequeued() should
be seen as part of the queue for sch->q.qlen queries until it's really
dequeued with qdisc_dequeue_peeked(), so qlen needs additional updating
in these functions. (Updating qstats.backlog shouldn't matter here.)

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski 2008-11-05 16:02:34 -08:00 committed by David S. Miller
parent 0a36b345ab
commit 61c9eaf900
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/net/sch_generic.h
View file

@ -442,8 +442,12 @@ static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)
static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch) static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
{ {
/* we can reuse ->gso_skb because peek isn't called for root qdiscs */ /* we can reuse ->gso_skb because peek isn't called for root qdiscs */
if (!sch->gso_skb) if (!sch->gso_skb) {
sch->gso_skb = sch->dequeue(sch); sch->gso_skb = sch->dequeue(sch);
if (sch->gso_skb)
/* it's still part of the queue */
sch->q.qlen++;
}
return sch->gso_skb; return sch->gso_skb;
} }
@ -453,10 +457,12 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
{ {
struct sk_buff *skb = sch->gso_skb; struct sk_buff *skb = sch->gso_skb;
if (skb) if (skb) {
sch->gso_skb = NULL; sch->gso_skb = NULL;
else sch->q.qlen--;
} else {
skb = sch->dequeue(sch); skb = sch->dequeue(sch);
}
return skb; return skb;
} }