aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_main.c
diff options
context:
space:
mode:
authorPreethi Banala <preethi.banala@intel.com>2019-02-19 18:04:04 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-03-26 17:51:59 -0400
commit89f3e4a5b762db66de94c44cfea11195f9d549b3 (patch)
tree89fbee564bf52b63bfc134f92279e32791c072dd /drivers/net/ethernet/intel/ice/ice_main.c
parent4e1af7bf22ca913502fb04c06477b9265b54684f (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
-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)
260 /* Add mac addresses in the sync list */ 260 /* Add mac addresses in the sync list */
261 status = ice_add_mac(hw, &vsi->tmp_sync_list); 261 status = ice_add_mac(hw, &vsi->tmp_sync_list);
262 ice_free_fltr_list(dev, &vsi->tmp_sync_list); 262 ice_free_fltr_list(dev, &vsi->tmp_sync_list);
263 if (status) { 263 /* If filter is added successfully or already exists, do not go into
264 * 'if' condition and report it as error. Instead continue processing
265 * rest of the function.
266 */
267 if (status && status != ICE_ERR_ALREADY_EXISTS) {
264 netdev_err(netdev, "Failed to add MAC filters\n"); 268 netdev_err(netdev, "Failed to add MAC filters\n");
265 /* If there is no more space for new umac filters, vsi 269 /* If there is no more space for new umac filters, vsi
266 * should go into promiscuous mode. There should be some 270 * should go into promiscuous mode. There should be some