netdev - Re: [PATCH] liquidio: fix liquidio

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180424171837.GB7020@felix-thinkpad.cavium.com>
Date:   Tue, 24 Apr 2018 10:18:37 -0700
From:   Felix Manlunas <felix.manlunas@...ium.com>
To:     Luc Van Oostenryck <luc.vanoostenryck@...il.com>
Cc:     linux-kernel@...r.kernel.org,
        Derek Chickles <derek.chickles@...iumnetworks.com>,
        Satanand Burla <satananda.burla@...iumnetworks.com>,
        Felix Manlunas <felix.manlunas@...iumnetworks.com>,
        Raghu Vatsavayi <raghu.vatsavayi@...iumnetworks.com>,
        netdev@...r.kernel.org
Subject: Re: [PATCH] liquidio: fix liquidio_xmit()'s return type

On Tue, Apr 24, 2018 at 03:16:37PM +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 implementations 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@...il.com>
> ---
>  drivers/net/ethernet/cavium/liquidio/lio_main.c    | 2 +-
>  drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
> index 603a144d3..6d6f16815 100644
> --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
> +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
> @@ -2491,7 +2491,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct,
>   * @returns whether the packet was transmitted to the device okay or not
>   *             (NETDEV_TX_OK or NETDEV_TX_BUSY)
>   */
> -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
> +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
>  {
>  	struct lio *lio;
>  	struct octnet_buf_free_info *finfo;
> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
> index f92dfa411..13ef46a85 100644
> --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
> +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
> @@ -1560,7 +1560,7 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct,
>   * @returns whether the packet was transmitted to the device okay or not
>   *             (NETDEV_TX_OK or NETDEV_TX_BUSY)
>   */
> -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
> +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
>  {
>  	struct octnet_buf_free_info *finfo;
>  	union octnic_cmd_setup cmdsetup;
> -- 
> 2.17.0
> 

Acked-by: Felix Manlunas <felix.manlunas@...ium.com>