[Intel-wired-lan] [PATCH] igb: Fix error that repeat to add filter when changing adapter speed
Gangfeng
gangfeng.huang at ni.com
Wed May 3 01:20:09 UTC 2017
From: Gangfeng Huang <gangfeng.huang at ni.com>
Function igb_nfc_filter_exit()/igb_nfc_filter_restore() should be paried,
igb_nfc_filter_restore exist in igb_up(), but igb_nfc_filter_exit() exist
in __igb_close(), so move the igb_nfc_filter_exit() to igb_down().
Signed-off-by: Gangfeng <gangfeng.huang at ni.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 8f624af..e01e01a 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1791,6 +1791,8 @@ void igb_down(struct igb_adapter *adapter)
wr32(E1000_RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
+ igb_nfc_filter_exit(adapter);
+
netif_carrier_off(netdev);
netif_tx_stop_all_queues(netdev);
@@ -3317,8 +3319,6 @@ static int __igb_close(struct net_device *netdev, bool suspending)
igb_down(adapter);
igb_free_irq(adapter);
- igb_nfc_filter_exit(adapter);
-
igb_free_all_tx_resources(adapter);
igb_free_all_rx_resources(adapter);
--
2.7.2
More information about the Intel-wired-lan
mailing list