sfc: siena: Have a unique wrapper ifndef for efx channels header
Subsystems (3)
PATCH 1/1 sfc: siena: Have a unique wrapper ifndef for efx channels header
From: Saeed Mahameed <[email protected]>
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,
--- drivers/net/ethernet/sfc/siena/efx_channels.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/sfc/siena/efx_channels.h +2 -2
@@ -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;
Signature · 1 line
2.36.1
Quoted 6 lines · Saeed Mahameed
From: Saeed Mahameed <[email protected]>
Both
sfc/efx_channels.handsfc/siena/efx_channels.hused the same wrapper #ifndefEFX_CHANNELS_H, this patch changes the siena define to beEFX_SIENA_CHANNELS_Hto avoid build system confusion.
Quoted 7 lines
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 <[email protected]>
Quoted 23 lines
Cc Edward Cree <[email protected]>Cc Martin Habets <[email protected]>--- drivers/net/ethernet/sfc/siena/efx_channels.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/sfc/siena/efx_channels.h +2
-2@@ -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;Signature · 1 line
2.36.1
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Tue, 17 May 2022 23:58:20 -0700 you wrote:
From: Saeed Mahameed <[email protected]>
Both
sfc/efx_channels.handsfc/siena/efx_channels.hused the same wrapper #ifndefEFX_CHANNELS_H, this patch changes the siena define to beEFX_SIENA_CHANNELS_Hto avoid build system confusion.
Quoted 6 lines
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!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html