lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 46/98] net: hisilicon: fix hip04-xmit never return TX_BUSY
    Date
    [ Upstream commit f2243b82785942be519016067ee6c55a063bbfe2 ]

    TX_DESC_NUM is 256, in tx_count, the maximum value of
    mod(TX_DESC_NUM - 1) is 254, the variable "count" in
    the hip04_mac_start_xmit function is never equal to
    (TX_DESC_NUM - 1), so hip04_mac_start_xmit never
    return NETDEV_TX_BUSY.

    tx_count is modified to mod(TX_DESC_NUM) so that
    the maximum value of tx_count can reach
    (TX_DESC_NUM - 1), then hip04_mac_start_xmit can reurn
    NETDEV_TX_BUSY.

    Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
    index 57c0afa25f9fb..fe3b1637fd5f4 100644
    --- a/drivers/net/ethernet/hisilicon/hip04_eth.c
    +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
    @@ -185,7 +185,7 @@ struct hip04_priv {

    static inline unsigned int tx_count(unsigned int head, unsigned int tail)
    {
    - return (head - tail) % (TX_DESC_NUM - 1);
    + return (head - tail) % TX_DESC_NUM;
    }

    static void hip04_config_port(struct net_device *ndev, u32 speed, u32 duplex)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-27 10:14    [W:2.299 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site