Skip to content

Commit

Permalink
igc: Refactor igc_del_mac_filter()
Browse files Browse the repository at this point in the history
This patch does a code refactoring in igc_del_mac_filter() so it uses
the new helper igc_find_mac_filter() and improves the comment about the
special handling when deleting the default filter.

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>
  • Loading branch information
Andre Guedes authored and Jeff Kirsher committed Apr 19, 2020
1 parent 794e5bc commit 5f93071
Showing 1 changed file with 19 additions and 26 deletions.
45 changes: 19 additions & 26 deletions drivers/net/ethernet/intel/igc/igc_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2267,40 +2267,33 @@ int igc_add_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;
int rar_entries = hw->mac.rar_entry_count;
int i;
struct igc_mac_addr *entry;
int index;

if (!is_valid_ether_addr(addr))
return -EINVAL;

for (i = 0; i < rar_entries; i++) {
if (!(adapter->mac_table[i].state & IGC_MAC_STATE_IN_USE))
continue;
if (flags && (adapter->mac_table[i].state & flags) != flags)
continue;
if (!ether_addr_equal(adapter->mac_table[i].addr, addr))
continue;
index = igc_find_mac_filter(adapter, addr, flags);
if (index < 0)
return -ENOENT;

/* When a filter for the default address is "deleted",
* we return it to its initial configuration
*/
if (adapter->mac_table[i].state & IGC_MAC_STATE_DEFAULT) {
adapter->mac_table[i].state =
IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;
adapter->mac_table[i].queue = -1;
igc_set_mac_filter_hw(adapter, 0, addr, -1);
} else {
adapter->mac_table[i].state = 0;
adapter->mac_table[i].queue = -1;
memset(adapter->mac_table[i].addr, 0, ETH_ALEN);
igc_clear_mac_filter_hw(adapter, i);
}
entry = &adapter->mac_table[index];

return 0;
if (entry->state & IGC_MAC_STATE_DEFAULT) {
/* If this is the default filter, we don't actually delete it.
* We just reset to its default value i.e. disable queue
* assignment.
*/
entry->queue = -1;
igc_set_mac_filter_hw(adapter, 0, addr, entry->queue);
} else {
entry->state = 0;
entry->queue = -1;
memset(entry->addr, 0, ETH_ALEN);
igc_clear_mac_filter_hw(adapter, index);
}

return -ENOENT;
return 0;
}

static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)
Expand Down

0 comments on commit 5f93071

Please sign in to comment.