2018-04-24 13:18:05

by Luc Van Oostenryck

Subject: [PATCH] mwifiex: fix mwifiex_hard_start_xmit()'s return type

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too.

Signed-off-by: Luc Van Oostenryck <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index b64845828..802fb3ecc 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -858,7 +858,7 @@ mwifiex_clone_skb_for_tx_status(struct mwifiex_private *priv,
/*
* CFG802.11 network device handler for data transmission.
*/
-static int
+static netdev_tx_t
mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
--
2.17.0

2018-04-30 10:23:32

by Kalle Valo

Subject: Re: mwifiex: fix mwifiex_hard_start_xmit()'s return type

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, but the implementation in this
> driver returns an 'int'.
>
> Fix this by returning 'netdev_tx_t' in this driver too.
>
> Signed-off-by: Luc Van Oostenryck <[email protected]>

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

c126e1995f79 mwifiex: fix mwifiex_hard_start_xmit()'s return type

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

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