From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: <stable@dpdk.org>
Subject: [dpdk-dev] [PATCH 1/3] net/sfc/base: use simpler EF10 family conditional code check
Date: Tue, 28 Apr 2020 14:37:24 +0100 [thread overview]
Message-ID: <1588081046-15862-1-git-send-email-arybchenko@solarflare.com> (raw)
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(-)
diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c
index a1528508ea..f290339f2f 100644
--- a/drivers/net/sfc/base/ef10_evb.c
+++ b/drivers/net/sfc/base/ef10_evb.c
@@ -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 */
diff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c
index 9725ba1f45..17318b7e11 100644
--- a/drivers/net/sfc/base/efx_evb.c
+++ b/drivers/net/sfc/base/efx_evb.c
@@ -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(
diff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c
index 5b4e98c381..24baa5a3a4 100644
--- a/drivers/net/sfc/base/efx_proxy.c
+++ b/drivers/net/sfc/base/efx_proxy.c
@@ -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(
--
2.17.1
next reply other threads:[~2020-04-28 13:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 13:37 Andrew Rybchenko [this message]
2020-04-28 13:37 ` [dpdk-dev] [PATCH 2/3] net/sfc/base: use simpler EF10 family run-time checks Andrew Rybchenko
2020-04-28 13:37 ` [dpdk-dev] [PATCH 3/3] net/sfc/base: fix build when EVB is enabled Andrew Rybchenko
2020-05-01 14:21 ` [dpdk-dev] [PATCH 1/3] net/sfc/base: use simpler EF10 family conditional code check Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1588081046-15862-1-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).