net_sched: Bug in netem reordering
Not now, but it looks you are correct. q->qdisc is NULL until another
additional qdisc is attached (beside tfifo). See 50612537e9
.
The following patch should work.
From: Hagen Paul Pfeifer <hagen@jauu.net>
netem: catch NULL pointer by updating the real qdisc statistic
Reported-by: Vijay Subramanian <subramanian.vijay@gmail.com>
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e1e0918fca
commit
eb10192447
|
@ -458,8 +458,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
||||||
q->counter = 0;
|
q->counter = 0;
|
||||||
|
|
||||||
__skb_queue_head(&sch->q, skb);
|
__skb_queue_head(&sch->q, skb);
|
||||||
q->qdisc->qstats.backlog += qdisc_pkt_len(skb);
|
sch->qstats.backlog += qdisc_pkt_len(skb);
|
||||||
q->qdisc->qstats.requeues++;
|
sch->qstats.requeues++;
|
||||||
ret = NET_XMIT_SUCCESS;
|
ret = NET_XMIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue