kevin/linux
1
Fork 0
Code

sfc: do not try to call tc functions when CONFIG_SFC_SRIOV=n

Browse Source 
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: 7e5e7d8000 ("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>
This commit is contained in:
Edward Cree 2023-06-15 22:52:43 +01:00 committed by David S. Miller
parent 1282723361
commit c08afcdcf9
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/sfc/tc_bindings.h
View File

@ -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 */

11
drivers/net/ethernet/sfc/tc_encap_actions.h
View File

@ -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 */