[PATCH] IB/nes: fix nes_netdev_start_xmit()'s return type

[PATCH] IB/nes: fix nes_netdev_start_xmit()'s return type

[Luc Van Oostenryck]

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/infiniband/hw/nes/nes_nic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 0a75164ce..007d5e8a0 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -461,7 +461,7 @@ static bool nes_nic_send(struct sk_buff *skb, struct net_device *netdev)
 /**
  * nes_netdev_start_xmit
  */
-static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
 	struct nes_vnic *nesvnic = netdev_priv(netdev);
 	struct nes_device *nesdev = nesvnic->nesdev;
-- 
2.17.0

Re: [PATCH] IB/nes: fix nes_netdev_start_xmit()'s return type

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On Tue, Apr 24, 2018 at 03:15:45PM +0200, 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, 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/infiniband/hw/nes/nes_nic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ipoib_start_xmit() needs the same fix.

Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] IB/nes: fix nes_netdev_start_xmit()'s return type

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

On Tue, Apr 24, 2018 at 08:36:12PM +0300, Leon Romanovsky wrote:
> On Tue, Apr 24, 2018 at 03:15:45PM +0200, 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, 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/infiniband/hw/nes/nes_nic.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> ipoib_start_xmit() needs the same fix.
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] IB/nes: fix nes_netdev_start_xmit()'s return type

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 953 bytes --]

On Wed, 2018-04-25 at 18:35 +0300, Leon Romanovsky wrote:
> On Tue, Apr 24, 2018 at 08:36:12PM +0300, Leon Romanovsky wrote:
> > On Tue, Apr 24, 2018 at 03:15:45PM +0200, 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, 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/infiniband/hw/nes/nes_nic.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > ipoib_start_xmit() needs the same fix.
> > 
> 
> Thanks,
> Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

Thanks, applied to for-rc.

-- 
Doug Ledford <dledford@redhat.com>
    GPG KeyID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]