Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6059cf0 authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by Greg Kroah-Hartman
Browse files

wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK 



[ Upstream commit cce0e08301fe43dc3fe983d5f098393d15f803f0 ]

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: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200629104009.84077-1-luc.vanoostenryck@gmail.com


Stable-dep-of: deb962ec9e1c ("wifi: wilc1000: fix potential memory leak in wilc_mac_xmit()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 112c1af0

drivers/staging/wilc1000/wilc_netdev.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -717,14 +717,14 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) 




	if (skb->dev != ndev) {

	if (skb->dev != ndev) {

		netdev_err(ndev, "Packet not destined to this device\n");

		netdev_err(ndev, "Packet not destined to this device\n");

		return 0;

		return NETDEV_TX_OK;

	}

	}





	tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);

	tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);

	if (!tx_data) {

	if (!tx_data) {

		dev_kfree_skb(skb);

		dev_kfree_skb(skb);

		netif_wake_queue(ndev);

		netif_wake_queue(ndev);

		return 0;

		return NETDEV_TX_OK;

	}

	}





	tx_data->buff = skb->data;

	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);

		mutex_unlock(&wilc->vif_mutex);

	}

	}





	return 0;

	return NETDEV_TX_OK;

}

}





static int wilc_mac_close(struct net_device *ndev)

static int wilc_mac_close(struct net_device *ndev)