diff options
| author | Song Liu <songliubraving@fb.com> | 2018-05-29 10:03:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-31 13:26:19 -0400 |
| commit | 4341f8308d53f95a4a1ab54f45fa9af2c30ff596 (patch) | |
| tree | 6f21283731f7246aaa632b5d721f926f9355e1bc | |
| parent | 3d97d88e8091f3501e016f6b4ce45a32c4b8f2f6 (diff) | |
| download | lwn-4341f8308d53f95a4a1ab54f45fa9af2c30ff596.tar.gz lwn-4341f8308d53f95a4a1ab54f45fa9af2c30ff596.zip | |
net: remove bypassed check in sch_direct_xmit()
Checking netif_xmit_frozen_or_stopped() at the end of sch_direct_xmit()
is being bypassed. This is because "ret" from sch_direct_xmit() will be
either NETDEV_TX_OK or NETDEV_TX_BUSY, and only ret == NETDEV_TX_OK == 0
will reach the condition:
if (ret && netif_xmit_frozen_or_stopped(txq))
return false;
This patch cleans up the code by removing the whole condition.
For more discussion about this, please refer to
https://marc.info/?t=152727195700008
Signed-off-by: Song Liu <songliubraving@fb.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 760ab1b09f8b..69078c82963e 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -346,9 +346,6 @@ bool sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q, return false; } - if (ret && netif_xmit_frozen_or_stopped(txq)) - return false; - return true; } |