[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220518073316.GB15380@gmail.com>
Date: Wed, 18 May 2022 08:33:16 +0100
From: Martin Habets <habetsm.xilinx@...il.com>
To: Saeed Mahameed <saeed@...nel.org>
Cc: "David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org,
Saeed Mahameed <saeedm@...dia.com>,
Edward Cree <ecree.xilinx@...il.com>
Subject: Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for
efx channels header
On Tue, May 17, 2022 at 11:58:20PM -0700, Saeed Mahameed wrote:
> From: Saeed Mahameed <saeedm@...dia.com>
>
> Both sfc/efx_channels.h and sfc/siena/efx_channels.h used the same
> wrapper #ifndef EFX_CHANNELS_H, this patch changes the siena define to be
> EFX_SIENA_CHANNELS_H to avoid build system confusion.
>
> This fixes the following build break:
> drivers/net/ethernet/sfc/ptp.c:2191:28:
> error: ‘efx_copy_channel’ undeclared here (not in a function); did you mean ‘efx_ptp_channel’?
> 2191 | .copy = efx_copy_channel,
>
> Fixes: 6e173d3b4af9 ("sfc: Copy shared files needed for Siena (part 1)")
> Signed-off-by: Saeed Mahameed <saeedm@...dia.com>
Acked-by: Martin Habets <habetsm.xilinx@...il.com>
> Cc: Edward Cree <ecree.xilinx@...il.com>
> Cc: Martin Habets <habetsm.xilinx@...il.com>
> ---
> drivers/net/ethernet/sfc/siena/efx_channels.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.h b/drivers/net/ethernet/sfc/siena/efx_channels.h
> index 10d78049b885..c4b95a2d770f 100644
> --- a/drivers/net/ethernet/sfc/siena/efx_channels.h
> +++ b/drivers/net/ethernet/sfc/siena/efx_channels.h
> @@ -8,8 +8,8 @@
> * by the Free Software Foundation, incorporated herein by reference.
> */
>
> -#ifndef EFX_CHANNELS_H
> -#define EFX_CHANNELS_H
> +#ifndef EFX_SIENA_CHANNELS_H
> +#define EFX_SIENA_CHANNELS_H
>
> extern unsigned int efx_siena_interrupt_mode;
> extern unsigned int efx_siena_rss_cpus;
> --
> 2.36.1
Powered by blists - more mailing lists