* [PATCH] liquidio: fix lio_vf_rep_pkt_xmit()'s return type
@ 2018-04-24 13:16 Luc Van Oostenryck
2018-04-24 17:17 ` Felix Manlunas
0 siblings, 1 reply; 2+ messages in thread
From: Luc Van Oostenryck @ 2018-04-24 13:16 UTC (permalink / raw)
To: linux-kernel
Cc: Luc Van Oostenryck, Derek Chickles, Satanand Burla,
Felix Manlunas, Raghu Vatsavayi, netdev
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] liquidio: fix lio_vf_rep_pkt_xmit()'s return type
2018-04-24 13:16 [PATCH] liquidio: fix lio_vf_rep_pkt_xmit()'s return type Luc Van Oostenryck
@ 2018-04-24 17:17 ` Felix Manlunas
0 siblings, 0 replies; 2+ messages in thread
From: Felix Manlunas @ 2018-04-24 17:17 UTC (permalink / raw)
To: Luc Van Oostenryck
Cc: linux-kernel, Derek Chickles, Satanand Burla, Felix Manlunas,
Raghu Vatsavayi, netdev
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-24 17:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-24 13:16 [PATCH] liquidio: fix lio_vf_rep_pkt_xmit()'s return type Luc Van Oostenryck
2018-04-24 17:17 ` Felix Manlunas
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).