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 <eduma...@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

Reply via email to