diff options
| author | Hagen Paul Pfeifer <hagen@jauu.net> | 2012-01-04 17:35:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:34:07 -0800 |
| commit | 1609e23b0c313d58664bcc0677eadd9464c8c2cc (patch) | |
| tree | 5e986944f9ed01ed2dd08c3317bf977c301a925b /net/sched | |
| parent | 9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7 (diff) | |
| download | kernel_samsung_smdk4412-1609e23b0c313d58664bcc0677eadd9464c8c2cc.zip kernel_samsung_smdk4412-1609e23b0c313d58664bcc0677eadd9464c8c2cc.tar.gz kernel_samsung_smdk4412-1609e23b0c313d58664bcc0677eadd9464c8c2cc.tar.bz2 | |
net_sched: Bug in netem reordering
[ Upstream commit eb10192447370f19a215a8c2749332afa1199d46 ]
Not now, but it looks you are correct. q->qdisc is NULL until another
additional qdisc is attached (beside tfifo). See 50612537e9ab2969312.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_netem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 87b9658..2f68459 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -381,8 +381,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) q->counter = 0; __skb_queue_head(&q->qdisc->q, skb); - q->qdisc->qstats.backlog += qdisc_pkt_len(skb); - q->qdisc->qstats.requeues++; + sch->qstats.backlog += qdisc_pkt_len(skb); + sch->qstats.requeues++; ret = NET_XMIT_SUCCESS; } |