2020-06-29 20:55:40

by Luc Van Oostenryck

Subject: [PATCH] wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK

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 <[email protected]>
---
drivers/net/wireless/microchip/wilc1000/netdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index fda0ab97b02c..be3ae5486f44 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -678,14 +678,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;
@@ -710,7 +710,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
srcu_read_unlock(&wilc->srcu, srcu_idx);
}

- return 0;
+ return NETDEV_TX_OK;
}

static int wilc_mac_close(struct net_device *ndev)
--
2.27.0

2020-07-14 17:54:45

by Kalle Valo

Subject: Re: [PATCH] wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK

Luc Van Oostenryck <[email protected]> wrote:

> 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 <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

cce0e08301fe wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK

--
https://patchwork.kernel.org/patch/11632291/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches