Skip to contentSkip to conversation

net_sched: sch_fq: remove one obsolete check in fq_dequeue()

PATCH Applied Eric Dumazet 2 participants 2 messages Oct 14, 2019 – Oct 16, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net_sched: sch_fq: remove one obsolete check in fq_dequeue()

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.

---
 net/sched/sch_fq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sched/sch_fq.c +1 -2
index 98dd87ce15108cfe1c011da44ba32f97763776c8..b1c7e726ce5d1ae139f765c5b92dfdaea9bee258 100644
@@ -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++;
 		}
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
maintainer Applied
#1 lore raw

From: Eric Dumazet <[email protected]>
Date: Mon, 14 Oct 2019 10:40:32 -0700

Quoted 8 lines

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.

Applied.