lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 532/671] net: sonic: return NETDEV_TX_OK if failed to map buffer
    Date
    From: Mao Wenan <maowenan@huawei.com>

    [ Upstream commit 6e1cdedcf0362fed3aedfe051d46bd7ee2a85fe1 ]

    NETDEV_TX_BUSY really should only be used by drivers that call
    netif_tx_stop_queue() at the wrong moment. If dma_map_single() is
    failed to map tx DMA buffer, it might trigger an infinite loop.
    This patch use NETDEV_TX_OK instead of NETDEV_TX_BUSY, and change
    printk to pr_err_ratelimited.

    Fixes: d9fb9f384292 ("*sonic/natsemi/ns83829: Move the National Semi-conductor drivers")
    Signed-off-by: Mao Wenan <maowenan@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/natsemi/sonic.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
    index c805dcbebd02..be36f7117d48 100644
    --- a/drivers/net/ethernet/natsemi/sonic.c
    +++ b/drivers/net/ethernet/natsemi/sonic.c
    @@ -231,9 +231,9 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)

    laddr = dma_map_single(lp->device, skb->data, length, DMA_TO_DEVICE);
    if (!laddr) {
    - printk(KERN_ERR "%s: failed to map tx DMA buffer.\n", dev->name);
    + pr_err_ratelimited("%s: failed to map tx DMA buffer.\n", dev->name);
    dev_kfree_skb(skb);
    - return NETDEV_TX_BUSY;
    + return NETDEV_TX_OK;
    }

    sonic_tda_put(dev, entry, SONIC_TD_STATUS, 0); /* clear status */
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:43    [W:4.086 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site