| Message ID | 20180424131639.3757-1-luc.vanoostenryck@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | liquidio: fix lio_vf_rep_pkt_xmit()'s return type | expand |
On Tue, Apr 24, 2018 at 03:16:39PM +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/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c > index 2adafa366..5973a4083 100644 > --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c > +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c > @@ -31,7 +31,7 @@ > > static int lio_vf_rep_open(struct net_device *ndev); > static int lio_vf_rep_stop(struct net_device *ndev); > -static int lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); > +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); > static void lio_vf_rep_tx_timeout(struct net_device *netdev); > static int lio_vf_rep_phys_port_name(struct net_device *dev, > char *buf, size_t len); > @@ -379,7 +379,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, > netif_wake_queue(ndev); > } > > -static int > +static netdev_tx_t > lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev) > { > struct lio_vf_rep_desc *vf_rep = netdev_priv(ndev); > -- > 2.17.0 > Thanks. Acked-by: Felix Manlunas <felix.manlunas@cavium.com>
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c index 2adafa366..5973a4083 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c @@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev); static int lio_vf_rep_stop(struct net_device *ndev); -static int lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); static void lio_vf_rep_tx_timeout(struct net_device *netdev); static int lio_vf_rep_phys_port_name(struct net_device *dev, char *buf, size_t len); @@ -379,7 +379,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, netif_wake_queue(ndev); } -static int +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev) { struct lio_vf_rep_desc *vf_rep = netdev_priv(ndev);
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/ethernet/cavium/liquidio/lio_vf_rep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)