From: <Nicolas.Ferre@microchip.com>
To: <luc.vanoostenryck@gmail.com>, <adham.abozaeid@microchip.com>,
<Ajay.Kathat@microchip.com>, <gregkh@linuxfoundation.org>,
<kvalo@codeaurora.org>
Cc: <linux-wireless@vger.kernel.org>, <devel@driverdev.osuosl.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging/wilc1000: let wilc_mac_xmit() to NETDEV_TX_OK
Date: Mon, 29 Jun 2020 07:58:09 +0000 [thread overview]
Message-ID: <8a2f50dc-2cbe-64e4-438c-4320bb574f4f@microchip.com> (raw)
In-Reply-To: <20200628183237.74749-1-luc.vanoostenryck@gmail.com>
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
next prev parent reply other threads:[~2020-06-29 20:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-28 18:32 [PATCH] staging/wilc1000: let wilc_mac_xmit() to NETDEV_TX_OK Luc Van Oostenryck
2020-06-29 7:58 ` Nicolas.Ferre [this message]
2020-06-29 10:40 ` [PATCH] wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK Luc Van Oostenryck
2020-07-14 17:53 ` Kalle Valo
2020-07-02 6:48 ` [PATCH] staging/wilc1000: let wilc_mac_xmit() to NETDEV_TX_OK Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a2f50dc-2cbe-64e4-438c-4320bb574f4f@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=Ajay.Kathat@microchip.com \
--cc=adham.abozaeid@microchip.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).