On 05/30/2012 04:45 PM, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > When CONFIG_PM is enabled, no device can possibly > support WoWLAN since it can't go to sleep to start > with. Due to this, mac80211 had even rejected the > hardware registration. By making all the code and > data for WoWLAN depend on CONFIG_PM we can promote > this runtime error to a compile-time error. > > Add #ifdef around all WoWLAN code to remove it in > systems that don't need it as they never suspend. > > Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> > Cc: Luciano Coelho <coelho@xxxxxx> > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> For the ath6kl part: Acked-by: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> > --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c > +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c > @@ -3517,6 +3517,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) > wiphy->cipher_suites = cipher_suites; > wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites); > > +#ifdef CONFIG_PM > wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | > WIPHY_WOWLAN_DISCONNECT | > WIPHY_WOWLAN_GTK_REKEY_FAILURE | > @@ -3526,6 +3527,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) > wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST; > wiphy->wowlan.pattern_min_len = 1; > wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE; > +#endif To be honest I'm not really fond of ifdefs in the code, but that's just me :) Kalle -- 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
