1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index d560a8aa5015..09d1c314b68f 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -1538,9 +1538,20 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id,
         } else if (!list_elem->vsi_list_info) {
                 status = ICE_ERR_DOES_NOT_EXIST;
                 goto exit;
+        } else if (list_elem->vsi_list_info->ref_cnt > 1) {
+                /* a ref_cnt > 1 indicates that the vsi_list is being
+                 * shared by multiple rules. Decrement the ref_cnt and
+                 * remove this rule, but do not modify the list, as it
+                 * is in-use by other rules.
+                 */
+                list_elem->vsi_list_info->ref_cnt--;
+                remove_rule = true;
         } else {
-                if (list_elem->vsi_list_info->ref_cnt > 1)
-                        list_elem->vsi_list_info->ref_cnt--;
+                /* a ref_cnt of 1 indicates the vsi_list is only used
+                 * by one rule. However, the original removal request is only
+                 * for a single VSI. Update the vsi_list first, and only
+                 * remove the rule if there are no further VSIs in this list.
+                 */
                 vsi_handle = f_entry->fltr_info.vsi_handle;
                 status = ice_rem_update_vsi_list(hw, vsi_handle, list_elem);
                 if (status)