* [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
@ 2022-05-18 6:58 Saeed Mahameed
2022-05-18 7:33 ` Martin Habets
2022-05-19 3:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Saeed Mahameed @ 2022-05-18 6:58 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Paolo Abeni
Cc: netdev, Saeed Mahameed, Edward Cree, Martin Habets
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>
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
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
2022-05-19 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Martin Habets @ 2022-05-18 7:33 UTC (permalink / raw)
To: Saeed Mahameed
Cc: David S. Miller, Jakub Kicinski, Paolo Abeni, netdev,
Saeed Mahameed, Edward Cree
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
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
@ 2022-05-19 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-19 3:10 UTC (permalink / raw)
To: Saeed Mahameed
Cc: davem, kuba, pabeni, netdev, saeedm, ecree.xilinx, habetsm.xilinx
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 17 May 2022 23:58:20 -0700 you 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,
>
> [...]
Here is the summary with links:
- [net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
https://git.kernel.org/netdev/net-next/c/309ec443079b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-19 3:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2022-05-19 3:10 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.