The patch titled
e1000: Fix regression: garbled stats and irq allocation during swsusp
has been removed from the -mm tree. Its filename was
e1000-fix-regression-garbled-stats-and-irq-allocation-during.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: e1000: Fix regression: garbled stats and irq allocation during swsusp
From: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled
device showing garbled statistics and undetermined irq allocation state,
where `ifconfig eth0 down` would display `trying to free already freed
irq`.
Explicitly free and allocate irq as well as powerup the PHY during resume
fixes.
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e1000/e1000_main.c | 6 ++++++
1 files changed, 6 insertions(+)
diff -puN drivers/net/e1000/e1000_main.c~e1000-fix-regression-garbled-stats-and-irq-allocation-during drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c~e1000-fix-regression-garbled-stats-and-irq-allocation-during
+++ a/drivers/net/e1000/e1000_main.c
@@ -4800,6 +4800,8 @@ e1000_suspend(struct pci_dev *pdev, pm_m
if (adapter->hw.phy_type == e1000_phy_igp_3)
e1000_phy_powerdown_workaround(&adapter->hw);
+ e1000_free_irq(adapter);
+
/* Release control of h/w to f/w. If f/w is AMT enabled, this
* would have already happened in close and is redundant. */
e1000_release_hw_control(adapter);
@@ -4830,6 +4832,10 @@ e1000_resume(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
+ if ((err = e1000_request_irq(adapter)))
+ return err;
+
+ e1000_power_up_phy(adapter);
e1000_reset(adapter);
E1000_WRITE_REG(&adapter->hw, WUS, ~0);
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
git-netdev-all.patch
e1000-fix-regression-garbled-stats-and-irq-allocation-during.patch
e1000-fix-regression-garbled-stats-and-irq-allocation-during-fix.patch
e1000_7033_dump_ring.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
