Commit 58184b8f authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Change igc_add_mac_filter() returning value 



In case of success, igc_add_mac_filter() returns the index in
adapter->mac_table where the requested filter was added. This
information, however, is not used by any caller of that function.
In fact, callers have extra code just to handle this returning
index as 0 (success).

So this patch changes the function to return 0 on success instead,
and cleans up the extra code.

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 23b7b511

drivers/net/ethernet/intel/igc/igc_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -1269,7 +1269,6 @@ int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input) 
		err = igc_add_mac_steering_filter(adapter,

						  input->filter.dst_addr,

						  input->action, 0);

		err = min_t(int, err, 0);

		if (err)

			return err;

	}
@@ -1279,7 +1278,6 @@ int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input) 
						  input->filter.src_addr,

						  input->action,

						  IGC_MAC_STATE_SRC_ADDR);

		err = min_t(int, err, 0);

		if (err)

			return err;

	}

drivers/net/ethernet/intel/igc/igc_main.c

+2 −5
Original line number Diff line number Diff line
@@ -2217,7 +2217,7 @@ static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, 
		adapter->mac_table[i].state |= IGC_MAC_STATE_IN_USE | flags;



		igc_rar_set_index(adapter, i);

		return i;

		return 0;

	}



	return -ENOSPC;
@@ -2276,11 +2276,8 @@ static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr, 
static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)

{

	struct igc_adapter *adapter = netdev_priv(netdev);

	int ret;



	ret = igc_add_mac_filter(adapter, addr, adapter->num_rx_queues, 0);



	return min_t(int, ret, 0);

	return igc_add_mac_filter(adapter, addr, adapter->num_rx_queues, 0);

}



static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr)