]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net_sched: sch_fq: remove one obsolete check in fq_dequeue()
authorEric Dumazet <edumazet@google.com>
Mon, 14 Oct 2019 17:40:32 +0000 (10:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Oct 2019 03:19:20 +0000 (20:19 -0700)
After commit 6814976619d75 ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_fq.c

index 98dd87ce15108cfe1c011da44ba32f97763776c8..b1c7e726ce5d1ae139f765c5b92dfdaea9bee258 100644 (file)
@@ -530,8 +530,7 @@ begin:
                        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++;
                }