[1/3] net/sfc/base: use simpler EF10 family conditional code check
Checks
Commit Message
Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV")
Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV")
Cc: stable@dpdk.org
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/ef10_evb.c | 4 ++--
drivers/net/sfc/base/efx_evb.c | 4 ++--
drivers/net/sfc/base/efx_proxy.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
Comments
On 4/28/2020 2:37 PM, Andrew Rybchenko wrote:
> Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV")
> Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV")
> Cc: stable@dpdk.org
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Series applied to dpdk-next-net/master, thanks.
@@ -9,7 +9,7 @@
#if EFSYS_OPT_EVB
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
__checkReturn efx_rc_t
ef10_evb_init(
@@ -549,5 +549,5 @@ ef10_evb_vport_stats(
EFX_STATS_UPLOAD, 0));
}
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
#endif /* EFSYS_OPT_EVB */
@@ -28,7 +28,7 @@ static const efx_evb_ops_t __efx_evb_dummy_ops = {
};
#endif /* EFSYS_OPT_SIENA */
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
static const efx_evb_ops_t __efx_evb_ef10_ops = {
ef10_evb_init, /* eeo_init */
ef10_evb_fini, /* eeo_fini */
@@ -44,7 +44,7 @@ static const efx_evb_ops_t __efx_evb_ef10_ops = {
ef10_evb_vport_reconfigure, /* eeo_vport_reconfigure */
ef10_evb_vport_stats, /* eeo_vport_stats */
};
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
__checkReturn efx_rc_t
efx_evb_init(
@@ -23,7 +23,7 @@ static const efx_proxy_ops_t __efx_proxy_dummy_ops = {
};
#endif /* EFSYS_OPT_SIENA */
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
static const efx_proxy_ops_t __efx_proxy_ef10_ops = {
ef10_proxy_auth_init, /* epo_init */
ef10_proxy_auth_fini, /* epo_fini */
@@ -35,7 +35,7 @@ static const efx_proxy_ops_t __efx_proxy_ef10_ops = {
ef10_proxy_auth_exec_cmd, /* epo_exec_cmd */
ef10_proxy_auth_get_privilege_mask, /* epo_get_privilege_mask */
};
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
__checkReturn efx_rc_t
efx_proxy_auth_init(