From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A59DA04A6; Thu, 27 Jan 2022 14:04:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E934427A8; Thu, 27 Jan 2022 14:04:40 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 7D5384067C for ; Thu, 27 Jan 2022 14:04:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643288678; x=1674824678; h=message-id:date:to:cc:references:from:subject: in-reply-to:content-transfer-encoding:mime-version; bh=30UuEkvn31qayUbtON7QoZuEfHiRi+ggRGVeNYSFSx4=; b=dYtObx3whSTohu3QBos4x0fLM8NjJvkIsQL7SJ4r8bVVpb44wSj8IzRg T0JWIKjuMFtyobMUrrC4MKAOarGbQvRCJfcFmxRVfB2oQOl3n96b7HUUR GE7EWTT7+M3FLoBYijo4mJ1WIJeND7QXmf6ZrRDGdiU5S+IoFcInNGLwr 03m+Ef2+QI20hJMoIY7xlL943lYAj/Bn7zA6ajiT7Np46HakW9VNpHqk9 OP5UKpiCKaZH3ven5jLVRq03MVH+8rwB8ICLifZ9mCmk1Ty/aF9c6GzbT 17YjtV0M4lh6HhFJU1GF4lAAscA6wMAmPD+oLtWzLk7XX6WxbenOwnPbL A==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="234218138" X-IronPort-AV: E=Sophos;i="5.88,320,1635231600"; d="scan'208";a="234218138" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 05:04:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,320,1635231600"; d="scan'208";a="696636525" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga005.jf.intel.com with ESMTP; 27 Jan 2022 05:04:35 -0800 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 27 Jan 2022 05:04:34 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 27 Jan 2022 05:04:34 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Thu, 27 Jan 2022 05:04:34 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Thu, 27 Jan 2022 05:04:34 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PCmEJ6k8y0nm9cdiDMezl//EpH7fOH6sOmenGqFM0Nl51lo2SdeWVphha5IDyXgxtAvcYuLGft2QwKDNEvAK5sjqUcVAiG+NaiisoFZ2ugIhO1sbruxXbf7C8TngdJiPIdDFLhqyAn6kagtjPwoBrg6Crery5iQNOGWV5xTbOk60nhJzGcerkfhCmI9087OLOGgp81RKVCSFfeJHex4iu1myzmEoVhpMPHzHDO/lYYJUpMpMR7G8LGRd8IODIWYDESIxoMuDQ+0AN/nL42UxnCx9RLppGNKyLoz8tLoB36cXnH4+bWAWi6WZVlz9RTSbrSuq2ndU4dAbb1wotwkDzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1nQeEiq9NeZnkAkQMEM4eWeFeUJ90s1Ry8WLaVlGtaw=; b=HQaos6spflm3o1dEZ/EViOv00/AJehcHUYbNtHIO4uz9Uk5avbc4NEdVXqpKEwlgED/vcGx/qWc63p97GtDMmCNgDCiessEmSq/BvohGdR2MfgVsLR9uibsVpKL7d/LQj2QHM36CSDLoKlwUaX2odAh05uD12qyRMsRj84GHgQAx+elRw638XY1mmJCPmNfns2GLTZT8wrBv2dPwNppPiyQxkmjbQDyZnMAlj9MdNFF/djFJZMqTLljrhU0yS7iOtYAL4lfxrubSkqeHIMpRiA6JIXH9+A66OVMc9Lc4qHWUom6iBfgohHKwJnudJpX8HKPMMOrBfJki5k7KzuA0wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) by CY4PR11MB1239.namprd11.prod.outlook.com (2603:10b6:903:2d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.13; Thu, 27 Jan 2022 13:04:32 +0000 Received: from PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::5046:8550:928d:850e]) by PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::5046:8550:928d:850e%7]) with mapi id 15.20.4930.017; Thu, 27 Jan 2022 13:04:32 +0000 Message-ID: <70ec791b-88c2-8485-b7d7-f70d9111f4cc@intel.com> Date: Thu, 27 Jan 2022 13:04:26 +0000 Content-Language: en-US To: "Min Hu (Connor)" , CC: , References: <20220107101558.39219-1-humin29@huawei.com> <20220122015142.9516-1-humin29@huawei.com> <20220122015142.9516-12-humin29@huawei.com> From: Ferruh Yigit Subject: Re: [PATCH v2 11/15] net/hns3: remove invalid encapsulation function X-User: ferruhy In-Reply-To: <20220122015142.9516-12-humin29@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: DB6P195CA0006.EURP195.PROD.OUTLOOK.COM (2603:10a6:4:cb::16) To PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f9f6024-d495-440d-68e5-08d9e1958f75 X-MS-TrafficTypeDiagnostic: CY4PR11MB1239:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:49; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hg/1PW0nsPaNQBDNMT5IzCIjbNw526prJs8IVO4sU3ZdlAXNm8F/K0Qd1K9iEXXc0XtFRiRa3TEJuyGkgKpYwuxEHn3p7/knnxP7S8J97DgYy+g9riK9hocu/U9hU+cv0PJ1TTgmRtoA+9zO2s/yP4Lj5bs6LrMO1JV8UlwuIrpnLIYS6LtAnL1gPuC/NoeqcsX/xAIoCcgeoZBgSe6LAiWqL4wHwa0pn4G+pBMZbm3hJoGtOt3kECXQNtjnRCYWm/BdBMUu9DLfYrPCCiWlAx0Z/ENxzvv+5yoBb41tKIToZ+jEF6zE5xZTNXy78Bo+bH48ozhu0wCia0MAnpqGAIHJKC7Z5nWuDjo/pT6bnDS0QBSsEOt6RkTAHIKX9RaAkhXVZgzNfAmuD5ok8C6NHcTlwUy/bFhOoAriJkqWupYjmtriG3LI9Lm7Kpmp3g2Xgj1nBI4639L99HddWqf2I74BbZzLtjA7jASUL5hlkmJQeTOjsboRdjH90gCsfMUS/1hf7Ljx0K8jLTBfJCaoB0kCHwonfnAx6pcufUOO0ToMGkqMSLngx4M/23BlGsZT2L77nX1mk+CIOmPkhauXoXiObaayRQIi7WK42mRzBGgVB+0SqqUfjLkANNHXmlBAdj9AS84WbV8Lh0DI8Zqct8trPAyxF+Nq7ATRLNUrOE+YdZcASwR4q0dMA39nU6OXlMMUUouAuLiieEv9H89e+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5000.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(6486002)(83380400001)(82960400001)(186003)(2906002)(8676002)(38100700002)(316002)(6666004)(508600001)(44832011)(36756003)(66946007)(6506007)(31686004)(53546011)(8936002)(31696002)(6512007)(5660300002)(26005)(66476007)(66556008)(4326008)(2616005)(86362001)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aFdvVTl1b3E5QjIvc3JpcTFnMkxZTkFNcmU2WmxjYnF4OWloNUxjOTBPbzFT?= =?utf-8?B?K09ZY04weDR2VE92RlE3bHVTOWt0bjVtb2JaWkhrRmFtSjVIbGRTZzlQdUo0?= =?utf-8?B?TnRhaWVITHNjU3dEL1JUUVU2cUI4bWZqY2srZUdVMlQvNnR0b2pCUzM4dSsz?= =?utf-8?B?ZWpyZ09HbXBobkdsYXo1SmVidjVFS0NoQ0JGRFZGMURFejd2ODBVK1ZjVlYr?= =?utf-8?B?c29kZ1RFT1BLR2RHY0gvRVVpUzNvaWJ4QnQ4Zk1oZ3dVZEVIczhWMTNYUWdY?= =?utf-8?B?ZEc5RFZHMlVDeEovM1NEdGI0WXJ1OEZwMHZwdjJ6WWthZGNNaEkrdUpVMnp2?= =?utf-8?B?bzlzT0taRFd2ZHNZcG1qZGFEMklITjl4KzVic1JPVFhRUzhwMzZaeGx2TjNt?= =?utf-8?B?OU1OeXNBaTZnbDFNdS9XT05LSHZoVXB1MG1nb1FNMUdkZkJsVzhZVUh5dldU?= =?utf-8?B?OTlseUxmR1BHUVRRNk9NZDUvZVFJd2lJRkl2ZW81Uy9CejVrdnFOUjFpcWNE?= =?utf-8?B?YjJKeTR4MXBTaE5iVkVhM0FkaXBZcktsYXdQa0hadE90TDVuTzhjZFBYWmlO?= =?utf-8?B?M3VaZXQreDRMeGd6d1VyUmxZRnl5a05kdEcyMncydm0zdGFoeUozRlJ3THcx?= =?utf-8?B?aDIzN09FQTBVNjNUcG1sR2Z6dE1CY2FteXJHS1VQaWYva3gvVEFZZjZNbm8w?= =?utf-8?B?TzBQSHhaNWJtUWs1OTNDK09XOVVrODZjMzBKUy8wUTIxSk94Q3dpSlE0SUZz?= =?utf-8?B?aFpBV3JOKzRCTVhzMWJEblBMd01Hc2pqTjlZdXdld0o0MmhZS01TbWkzMlhJ?= =?utf-8?B?YnJsM0Y2cWpYYVM2QzlOdTBEWHBjcXA3MjdjYm1BclhJR01RRDBhQ3hYcDRV?= =?utf-8?B?TGtROUE3VlppSlllcnVTWDRpKzNOa2RzWWdkZ21ZQWc2d2ZtWXVXaHlvZE9W?= =?utf-8?B?VUhsSWd4VWRQcTlidVhkeGZ0bFpjbHpBVURaRExPK3BhQ0laZm5jejI0M2g4?= =?utf-8?B?K0FnT3FYRSsxUFl2ZENHeno0RlIxSUsyY3dJSmV2SDhCVHlqT3FqOElreUsv?= =?utf-8?B?OW8xN0RrUzRnRFZlQkYxclJaREhwb09JMWw3bzNJUzZVei96a3pKcWlveVBU?= =?utf-8?B?QkZiN2ZUMU5FRjJwMVVKZDZkV0ZlVlI5TXRyLzloVnZrYUJncGFVVXFXMWNy?= =?utf-8?B?TXNEb3BWbnc5NlZWcEQwd1h5T1Y0ZCtBQ2VFRkNjbmdCZUxnbUptVEI5Y2tn?= =?utf-8?B?WlhSZnQ0Y3grSVZvOTFKYUwvM21VV3J3WE9OK0JvQjNub3UrYUowVllDNG1H?= =?utf-8?B?cGUxTVRrVUk2T3hTdG0wejFZMFRhckhkazNIeXJMRVRRbWx4M3pMY3dYRUNP?= =?utf-8?B?aE9xV0c0ZEdoWnBucm9PNXJQNHNQS1BFRXo3THNyWkFYZytUYmhTVmprRGlk?= =?utf-8?B?RkRtUDhLQWZlU0dzN0NPb3Juckg5QWQ2WUQ1dm1mSVE1aCs3R2Y5bFUwTGlU?= =?utf-8?B?N3kvSUw1VCtoQWZBN0FIcnplUzhwdUtJVk82N2tJbmZGcjFaRitLWWlreTFi?= =?utf-8?B?MmZEb3F6NUJodm9adGlHc1FWUGlwMkpEQzVMaXNXNWg3cEdVSU5uQ3YyRC9j?= =?utf-8?B?RmFCMGVQa2xKbXN5TzY0Ym9BT2VGd3drQUdkSmpEL3BUUnFOQUpLN01uN1Ir?= =?utf-8?B?SjlYdVUvSzluRy9WK0Q5TllvQ1pQaFlpRzBXUElMNlZlK3phS1pBZEIyU24v?= =?utf-8?B?V2M3TU9jZndxYkJRQWt5QnpIamp2L1RtR2RjZjcyR3E4THZkcVVHZjR0K1Fx?= =?utf-8?B?L3NZSlpCcjZwT2QxaEpmaW8xUVdmMnR5VUwwYjJ3LzRtem5YSlE3U2podC82?= =?utf-8?B?M29jMWJ3eTUvNjZ6U0hTbDRGSkpabmtkYUJ1VmdwZmxldFcwcXVvRTBqV0ZD?= =?utf-8?B?K2Vhd3pOYUM5Z1c4b1d4cm9zb0xpd1A2cHdudVNnRUE3TUxhZ0xwVlRLY2Ux?= =?utf-8?B?aDl2UWY1bWFhSnpYUnVMSjkzN2h3dWZwRU9ENVdCbjR3bzFVMDVSU0xPWkJX?= =?utf-8?B?RkJ0TUtsa2VRdnYrV1d0Y3JDM05ZblNJbEx1TjZvNXpGZzMvcWxUUmgvR0tE?= =?utf-8?B?QjQ2QUtrTjg4WURNMnFaM1JhWWlPZzhIRC82NWsyNU15eXh0ZFFqNFVHaFA0?= =?utf-8?Q?kzc0Stgph64VBIWj3i3pX9I=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 0f9f6024-d495-440d-68e5-08d9e1958f75 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5000.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 13:04:32.5192 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4InoJkZZAv4u54GXAC9eWwkWLKaPHWwigClKjIz96JkD5bsxgBiaJkTvvKHqq6PshyDVrajwjL8VKi3YguCsrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1239 X-OriginatorOrg: intel.com 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 On 1/22/2022 1:51 AM, Min Hu (Connor) wrote: > From: Chengwen Feng > > This patch remove invalid encapsulation functions. removed functions don't look like encapsulation functions, updating commit log while merging. > > Signed-off-by: Chengwen Feng > --- > drivers/net/hns3/hns3_ethdev.c | 27 ++++++++------------------- > drivers/net/hns3/hns3_ethdev_vf.c | 13 ++----------- > 2 files changed, 10 insertions(+), 30 deletions(-) > > diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c > index 9db0cb19f8..491fa41888 100644 > --- a/drivers/net/hns3/hns3_ethdev.c > +++ b/drivers/net/hns3/hns3_ethdev.c > @@ -593,22 +593,6 @@ hns3_set_vlan_rx_offload_cfg(struct hns3_adapter *hns, > return ret; > } > > -static void > -hns3_update_rx_offload_cfg(struct hns3_adapter *hns, > - struct hns3_rx_vtag_cfg *vcfg) > -{ > - struct hns3_pf *pf = &hns->pf; > - memcpy(&pf->vtag_config.rx_vcfg, vcfg, sizeof(pf->vtag_config.rx_vcfg)); > -} > - > -static void > -hns3_update_tx_offload_cfg(struct hns3_adapter *hns, > - struct hns3_tx_vtag_cfg *vcfg) > -{ > - struct hns3_pf *pf = &hns->pf; > - memcpy(&pf->vtag_config.tx_vcfg, vcfg, sizeof(pf->vtag_config.tx_vcfg)); > -} > - > static int > hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) > { > @@ -638,7 +622,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) > return ret; > } > > - hns3_update_rx_offload_cfg(hns, &rxvlan_cfg); > + memcpy(&hns->pf.vtag_config.rx_vcfg, &rxvlan_cfg, > + sizeof(struct hns3_rx_vtag_cfg)); > > return ret; > } > @@ -836,7 +821,9 @@ hns3_vlan_txvlan_cfg(struct hns3_adapter *hns, uint16_t port_base_vlan_state, > return ret; > } > > - hns3_update_tx_offload_cfg(hns, &txvlan_cfg); > + memcpy(&hns->pf.vtag_config.tx_vcfg, &txvlan_cfg, > + sizeof(struct hns3_tx_vtag_cfg)); > + > return ret; > } > > @@ -962,7 +949,9 @@ hns3_en_pvid_strip(struct hns3_adapter *hns, int on) > if (ret) > return ret; > > - hns3_update_rx_offload_cfg(hns, &rx_vlan_cfg); > + memcpy(&hns->pf.vtag_config.rx_vcfg, &rx_vlan_cfg, > + sizeof(struct hns3_rx_vtag_cfg)); > + > return ret; > } > > diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c > index a9e129288b..1af2e07e81 100644 > --- a/drivers/net/hns3/hns3_ethdev_vf.c > +++ b/drivers/net/hns3/hns3_ethdev_vf.c > @@ -1026,15 +1026,6 @@ hns3vf_get_configuration(struct hns3_hw *hw) > return hns3vf_get_port_base_vlan_filter_state(hw); > } > > -static int > -hns3vf_set_tc_queue_mapping(struct hns3_adapter *hns, uint16_t nb_rx_q, > - uint16_t nb_tx_q) > -{ > - struct hns3_hw *hw = &hns->hw; > - > - return hns3_queue_to_tc_mapping(hw, nb_rx_q, nb_tx_q); > -} > - > static void > hns3vf_request_link_info(struct hns3_hw *hw) > { > @@ -1530,7 +1521,7 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev) > goto err_set_tc_queue; > } > > - ret = hns3vf_set_tc_queue_mapping(hns, hw->tqps_num, hw->tqps_num); > + ret = hns3_queue_to_tc_mapping(hw, hw->tqps_num, hw->tqps_num); > if (ret) { > PMD_INIT_LOG(ERR, "failed to set tc info, ret = %d.", ret); > goto err_set_tc_queue; > @@ -1739,7 +1730,7 @@ hns3vf_do_start(struct hns3_adapter *hns, bool reset_queue) > uint16_t nb_tx_q = hw->data->nb_tx_queues; > int ret; > > - ret = hns3vf_set_tc_queue_mapping(hns, nb_rx_q, nb_tx_q); > + ret = hns3_queue_to_tc_mapping(hw, nb_rx_q, nb_tx_q); > if (ret) > return ret; >