wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK

lucvoo · Sasha Levin · commit 5b061f1c6584 · 2023-03-10T11:38:13.000Z
[ Upstream commit cce0e08 ] The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type defining 'NETDEV_TX_OK' but this driver returns '0' instead of 'NETDEV_TX_OK'. Fix this by returning 'NETDEV_TX_OK' instead of '0'. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200629104009.84077-1-luc.vanoostenryck@gmail.com Stable-dep-of: deb962e ("wifi: wilc1000: fix potential memory leak in wilc_mac_xmit()") Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c
@@ -717,14 +717,14 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
 
 	if (skb->dev != ndev) {
 		netdev_err(ndev, "Packet not destined to this device\n");
-		return 0;
+		return NETDEV_TX_OK;
 	}
 
 	tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);
 	if (!tx_data) {
 		dev_kfree_skb(skb);
 		netif_wake_queue(ndev);
-		return 0;
+		return NETDEV_TX_OK;
 	}
 
 	tx_data->buff = skb->data;
@@ -748,7 +748,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
 		mutex_unlock(&wilc->vif_mutex);
 	}
 
-	return 0;
+	return NETDEV_TX_OK;
 }
 
 static int wilc_mac_close(struct net_device *ndev)

Original file line number	Diff line number	Diff line change
`@@ -717,14 +717,14 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff skb, struct net_device ndev)`
`717`	`717`
`718`	`718`	`if (skb->dev != ndev) {`
`719`	`719`	`netdev_err(ndev, "Packet not destined to this device\n");`
`720`		`- return 0;`
	`720`	`+ return NETDEV_TX_OK;`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);`
`724`	`724`	`if (!tx_data) {`
`725`	`725`	`dev_kfree_skb(skb);`
`726`	`726`	`netif_wake_queue(ndev);`
`727`		`- return 0;`
	`727`	`+ return NETDEV_TX_OK;`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`tx_data->buff = skb->data;`
`@@ -748,7 +748,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff skb, struct net_device ndev)`
`748`	`748`	`mutex_unlock(&wilc->vif_mutex);`
`749`	`749`	`}`
`750`	`750`
`751`		`- return 0;`
	`751`	`+ return NETDEV_TX_OK;`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`static int wilc_mac_close(struct net_device *ndev)`