ath6kl: only restore supported HT caps

Now that we know the supported PHY capabilities, only restore supported
bands / HT capabilities in firmware when stopping AP.

Signed-off-by: Thomas Pedersen <c_tpeder@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 19 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index b8489772c373..c8147b953be8 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2477,6 +2477,24 @@ static int ath6kl_set_htcap(struct ath6kl_vif *vif, enum ieee80211_band band,
                                         band, htcap);
 }
 
+static int ath6kl_restore_htcap(struct ath6kl_vif *vif)
+{
+        struct wiphy *wiphy = vif->ar->wiphy;
+        int band, ret = 0;
+
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                if (!wiphy->bands[band])
+                        continue;
+
+                ret = ath6kl_set_htcap(vif, band,
+                                wiphy->bands[band]->ht_cap.ht_supported);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+
 static bool ath6kl_is_p2p_ie(const u8 *pos)
 {
         return pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
@@ -2838,13 +2856,7 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev)
         clear_bit(CONNECTED, &vif->flags);
 
         /* Restore ht setting in firmware */
-        if (ath6kl_set_htcap(vif, IEEE80211_BAND_2GHZ, true))
-                return -EIO;
-
-        if (ath6kl_set_htcap(vif, IEEE80211_BAND_5GHZ, true))
-                return -EIO;
-
-        return 0;
+        return ath6kl_restore_htcap(vif);
 }
 
 static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };