leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

igc: Remove 'queue' check in igc_del_mac_filter()

Browse Source 
igc_add_mac_filter() doesn't allow us to have more than one entry with
the same address and address type in adapter->mac_table so checking if
'queue' matches in igc_del_mac_filter() isn't necessary. This patch
removes that check.

This patch also takes the opportunity to improve the igc_del_mac_filter
documentation and remove comment which is not applicable to this I225
controller.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Andre Guedes
2020-04-01 14:41:43 -07:00
committed by Jeff Kirsher
parent a73eb65100
commit c6aae5917b
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/intel/igc/igc_main.c
View File

@@ -2233,14 +2233,17 @@ static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,
return -ENOSPC; return -ENOSPC;
} }
/* Remove a MAC filter for 'addr' directing matching traffic to /**
* 'queue', 'flags' is used to indicate what kind of match need to be * igc_del_mac_filter() - Delete MAC address filter
* removed, match is by default for the destination address, if * @adapter: Pointer to adapter where the filter should be deleted from
* matching by source address is to be removed the flag * @addr: MAC address
* IGC_MAC_STATE_SRC_ADDR can be used. * @flags: Set IGC_MAC_STATE_SRC_ADDR bit to indicate @address is a source
* address
*
* Return: 0 in case of success, negative errno code otherwise.
*/ */
static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr, static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,
const u8 queue, const u8 flags) const u8 flags)
{ {
struct igc_hw *hw = &adapter->hw; struct igc_hw *hw = &adapter->hw;
int rar_entries = hw->mac.rar_entry_count; int rar_entries = hw->mac.rar_entry_count;
@@ -2249,17 +2252,11 @@ static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,
if (!is_valid_ether_addr(addr)) if (!is_valid_ether_addr(addr))
return -EINVAL; return -EINVAL;
/* Search for matching entry in the MAC table based on given address
* and queue. Do not touch entries at the end of the table reserved
* for the VF MAC addresses.
*/
for (i = 0; i < rar_entries; i++) { for (i = 0; i < rar_entries; i++) {
if (!(adapter->mac_table[i].state & IGC_MAC_STATE_IN_USE)) if (!(adapter->mac_table[i].state & IGC_MAC_STATE_IN_USE))
continue; continue;
if (flags && (adapter->mac_table[i].state & flags) != flags) if (flags && (adapter->mac_table[i].state & flags) != flags)
continue; continue;
if (adapter->mac_table[i].queue != queue)
continue;
if (!ether_addr_equal(adapter->mac_table[i].addr, addr)) if (!ether_addr_equal(adapter->mac_table[i].addr, addr))
continue; continue;
@@ -2295,7 +2292,7 @@ static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr)
{ {
struct igc_adapter *adapter = netdev_priv(netdev); struct igc_adapter *adapter = netdev_priv(netdev);
return igc_del_mac_filter(adapter, addr, adapter->num_rx_queues, 0); return igc_del_mac_filter(adapter, addr, 0);
} }
/** /**
@@ -3738,7 +3735,7 @@ int igc_add_mac_steering_filter(struct igc_adapter *adapter,
int igc_del_mac_steering_filter(struct igc_adapter *adapter, int igc_del_mac_steering_filter(struct igc_adapter *adapter,
const u8 *addr, u8 queue, u8 flags) const u8 *addr, u8 queue, u8 flags)
{ {
return igc_del_mac_filter(adapter, addr, queue, return igc_del_mac_filter(adapter, addr,
IGC_MAC_STATE_QUEUE_STEERING | flags); IGC_MAC_STATE_QUEUE_STEERING | flags);
} }