From: David S. Miller Date: Tue, 4 Aug 2020 01:29:39 +0000 (-0700) Subject: sfc: Fix build with CONFIG_RFS_ACCEL disabled. X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da7955405fb25c11a541234b32d06d9c09f81be6;p=linux.git sfc: Fix build with CONFIG_RFS_ACCEL disabled. drivers/net/ethernet/sfc/ef100_nic.c:835:3: error: 'const struct efx_nic_type' has no member named 'filter_rfs_expire_one' 835 | .filter_rfs_expire_one = efx_mcdi_filter_rfs_expire_one, | ^~~~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/sfc/ef100_nic.c:835:27: error: initialization of 'void (*)(struct efx_nic *, u32)' {aka 'void (*)(struct efx_nic *, unsigned int)'} from incompatible pointer type 'bool (*)(struct efx_nic *, u32, unsigned int)' {aka '_Bool (*)(struct efx_nic *, unsigned int, unsigned int)'} [-Werror=incompatible-pointer-types] 835 | .filter_rfs_expire_one = efx_mcdi_filter_rfs_expire_one, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported-by: kernel test robot Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index 8a2126fec078b..36598d0542ed2 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -832,7 +832,9 @@ const struct efx_nic_type ef100_vf_nic_type = { .filter_count_rx_used = efx_mcdi_filter_count_rx_used, .filter_get_rx_id_limit = efx_mcdi_filter_get_rx_id_limit, .filter_get_rx_ids = efx_mcdi_filter_get_rx_ids, +#ifdef CONFIG_RFS_ACCEL .filter_rfs_expire_one = efx_mcdi_filter_rfs_expire_one, +#endif .rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN, .rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,