Commit 83ba21b9 authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Remove igc_*_mac_steering_filter() wrappers 



With the previous two patches, igc_add_mac_steering_filter() and
igc_del_mac_steering_filter() became a pointless wrapper of
igc_add_mac_filter() and igc_del_mac_filter().

This patch removes these wrappers and update callers to call
igc_add_mac_filter() and igc_del_mac_filter() directly.

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 e9736fa4

drivers/net/ethernet/intel/igc/igc.h

+4 −4
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ void igc_write_rss_indir_tbl(struct igc_adapter *adapter); 
bool igc_has_link(struct igc_adapter *adapter);

void igc_reset(struct igc_adapter *adapter);

int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx);

int igc_add_mac_steering_filter(struct igc_adapter *adapter,

				const u8 *addr, u8 queue, u8 flags);

int igc_del_mac_steering_filter(struct igc_adapter *adapter,

				const u8 *addr, u8 queue, u8 flags);

int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,

		       const s8 queue, const u8 flags);

int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,

		       const u8 flags);

void igc_update_stats(struct igc_adapter *adapter);



/* igc_dump declarations */

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

+8 −12
Original line number Diff line number Diff line
@@ -1266,16 +1266,14 @@ int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input) 
	}



	if (input->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR) {

		err = igc_add_mac_steering_filter(adapter,

						  input->filter.dst_addr,

		err = igc_add_mac_filter(adapter, input->filter.dst_addr,

					 input->action, 0);

		if (err)

			return err;

	}



	if (input->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR) {

		err = igc_add_mac_steering_filter(adapter,

						  input->filter.src_addr,

		err = igc_add_mac_filter(adapter, input->filter.src_addr,

					 input->action,

					 IGC_MAC_STATE_SRC_ADDR);

		if (err)
@@ -1331,13 +1329,11 @@ int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input) 
					   ntohs(input->filter.vlan_tci));



	if (input->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR)

		igc_del_mac_steering_filter(adapter, input->filter.src_addr,

					    input->action,

		igc_del_mac_filter(adapter, input->filter.src_addr,

				   IGC_MAC_STATE_SRC_ADDR);



	if (input->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR)

		igc_del_mac_steering_filter(adapter, input->filter.dst_addr,

					    input->action, 0);

		igc_del_mac_filter(adapter, input->filter.dst_addr, 0);



	return 0;

}

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

+4 −16
Original line number Diff line number Diff line
@@ -2209,7 +2209,7 @@ static bool igc_mac_entry_can_be_used(const struct igc_mac_addr *entry, 
 *

 * Return: 0 in case of success, negative errno code otherwise.

 */

static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,

int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,

		       const s8 queue, const u8 flags)

{

	struct igc_hw *hw = &adapter->hw;
@@ -2250,7 +2250,7 @@ static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, 
 *

 * Return: 0 in case of success, negative errno code otherwise.

 */

static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,

int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,

		       const u8 flags)

{

	struct igc_hw *hw = &adapter->hw;
@@ -3733,18 +3733,6 @@ igc_features_check(struct sk_buff *skb, struct net_device *dev, 
	return features;

}



int igc_add_mac_steering_filter(struct igc_adapter *adapter,

				const u8 *addr, u8 queue, u8 flags)

{

	return igc_add_mac_filter(adapter, addr, queue, flags);

}



int igc_del_mac_steering_filter(struct igc_adapter *adapter,

				const u8 *addr, u8 queue, u8 flags)

{

	return igc_del_mac_filter(adapter, addr, flags);

}



static void igc_tsync_interrupt(struct igc_adapter *adapter)

{

	struct igc_hw *hw = &adapter->hw;