iwlwifi: mvm: limit TLC according to our HE capabilities

Instead of setting the TLC config command according to the
rates the peer supports, make sure that we aren't also
limited by our own rates, so take the minimum between the
peer's supported RX rates and our supported TX rates.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
index 3ffdbfdb37c08df5843b23c8f869b48d3ada7767..659e21b2d4e7293ed913d60f9285c25d42862187 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
@@ -230,19 +230,43 @@ static u16 rs_fw_he_ieee80211_mcs_to_rs_mcs(u16 mcs)
 
 static void
 rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,
-                          const struct ieee80211_sta_he_cap *he_cap,
+                          struct ieee80211_supported_band *sband,
                           struct iwl_tlc_config_cmd *cmd)
 {
-       u16 mcs_160 = le16_to_cpu(sta->he_cap.he_mcs_nss_supp.rx_mcs_160);
-       u16 mcs_80 = le16_to_cpu(sta->he_cap.he_mcs_nss_supp.rx_mcs_80);
+       const struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
+       u16 mcs_160 = le16_to_cpu(he_cap->he_mcs_nss_supp.rx_mcs_160);
+       u16 mcs_80 = le16_to_cpu(he_cap->he_mcs_nss_supp.rx_mcs_80);
+       u16 tx_mcs_80 =
+               le16_to_cpu(sband->iftype_data->he_cap.he_mcs_nss_supp.tx_mcs_80);
+       u16 tx_mcs_160 =
+               le16_to_cpu(sband->iftype_data->he_cap.he_mcs_nss_supp.tx_mcs_160);
        int i;
 
        for (i = 0; i < sta->rx_nss && i < MAX_NSS; i++) {
                u16 _mcs_160 = (mcs_160 >> (2 * i)) & 0x3;
                u16 _mcs_80 = (mcs_80 >> (2 * i)) & 0x3;
-
+               u16 _tx_mcs_160 = (tx_mcs_160 >> (2 * i)) & 0x3;
+               u16 _tx_mcs_80 = (tx_mcs_80 >> (2 * i)) & 0x3;
+
+               /* If one side doesn't support - mark both as not supporting */
+               if (_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED ||
+                   _tx_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED) {
+                       _mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;
+                       _tx_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;
+               }
+               if (_mcs_80 > _tx_mcs_80)
+                       _mcs_80 = _tx_mcs_80;
                cmd->ht_rates[i][0] =
                        cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_80));
+
+               /* If one side doesn't support - mark both as not supporting */
+               if (_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED ||
+                   _tx_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED) {
+                       _mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;
+                       _tx_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;
+               }
+               if (_mcs_160 > _tx_mcs_160)
+                       _mcs_160 = _tx_mcs_160;
                cmd->ht_rates[i][1] =
                        cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_160));
        }
@@ -271,7 +295,7 @@ static void rs_fw_set_supp_rates(struct ieee80211_sta *sta,
        /* HT/VHT rates */
        if (he_cap && he_cap->has_he) {
                cmd->mode = IWL_TLC_MNG_MODE_HE;
-               rs_fw_he_set_enabled_rates(sta, he_cap, cmd);
+               rs_fw_he_set_enabled_rates(sta, sband, cmd);
        } else if (vht_cap && vht_cap->vht_supported) {
                cmd->mode = IWL_TLC_MNG_MODE_VHT;
                rs_fw_vht_set_enabled_rates(sta, vht_cap, cmd);