From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Andre Guedes <andre.guedes@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 12/17] igc: Remove igc_nfc_rule_exit()
Date: Fri, 22 May 2020 19:51:04 -0700 [thread overview]
Message-ID: <20200523025109.3313635-13-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200523025109.3313635-1-jeffrey.t.kirsher@intel.com>
From: Andre Guedes <andre.guedes@intel.com>
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>
---
drivers/net/ethernet/intel/igc/igc_main.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 165263ae8add..97d26991c87e 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2591,18 +2591,6 @@ static void igc_restore_nfc_rules(struct igc_adapter *adapter)
mutex_unlock(&adapter->nfc_rule_lock);
}
-static void igc_nfc_rule_exit(struct igc_adapter *adapter)
-{
- struct igc_nfc_rule *rule;
-
- mutex_lock(&adapter->nfc_rule_lock);
-
- list_for_each_entry(rule, &adapter->nfc_rule_list, list)
- igc_disable_nfc_rule(adapter, rule);
-
- mutex_unlock(&adapter->nfc_rule_lock);
-}
-
static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)
{
struct igc_adapter *adapter = netdev_priv(netdev);
@@ -3821,8 +3809,6 @@ void igc_down(struct igc_adapter *adapter)
wr32(IGC_RCTL, rctl & ~IGC_RCTL_EN);
/* flush and sleep below */
- igc_nfc_rule_exit(adapter);
-
/* set trans_start so we don't get spurious watchdogs during reset */
netif_trans_update(netdev);
--
2.26.2
next prev parent reply other threads:[~2020-05-23 2:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-23 2:50 [net-next 00/17][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-22 Jeff Kirsher
2020-05-23 2:50 ` [net-next 01/17] igc: Refactor igc_ethtool_add_nfc_rule() Jeff Kirsher
2020-05-23 2:50 ` [net-next 02/17] igc: Fix 'sw_idx' type in struct igc_nfc_rule Jeff Kirsher
2020-05-23 2:50 ` [net-next 03/17] igc: Fix locking issue when retrieving NFC rules Jeff Kirsher
2020-05-23 2:50 ` [net-next 04/17] igc: Fix NFC rule overwrite cases Jeff Kirsher
2020-05-23 2:50 ` [net-next 05/17] igc: Fix NFC rules with multicast addresses Jeff Kirsher
2020-05-23 2:50 ` [net-next 06/17] igc: Fix NFC rules restoration Jeff Kirsher
2020-05-23 2:50 ` [net-next 07/17] igc: Refactor igc_ethtool_update_nfc_rule() Jeff Kirsher
2020-05-23 2:51 ` [net-next 08/17] igc: Fix NFC rules leak when driver is unloaded Jeff Kirsher
2020-05-23 2:51 ` [net-next 09/17] igc: Fix NFC rule validation Jeff Kirsher
2020-05-23 2:51 ` [net-next 10/17] igc: Change return type from igc_disable_nfc_rule() Jeff Kirsher
2020-05-23 2:51 ` [net-next 11/17] igc: Change adapter->nfc_rule_lock to mutex Jeff Kirsher
2020-05-23 2:51 ` Jeff Kirsher [this message]
2020-05-23 2:51 ` [net-next 13/17] igc: Remove unused descriptor's flags Jeff Kirsher
2020-05-23 2:51 ` [net-next 14/17] igb: Report speed and duplex as unknown when device is runtime suspended Jeff Kirsher
2020-05-23 2:51 ` [net-next 15/17] e1000e: Warn if disabling ULP failed Jeff Kirsher
2020-05-23 2:51 ` [net-next 16/17] e1000e: Disable TSO for buffer overrun workaround Jeff Kirsher
2020-05-23 2:51 ` [net-next 17/17] e1000e: disable s0ix entry and exit flows for ME systems Jeff Kirsher
2020-05-23 23:48 ` [net-next 00/17][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-22 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200523025109.3313635-13-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=aaron.f.brown@intel.com \
--cc=andre.guedes@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).