diff options
| author | Esben Haabendal <esben@geanix.com> | 2021-06-18 12:52:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-18 21:11:51 +0200 |
| commit | f6396341194234e9b01cd7538bc2c6ac4501ab14 (patch) | |
| tree | 5a3618f2ad7032c56546210665f104b725b8070d /drivers | |
| parent | net: ll_temac: Fix TX BD buffer overwrite (diff) | |
| download | linux-f6396341194234e9b01cd7538bc2c6ac4501ab14.tar.xz linux-f6396341194234e9b01cd7538bc2c6ac4501ab14.zip | |
net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY
As documented in Documentation/networking/driver.rst, the ndo_start_xmit
method must not return NETDEV_TX_BUSY under any normal circumstances, and
as recommended, we simply stop the tx queue in advance, when there is a
risk that the next xmit would cause a NETDEV_TX_BUSY return.
Signed-off-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index cc482ee36501..9a13953ea70f 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -942,6 +942,11 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) wmb(); lp->dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */ + if (temac_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) { + netdev_info(ndev, "%s -> netif_stop_queue\n", __func__); + netif_stop_queue(ndev); + } + return NETDEV_TX_OK; } |