On Tue, Dec 07, 2010 at 12:57:52PM -0800, Johannes Berg wrote: > On Tue, 2010-12-07 at 12:56 -0800, Luis R. Rodriguez wrote: > > > > Not really, since we do scan_cancel() within suspend()... I guess I'd > > > like to find out why that doesn't do what I think it does. > > > > Well lets see, this is only reproducible with the new DBUS APIs, and > > frankly I am not sure what these things do. Is it possible we have a > > race between how it brings down an interface for suspend and canceling > > a scan? > > But both suspend and do_stop should run under RTNL. Paul, can you try this instead of these two patches. What this does is it assumes mac80211 will tell us that stop() implies to disable the radio as explained in the documentation and that any further operations will not happen, and that idle settings prior to mac80211 issuing a start() callback are the responsibility of the driver to ensure integrity on. Because of this we ensure idle on stop() as no other interfaces are possible enabled and we also ensure it to be idle on resume. diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 97ddb32..eb98f7f 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1337,8 +1337,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) ath9k_ps_restore(sc); - /* Finally, put the chip in FULL SLEEP mode */ - ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP); + sc->ps_idle = true; + ath_radio_disable(sc, hw); sc->sc_flags |= SC_OP_INVALID; diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 09f69a9..47334f3 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -297,6 +297,9 @@ static int ath_pci_resume(struct device *device) AR_GPIO_OUTPUT_MUX_AS_OUTPUT); ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1); + sc->ps_idle = true; + ath_radio_disable(sc, hw); + return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
