diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2015-01-30 08:35:21 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-03 08:30:52 -0500 |
commit | 4895efc9a11ba6a3089b42c5dd4aabf68e467d64 (patch) | |
tree | 60d814d3e6fd18a2c36193cde90d662dea699e34 /drivers/net/wireless | |
parent | fc8f0456dcce1701291928febf8410994749d4af (diff) |
ath9k: Remove ATH9K_HW_WOW_DEVICE_CAPABLE
Enabling WOW based on the chip is incorrect since
it needs to be done for specific sub-devices which
have proper platform support.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/wow.c | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 82d8f32a3461..8c2f9e290b35 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -2544,9 +2544,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) | |||
2544 | pCap->hw_caps |= ATH9K_HW_CAP_RTT; | 2544 | pCap->hw_caps |= ATH9K_HW_CAP_RTT; |
2545 | } | 2545 | } |
2546 | 2546 | ||
2547 | if (AR_SREV_9462(ah)) | ||
2548 | pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE; | ||
2549 | |||
2550 | if (AR_SREV_9300_20_OR_LATER(ah) && | 2547 | if (AR_SREV_9300_20_OR_LATER(ah) && |
2551 | ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) | 2548 | ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) |
2552 | pCap->hw_caps |= ATH9K_HW_CAP_PAPRD; | 2549 | pCap->hw_caps |= ATH9K_HW_CAP_PAPRD; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 450704e49f03..dabc94e11805 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -248,12 +248,10 @@ enum ath9k_hw_caps { | |||
248 | #ifdef CONFIG_ATH9K_PCOEM | 248 | #ifdef CONFIG_ATH9K_PCOEM |
249 | ATH9K_HW_CAP_RTT = BIT(14), | 249 | ATH9K_HW_CAP_RTT = BIT(14), |
250 | ATH9K_HW_CAP_MCI = BIT(15), | 250 | ATH9K_HW_CAP_MCI = BIT(15), |
251 | ATH9K_HW_WOW_DEVICE_CAPABLE = BIT(16), | ||
252 | ATH9K_HW_CAP_BT_ANT_DIV = BIT(17), | 251 | ATH9K_HW_CAP_BT_ANT_DIV = BIT(17), |
253 | #else | 252 | #else |
254 | ATH9K_HW_CAP_RTT = 0, | 253 | ATH9K_HW_CAP_RTT = 0, |
255 | ATH9K_HW_CAP_MCI = 0, | 254 | ATH9K_HW_CAP_MCI = 0, |
256 | ATH9K_HW_WOW_DEVICE_CAPABLE = 0, | ||
257 | ATH9K_HW_CAP_BT_ANT_DIV = 0, | 255 | ATH9K_HW_CAP_BT_ANT_DIV = 0, |
258 | #endif | 256 | #endif |
259 | ATH9K_HW_CAP_DFS = BIT(18), | 257 | ATH9K_HW_CAP_DFS = BIT(18), |
diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c index 5f30e580d942..4ffaadd167a8 100644 --- a/drivers/net/wireless/ath/ath9k/wow.c +++ b/drivers/net/wireless/ath/ath9k/wow.c | |||
@@ -352,9 +352,7 @@ void ath9k_init_wow(struct ieee80211_hw *hw) | |||
352 | { | 352 | { |
353 | struct ath_softc *sc = hw->priv; | 353 | struct ath_softc *sc = hw->priv; |
354 | 354 | ||
355 | if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) && | 355 | if ((sc->driver_data & ATH9K_PCI_WOW) && device_can_wakeup(sc->dev)) |
356 | (sc->driver_data & ATH9K_PCI_WOW) && | ||
357 | device_can_wakeup(sc->dev)) | ||
358 | hw->wiphy->wowlan = &ath9k_wowlan_support; | 356 | hw->wiphy->wowlan = &ath9k_wowlan_support; |
359 | 357 | ||
360 | atomic_set(&sc->wow_sleep_proc_intr, -1); | 358 | atomic_set(&sc->wow_sleep_proc_intr, -1); |