This is a note to let you know that I've just added the patch titled
net_sched: Bug in netem reordering
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net_sched-bug-in-netem-reordering.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 3150cc0db3cf3d7a9e65669793fd9e826b29e921 Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <[email protected]>
Date: Wed, 4 Jan 2012 17:35:26 +0000
Subject: net_sched: Bug in netem reordering
From: Hagen Paul Pfeifer <[email protected]>
[ 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 <[email protected]>
netem: catch NULL pointer by updating the real qdisc statistic
Reported-by: Vijay Subramanian <[email protected]>
Signed-off-by: Hagen Paul Pfeifer <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/sched/sch_netem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -381,8 +381,8 @@ static int netem_enqueue(struct sk_buff
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;
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/via-velocity-s3-resume-fix.patch
queue-3.0/net_sched-bug-in-netem-reordering.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
