diff options
| author | Edward Cree <ecree.xilinx@gmail.com> | 2023-06-16 00:52:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-06-16 11:12:18 +0300 |
| commit | c08afcdcf95288c627267bb20002e8baaf3394e1 (patch) | |
| tree | 22e881fe1d8cb76a602c58fe100ea9ba43bc692d /drivers | |
| parent | 1282723361209d06fb1466ffb90e63b1161320b6 (diff) | |
| download | linux-c08afcdcf95288c627267bb20002e8baaf3394e1.tar.xz | |
sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n
Functions efx_tc_netdev_event and efx_tc_netevent_event do not exist
in that case as object files tc_bindings.o and tc_encap_actions.o
are not built, so the calls to them from ef100_netdev_event and
ef100_netevent_event cause link errors.
Wrap the corresponding header files (tc_bindings.h, tc_encap_actions.h)
with #if IS_ENABLED(CONFIG_SFC_SRIOV), and add an #else with static
inline stubs for these two functions.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202306102026.ISK5JfUQ-lkp@intel.com/
Fixes: 7e5e7d800011 ("sfc: neighbour lookup for TC encap action offload")
Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
Reviewed-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/sfc/tc_bindings.h | 12 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/tc_encap_actions.h | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/tc_bindings.h b/drivers/net/ethernet/sfc/tc_bindings.h index 095ddeb59eb3..a326d23d322b 100644 --- a/drivers/net/ethernet/sfc/tc_bindings.h +++ b/drivers/net/ethernet/sfc/tc_bindings.h @@ -12,6 +12,7 @@ #define EFX_TC_BINDINGS_H #include "net_driver.h" +#if IS_ENABLED(CONFIG_SFC_SRIOV) #include <net/sch_generic.h> struct efx_rep; @@ -28,4 +29,15 @@ int efx_tc_indr_setup_cb(struct net_device *net_dev, struct Qdisc *sch, void (*cleanup)(struct flow_block_cb *block_cb)); int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event, struct net_device *net_dev); + +#else /* CONFIG_SFC_SRIOV */ + +static inline int efx_tc_netdev_event(struct efx_nic *efx, unsigned long event, + struct net_device *net_dev) +{ + return NOTIFY_DONE; +} + +#endif /* CONFIG_SFC_SRIOV */ + #endif /* EFX_TC_BINDINGS_H */ diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.h b/drivers/net/ethernet/sfc/tc_encap_actions.h index 4d755fb92daf..c3c7904ad7ff 100644 --- a/drivers/net/ethernet/sfc/tc_encap_actions.h +++ b/drivers/net/ethernet/sfc/tc_encap_actions.h @@ -12,6 +12,7 @@ #define EFX_TC_ENCAP_ACTIONS_H #include "net_driver.h" +#if IS_ENABLED(CONFIG_SFC_SRIOV) #include <linux/refcount.h> #include <net/tc_act/tc_tunnel_key.h> @@ -100,4 +101,14 @@ void efx_tc_unregister_egdev(struct efx_nic *efx, struct net_device *net_dev); int efx_tc_netevent_event(struct efx_nic *efx, unsigned long event, void *ptr); +#else /* CONFIG_SFC_SRIOV */ + +static inline int efx_tc_netevent_event(struct efx_nic *efx, + unsigned long event, void *ptr) +{ + return NOTIFY_DONE; +} + +#endif /* CONFIG_SFC_SRIOV */ + #endif /* EFX_TC_ENCAP_ACTIONS_H */ |