From 70f4e156ea52e3d8278acff30d06447eab623a15 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Thu, 28 Jan 2021 00:05:16 +0800 Subject: [PATCH 1/1] net/ice/base: do not set VLAN mode in DCF mode 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 2e4c3f62c4..460c4f902b 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.20.1