| Message ID | 20180424131810.4963-1-luc.vanoostenryck@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3ff6ee28535f2f6698cc2b3acfd2af6942036067 |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi Luc and all, > 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 <luc.vanoostenryck@gmail.com> > --- > drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c > index cf26c15a8..b3bfb4faa 100644 > --- a/drivers/net/wireless/quantenna/qtnfmac/core.c > +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c > @@ -76,7 +76,7 @@ static int qtnf_netdev_close(struct net_device *ndev) > > /* Netdev handler for data transmission. > */ > -static int > +static netdev_tx_t > qtnf_netdev_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) > { > struct qtnf_vif *vif; Previous ACK from Igor slipped through the cracks due to outlook/exchange issues. So here is another one. Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> Thanks for the fix ! Regards, Sergey
Luc Van Oostenryck <luc.vanoostenryck@gmail.com> 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 <luc.vanoostenryck@gmail.com> > Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> Patch applied to wireless-drivers-next.git, thanks. 3ff6ee28535f qtnfmac: fix qtnf_netdev_hard_start_xmit()'s return type
diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c index cf26c15a8..b3bfb4faa 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/core.c +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c @@ -76,7 +76,7 @@ static int qtnf_netdev_close(struct net_device *ndev) /* Netdev handler for data transmission. */ -static int +static netdev_tx_t qtnf_netdev_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct qtnf_vif *vif;
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 <luc.vanoostenryck@gmail.com> --- drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)