net: renesas: rswitch: Fix return value in error path of xmit

shimoday · kuba-moo · commit a60caf039e96 · 2023-06-01T09:57:08.000-07:00
Fix return value in the error path of rswitch_start_xmit(). If TX queues are full, this function should return NETDEV_TX_BUSY. Fixes: 3590918 ("net: ethernet: renesas: Add support for "Ethernet Switch"") Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://lore.kernel.org/r/20230529073817.1145208-1-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
@@ -1485,7 +1485,7 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd
 
 	if (rswitch_get_num_cur_queues(gq) >= gq->ring_size - 1) {
 		netif_stop_subqueue(ndev, 0);
-		return ret;
+		return NETDEV_TX_BUSY;
 	}
 
 	if (skb_put_padto(skb, ETH_ZLEN))

Original file line number	Diff line number	Diff line change
`@@ -1485,7 +1485,7 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff skb, struct net_device nd`
`1485`	`1485`
`1486`	`1486`	`if (rswitch_get_num_cur_queues(gq) >= gq->ring_size - 1) {`
`1487`	`1487`	`netif_stop_subqueue(ndev, 0);`
`1488`		`- return ret;`
	`1488`	`+ return NETDEV_TX_BUSY;`
`1489`	`1489`	`}`
`1490`	`1490`
`1491`	`1491`	`if (skb_put_padto(skb, ETH_ZLEN))`