lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] staging/wilc1000: let wilc_mac_xmit() to NETDEV_TX_OK
Date
Luc,

Thanks for your patch...

On 28/06/2020 at 20:32, Luc Van Oostenryck 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 <luc.vanoostenryck@gmail.com>
> ---
> drivers/staging/wilc1000/netdev.c | 6 +++---

... would it be possible that you re-spin it so that it applies to the
new location of this driver:
drivers/net/wireless/microchip/wilc1000/netdev.c

You can rebase your patch on the wireless-driver-next tree with
wilc1000-move-out-of-staging branch:

tree:
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
branch: wilc1000-move-out-of-staging

(Then you can also review the subject line of your patch, BTW)

Thanks for your help. Best regards,
Nicolas

> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/netdev.c b/drivers/staging/wilc1000/netdev.c
> index fda0ab97b02c..be3ae5486f44 100644
> --- a/drivers/staging/wilc1000/netdev.c
> +++ b/drivers/staging/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
>


--
Nicolas Ferre

\
 
 \ /
  Last update: 2020-06-29 21:20    [W:0.064 / U:1.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site