From: Martin Habets <habetsm.xilinx@gmail.com>
To: Saeed Mahameed <saeed@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, Saeed Mahameed <saeedm@nvidia.com>,
Edward Cree <ecree.xilinx@gmail.com>
Subject: Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
Date: Wed, 18 May 2022 08:33:16 +0100 [thread overview]
Message-ID: <20220518073316.GB15380@gmail.com> (raw)
In-Reply-To: <20220518065820.131611-1-saeed@kernel.org>
On Tue, May 17, 2022 at 11:58:20PM -0700, Saeed Mahameed wrote:
> From: Saeed Mahameed <saeedm@nvidia.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@nvidia.com>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
> Cc: Edward Cree <ecree.xilinx@gmail.com>
> Cc: Martin Habets <habetsm.xilinx@gmail.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
next prev parent reply other threads:[~2022-05-18 7:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 6:58 [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header Saeed Mahameed
2022-05-18 7:33 ` Martin Habets [this message]
2022-05-19 3:10 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220518073316.GB15380@gmail.com \
--to=habetsm.xilinx@gmail.com \
--cc=davem@davemloft.net \
--cc=ecree.xilinx@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeed@kernel.org \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).