Commit 4ab30525 authored by Jiangfeng Xiao's avatar Jiangfeng Xiao Committed by Greg Kroah-Hartman

net: hisilicon: fix hip04-xmit never return TX_BUSY

[ Upstream commit f2243b82 ]

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: default avatarJiangfeng Xiao <xiaojiangfeng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 09ec5bf1
...@@ -185,7 +185,7 @@ struct hip04_priv { ...@@ -185,7 +185,7 @@ struct hip04_priv {
static inline unsigned int tx_count(unsigned int head, unsigned int tail) 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) static void hip04_config_port(struct net_device *ndev, u32 speed, u32 duplex)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment