| Message ID | 20081117181336.1a270561@osprey.hogchain.net |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Jay Cliburn wrote: > [adding netdev to cc list] > > On Mon, 17 Nov 2008 21:43:16 +0000 > Alan Jenkins <alan-jenkins@tuffmail.co.uk> wrote: > > > >> Don't listen to me. The problem went away because when I was testing >> my patch, I plugged the ethernet in and actually used it. My patch >> doesn't seem to fix anything. >> >> So I now have the steps to reproduce this warning: remove the ethernet >> cable and suspend. >> >> Also, I was speaking rubbish because the warning isn't on the resume >> path. It seems to be when network-manager re-opens the device on >> resume. >> >> I'll have another look for possible culprits. Hints appreciated :). >> > > Does this help? > Ah! Yes, that fixes it, thanks. > diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c > index f5bdc92..5b292f0 100644 > --- a/drivers/net/atlx/atl2.c > +++ b/drivers/net/atlx/atl2.c > @@ -1690,10 +1690,6 @@ static int atl2_resume(struct pci_dev *pdev) > > ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); > > - err = atl2_request_irq(adapter); > - if (netif_running(netdev) && err) > - return err; > - > atl2_reset_hw(&adapter->hw); > > if (netif_running(netdev)) > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Alan Jenkins wrote: > Jay Cliburn wrote: > >> [adding netdev to cc list] >> >> On Mon, 17 Nov 2008 21:43:16 +0000 >> Alan Jenkins <alan-jenkins@tuffmail.co.uk> wrote: >> >> >> >> >>> Don't listen to me. The problem went away because when I was testing >>> my patch, I plugged the ethernet in and actually used it. My patch >>> doesn't seem to fix anything. >>> >>> So I now have the steps to reproduce this warning: remove the ethernet >>> cable and suspend. >>> >>> Also, I was speaking rubbish because the warning isn't on the resume >>> path. It seems to be when network-manager re-opens the device on >>> resume. >>> >>> I'll have another look for possible culprits. Hints appreciated :). >>> >>> >> Does this help? >> >> > > Ah! Yes, that fixes it, thanks. > Just noticed another problem. If I suspend with the cable plugged in, I get a warning message about freeing the IRQ: [ 331.023417] atl2 0000:03:00.0: restoring config space at offset 0x1 (was 0x100006, writing 0x100406) [ 331.023453] atl2 0000:03:00.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17 [ 331.023462] atl2 0000:03:00.0: setting latency timer to 64 [ 331.043449] ath5k_pci 0000:01:00.0: restoring config space at offset 0xf (was 0x100, writing 0x10a) ... [ 332.681591] Restarting tasks ... done. [ 333.617398] hpet1: lost 2 rtc interrupts [ 334.016700] Trying to free already-free IRQ 17 [ 334.057257] ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 334.082570] atl2 0000:03:00.0: irq 44 for MSI/MSI-X -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index f5bdc92..5b292f0 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -1690,10 +1690,6 @@ static int atl2_resume(struct pci_dev *pdev) ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); - err = atl2_request_irq(adapter); - if (netif_running(netdev) && err) - return err; - atl2_reset_hw(&adapter->hw); if (netif_running(netdev))