Skip to content

Commit

Permalink
sfc: siena: Have a unique wrapper ifndef for efx channels header
Browse files Browse the repository at this point in the history
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: 6e173d3 ("sfc: Copy shared files needed for Siena (part 1)")
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Cc: Edward Cree <ecree.xilinx@gmail.com>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
Link: https://lore.kernel.org/r/20220518065820.131611-1-saeed@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Saeed Mahameed authored and Jakub Kicinski committed May 19, 2022
1 parent b465131 commit 309ec44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/sfc/siena/efx_channels.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 309ec44

Please sign in to comment.