* [PATCH net-next] net_sched: sch_fq: remove one obsolete check in fq_dequeue()
@ 2019-10-14 17:40 Eric Dumazet
2019-10-16 3:19 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2019-10-14 17:40 UTC (permalink / raw)
To: David S . Miller; +Cc: netdev, Eric Dumazet, Eric Dumazet
After commit eeb84aa0d0aff ("net_sched: sch_fq: do not assume EDT
packets are ordered"), all skbs get a non zero time_to_send
in flow_queue_add()
This means @time_next_packet variable in fq_dequeue()
can no longer be zero.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_fq.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 98dd87ce15108cfe1c011da44ba32f97763776c8..b1c7e726ce5d1ae139f765c5b92dfdaea9bee258 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -530,8 +530,7 @@ static struct sk_buff *fq_dequeue(struct Qdisc *sch)
fq_flow_set_throttled(q, f);
goto begin;
}
- if (time_next_packet &&
- (s64)(now - time_next_packet - q->ce_threshold) > 0) {
+ if ((s64)(now - time_next_packet - q->ce_threshold) > 0) {
INET_ECN_set_ce(skb);
q->stat_ce_mark++;
}
--
2.23.0.700.g56cf767bdb-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net_sched: sch_fq: remove one obsolete check in fq_dequeue()
2019-10-14 17:40 [PATCH net-next] net_sched: sch_fq: remove one obsolete check in fq_dequeue() Eric Dumazet
@ 2019-10-16 3:19 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-10-16 3:19 UTC (permalink / raw)
To: edumazet; +Cc: netdev, eric.dumazet
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 14 Oct 2019 10:40:32 -0700
> After commit eeb84aa0d0aff ("net_sched: sch_fq: do not assume EDT
> packets are ordered"), all skbs get a non zero time_to_send
> in flow_queue_add()
>
> This means @time_next_packet variable in fq_dequeue()
> can no longer be zero.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-16 3:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-14 17:40 [PATCH net-next] net_sched: sch_fq: remove one obsolete check in fq_dequeue() Eric Dumazet
2019-10-16 3:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).