Skip to content

Commit 5c739e7

Browse files
Andre GuedesJeff Kirsher
authored andcommitted
igc: Remove igc_nfc_rule_exit()
During igc_down(), we call igc_nfc_rule_exit() which traverse the NFC rule list disabling filters one by one. Later on in igc_down() flow we issue an hardware reset which also clear all filters. Since we already reset the hardware, we don't actually need to disable each filter manually. In order to simplify the code, this patch removes igc_nfc_rule() altogether. 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>
1 parent 42fc5dc commit 5c739e7

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,18 +2591,6 @@ static void igc_restore_nfc_rules(struct igc_adapter *adapter)
25912591
mutex_unlock(&adapter->nfc_rule_lock);
25922592
}
25932593

2594-
static void igc_nfc_rule_exit(struct igc_adapter *adapter)
2595-
{
2596-
struct igc_nfc_rule *rule;
2597-
2598-
mutex_lock(&adapter->nfc_rule_lock);
2599-
2600-
list_for_each_entry(rule, &adapter->nfc_rule_list, list)
2601-
igc_disable_nfc_rule(adapter, rule);
2602-
2603-
mutex_unlock(&adapter->nfc_rule_lock);
2604-
}
2605-
26062594
static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)
26072595
{
26082596
struct igc_adapter *adapter = netdev_priv(netdev);
@@ -3821,8 +3809,6 @@ void igc_down(struct igc_adapter *adapter)
38213809
wr32(IGC_RCTL, rctl & ~IGC_RCTL_EN);
38223810
/* flush and sleep below */
38233811

3824-
igc_nfc_rule_exit(adapter);
3825-
38263812
/* set trans_start so we don't get spurious watchdogs during reset */
38273813
netif_trans_update(netdev);
38283814

0 commit comments

Comments
 (0)