From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 09FACA00BE; Tue, 28 Apr 2020 15:37:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 983B01D5B3; Tue, 28 Apr 2020 15:37:40 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 88B6C2BD8; Tue, 28 Apr 2020 15:37:38 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.62]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DD9C560094; Tue, 28 Apr 2020 13:37:37 +0000 (UTC) Received: from us4-mdac16-62.ut7.mdlocal (unknown [10.7.66.61]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DC1C08009B; Tue, 28 Apr 2020 13:37:37 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.34]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 5D6F5280053; Tue, 28 Apr 2020 13:37:37 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 0C06B600053; Tue, 28 Apr 2020 13:37:37 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 Apr 2020 14:37:33 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 28 Apr 2020 14:37:33 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 03SDbX7c006724; Tue, 28 Apr 2020 14:37:33 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 0FF3D16139D; Tue, 28 Apr 2020 14:37:33 +0100 (BST) From: Andrew Rybchenko To: CC: Date: Tue, 28 Apr 2020 14:37:24 +0100 Message-ID: <1588081046-15862-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25382.003 X-TM-AS-Result: No-1.299000-8.000000-10 X-TMASE-MatchedRID: qkiRFh4owgWIxltsBoyvHrsHVDDM5xAPhVDnkfzD7uY4WKr1PmPdtSfv jIw0L/xOpXgeUFMvSJ3MdHm3E7kFwCHhSBQfglfsA9lly13c/gGrlTqw7wfC08YnQg0xziu3vNn Bx6naNRMjW5FWKYjOGMw6XgosvKVofTD/itYNX16ZfODRsHrOYDacujaE3jwhmyiLZetSf8mfop 0ytGwvXiq2rl3dzGQ1EZfHUxXhDNlLDYEnro8XJYA/Gz4VSKDi4yb3Ev5I4QX/mhRBk5Y3t3kp3 5PsMtFXMqWiWoc+SjmzIaJDSJx/8eFTZXDEvvaL1pPGvuXkFGs4oGQUCbwY5Q+g7mdwjo656FtD ZCmYBJ1ty4Dch3o7okMMprcbiest X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.299000-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25382.003 X-MDID: 1588081057-loAXWPnhfV2o Subject: [dpdk-dev] [PATCH 1/3] net/sfc/base: use simpler EF10 family conditional code check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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