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 41219A0C40 for ; Fri, 11 Jun 2021 09:20:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B74741103; Fri, 11 Jun 2021 09:20:13 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 06E244014F for ; Fri, 11 Jun 2021 09:20:10 +0200 (CEST) IronPort-SDR: 5erVtawxE8DrW1lhG8n22EBC2s6fuY/EqocZkcvG1lhYmYRWXOlpa3YaIU+ZwQqaVF0Ly+/KA7 7NQzVu0oKDTw== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="291108177" X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="291108177" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2021 00:20:10 -0700 IronPort-SDR: A7OdMUvSE/7GBcmbldk86uzUIcacqpR8KA7JMteRmTE/mNRcWQLU+e/IllQJ9U3ihsPZGe6wow iI3szv5Y+8BA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="553333187" Received: from npg-dpdk-haiyue-1.sh.intel.com ([10.67.118.197]) by fmsmga001.fm.intel.com with ESMTP; 11 Jun 2021 00:20:08 -0700 From: Haiyue Wang To: stable@dpdk.org Cc: bluca@debian.org, xuemingl@nvidia.com, thomas@monjalon.net, christian.ehrhardt@canonical.com, ktraynor@redhat.com, qi.z.zhang@intel.com, Haiyue Wang , Qiming Yang Date: Fri, 11 Jun 2021 14:58:14 +0800 Message-Id: <20210611065825.47678-8-haiyue.wang@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210611065825.47678-1-haiyue.wang@intel.com> References: <20210611065825.47678-1-haiyue.wang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] =?utf-8?q?=5BPATCH=C2=A020=2E11_v1_07/18=5D_net/ic?= =?utf-8?q?e/base=3A_do_not_set_VLAN_mode_in_DCF_mode?= X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit 70f4e156ea52e3d8278acff30d06447eab623a15 ] The PF will set the VLAN mode globally, DCF just needs to get the VLAN mode. Signed-off-by: Haiyue Wang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_vlan_mode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ice/base/ice_vlan_mode.c b/drivers/net/ice/base/ice_vlan_mode.c index c86e803c52..42bb108928 100644 --- a/drivers/net/ice/base/ice_vlan_mode.c +++ b/drivers/net/ice/base/ice_vlan_mode.c @@ -354,6 +354,12 @@ static enum ice_status ice_set_svm(struct ice_hw *hw) */ enum ice_status ice_set_vlan_mode(struct ice_hw *hw) { + /* DCF only has the ability to query the VLAN mode. Setting the VLAN + * mode is done by the PF. + */ + if (hw->dcf_enabled) + return ICE_SUCCESS; + if (!ice_is_dvm_supported(hw)) return ICE_SUCCESS; -- 2.32.0