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>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 82d8f32a346109f2ab51f0f4bd7ac10cd86a3a44..8c2f9e290b35d10920a5191f5d8b02e5f4ca57cb 100644 (file)
--- 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)
                        pCap->hw_caps |= ATH9K_HW_CAP_RTT;
        }
 
-       if (AR_SREV_9462(ah))
-               pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE;
-
        if (AR_SREV_9300_20_OR_LATER(ah) &&
            ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
                        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 450704e49f03ef5f262aa690d512612ec4f60b65..dabc94e11805e483c1eebcd74df751af893ee780 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -248,12 +248,10 @@ enum ath9k_hw_caps {
 #ifdef CONFIG_ATH9K_PCOEM
        ATH9K_HW_CAP_RTT                        = BIT(14),
        ATH9K_HW_CAP_MCI                        = BIT(15),
-       ATH9K_HW_WOW_DEVICE_CAPABLE             = BIT(16),
        ATH9K_HW_CAP_BT_ANT_DIV                 = BIT(17),
 #else
        ATH9K_HW_CAP_RTT                        = 0,
        ATH9K_HW_CAP_MCI                        = 0,
-       ATH9K_HW_WOW_DEVICE_CAPABLE             = 0,
        ATH9K_HW_CAP_BT_ANT_DIV                 = 0,
 #endif
        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 5f30e580d94291e787aa87e572e51225ce7c67a1..4ffaadd167a86a653a2c71f33580a17f4f6caf52 100644 (file)
--- 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)
 {
        struct ath_softc *sc = hw->priv;
 
-       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
-           (sc->driver_data & ATH9K_PCI_WOW) &&
-           device_can_wakeup(sc->dev))
+       if ((sc->driver_data & ATH9K_PCI_WOW) && device_can_wakeup(sc->dev))
                hw->wiphy->wowlan = &ath9k_wowlan_support;
 
        atomic_set(&sc->wow_sleep_proc_intr, -1);