| Message ID | 20131006151533.52988624@nehalam.linuxnetplumber.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Hemminger <stephen@networkplumber.org> Date: Sun, 6 Oct 2013 15:15:33 -0700 > When packet is dropped from rb-tree netem the backlog statistic should > also be updated. > > Reported-by: Сергеев Сергей <adron@yapic.net> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > --- > Should be reviewed by Eric (he added the rb-tree stuff), and added to stable > as well. Eric please review this patch, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2013-10-11 at 14:30 -0400, David Miller wrote: > From: Stephen Hemminger <stephen@networkplumber.org> > Date: Sun, 6 Oct 2013 15:15:33 -0700 > > > When packet is dropped from rb-tree netem the backlog statistic should > > also be updated. > > > > Reported-by: Сергеев Сергей <adron@yapic.net> > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > > > --- > > Should be reviewed by Eric (he added the rb-tree stuff), and added to stable > > as well. > > Eric please review this patch, thanks. It somehow escaped from my radar ;) Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stephen Hemminger <stephen@networkplumber.org> Date: Sun, 6 Oct 2013 15:15:33 -0700 > When packet is dropped from rb-tree netem the backlog statistic should > also be updated. > > Reported-by: Сергеев Сергей <adron@yapic.net> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/net/sched/sch_netem.c 2013-10-06 15:06:50.675250833 -0700 +++ b/net/sched/sch_netem.c 2013-10-06 15:10:03.957219532 -0700 @@ -520,6 +520,7 @@ static unsigned int netem_drop(struct Qd skb->next = NULL; skb->prev = NULL; len = qdisc_pkt_len(skb); + sch->qstats.backlog -= len; kfree_skb(skb); } }
When packet is dropped from rb-tree netem the backlog statistic should also be updated. Reported-by: Сергеев Сергей <adron@yapic.net> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- Should be reviewed by Eric (he added the rb-tree stuff), and added to stable as well. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html