From 65e2ff5b1e0a471b267fdf66f1ff28024df9ba1b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:44 -0400 Subject: [PATCH] net/ice/base: ignore promiscuous already exist [ upstream commit 68834871b24d60c89029a43e20be1187673d0529 ] Ignore ERR_ALREADY_EXISTS error when setting promiscuous mode. This fix is needed because the driver could set promiscuous mode when it still has not cleared properly. Promiscuous mode could be set only once, so setting it second time will be rejected. Fixes: 60ff6f5ce2d8 ("net/ice/base: consolidate VF promiscuous mode") Signed-off-by: Grzegorz Siwik Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 5a001222bc..c94d15934b 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6231,7 +6231,7 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, status = _ice_set_vsi_promisc(hw, vsi_handle, promisc_mask, vlan_id, lport, sw); - if (status) + if (status && status != ICE_ERR_ALREADY_EXISTS) break; }