From patchwork Wed Jan 20 04:17:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 86947 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57E04A0A05; Wed, 20 Jan 2021 05:34:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A89D140DCB; Wed, 20 Jan 2021 05:33:48 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 4972F140DA7 for ; Wed, 20 Jan 2021 05:33:47 +0100 (CET) IronPort-SDR: zQEfGhAzNtIWqNx5atgC5d1otcdaTNVWQ353WihRKmfL5Zf6u9Eg096Gj0Vu/0mlalDjwqMmFr wnfh6/HehiiQ== X-IronPort-AV: E=McAfee;i="6000,8403,9869"; a="158223391" X-IronPort-AV: E=Sophos;i="5.79,360,1602572400"; d="scan'208";a="158223391" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2021 20:33:46 -0800 IronPort-SDR: X51PJWRpVMXWW61V5td7B3SBEzqIkYbF3EPyudiPYcGZe1+sW9MkGoSU1AftqMA5sdks3oHovW oTg3+AYiWH6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,360,1602572400"; d="scan'208";a="426767160" Received: from npg-dpdk-haiyue-3.sh.intel.com ([10.67.118.189]) by orsmga001.jf.intel.com with ESMTP; 19 Jan 2021 20:33:44 -0800 From: Haiyue Wang To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, qi.fu@intel.com, Haiyue Wang , Jingjing Wu , Beilei Xing Date: Wed, 20 Jan 2021 12:17:49 +0800 Message-Id: <20210120041750.408535-3-haiyue.wang@intel.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210120041750.408535-1-haiyue.wang@intel.com> References: <20210120011039.164462-1-haiyue.wang@intel.com> <20210120041750.408535-1-haiyue.wang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 2/2] net/iavf: align to the new VLAN offload name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Since the VLAN offload virtchnl message name has been renamed to setting style, the internal Ethernet type setting name needs be changed to avoid confusing. Signed-off-by: Haiyue Wang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_vchnl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 426ddb6c7e..c82925eceb 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -532,16 +532,16 @@ iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable) struct virtchnl_vlan_setting vlan_strip; struct iavf_cmd_info args; uint32_t stripping_caps; - uint32_t *vlan_setting; + uint32_t *ethertype; int ret; supported_caps = &vf->vlan_v2_caps.offloads.stripping_support; if (supported_caps->outer) { stripping_caps = supported_caps->outer; - vlan_setting = &vlan_strip.outer_ethertype_setting; + ethertype = &vlan_strip.outer_ethertype_setting; } else { stripping_caps = supported_caps->inner; - vlan_setting = &vlan_strip.inner_ethertype_setting; + ethertype = &vlan_strip.inner_ethertype_setting; } if (!(stripping_caps & VIRTCHNL_VLAN_ETHERTYPE_8100)) @@ -549,7 +549,7 @@ iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable) memset(&vlan_strip, 0, sizeof(vlan_strip)); vlan_strip.vport_id = vf->vsi_res->vsi_id; - *vlan_setting = VIRTCHNL_VLAN_ETHERTYPE_8100; + *ethertype = VIRTCHNL_VLAN_ETHERTYPE_8100; args.ops = enable ? VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2 : VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2; @@ -574,16 +574,16 @@ iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable) struct virtchnl_vlan_setting vlan_insert; struct iavf_cmd_info args; uint32_t insertion_caps; - uint32_t *vlan_setting; + uint32_t *ethertype; int ret; supported_caps = &vf->vlan_v2_caps.offloads.insertion_support; if (supported_caps->outer) { insertion_caps = supported_caps->outer; - vlan_setting = &vlan_insert.outer_ethertype_setting; + ethertype = &vlan_insert.outer_ethertype_setting; } else { insertion_caps = supported_caps->inner; - vlan_setting = &vlan_insert.inner_ethertype_setting; + ethertype = &vlan_insert.inner_ethertype_setting; } if (!(insertion_caps & VIRTCHNL_VLAN_ETHERTYPE_8100)) @@ -591,7 +591,7 @@ iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable) memset(&vlan_insert, 0, sizeof(vlan_insert)); vlan_insert.vport_id = vf->vsi_res->vsi_id; - *vlan_setting = VIRTCHNL_VLAN_ETHERTYPE_8100; + *ethertype = VIRTCHNL_VLAN_ETHERTYPE_8100; args.ops = enable ? VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2 : VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2;