aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPreethi Banala <preethi.banala@intel.com>2019-02-19 15:04:04 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-03-26 14:51:59 -0700
commit89f3e4a5b762db66de94c44cfea11195f9d549b3 (patch)
tree89fbee564bf52b63bfc134f92279e32791c072dd
parentice: Fix issue with VF attempt to delete default MAC address (diff)
downloadlinux-dev-89f3e4a5b762db66de94c44cfea11195f9d549b3.tar.xz
linux-dev-89f3e4a5b762db66de94c44cfea11195f9d549b3.zip
ice: Do not bail out when filter already exists
If filter already exists, do not go through error path flow but instead continue to process rest of the function. Hence have an appropriate check after adding MAC filters. Signed-off-by: Preethi Banala <preethi.banala@intel.com> Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 54b1db4db7d4..514aa31db8a6 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -260,7 +260,11 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
/* Add mac addresses in the sync list */
status = ice_add_mac(hw, &vsi->tmp_sync_list);
ice_free_fltr_list(dev, &vsi->tmp_sync_list);
- if (status) {
+ /* If filter is added successfully or already exists, do not go into
+ * 'if' condition and report it as error. Instead continue processing
+ * rest of the function.
+ */
+ if (status && status != ICE_ERR_ALREADY_EXISTS) {
netdev_err(netdev, "Failed to add MAC filters\n");
/* If there is no more space for new umac filters, vsi
* should go into promiscuous mode. There should be some