373-mac80211-minstrel-fix-using-short-preamble-CCK-rates.patch 1.1 KB

12345678910111213141516171819202122232425262728293031
  1. From: Felix Fietkau <nbd@nbd.name>
  2. Date: Sat, 10 Feb 2018 13:43:07 +0100
  3. Subject: [PATCH] mac80211: minstrel: fix using short preamble CCK rates on
  4. HT clients
  5. mi->supported[MINSTREL_CCK_GROUP] needs to be updated
  6. Fixes: 782dda00ab8e ("mac80211: minstrel_ht: move short preamble check out of get_rate")
  7. Signed-off-by: Felix Fietkau <nbd@nbd.name>
  8. ---
  9. --- a/net/mac80211/rc80211_minstrel_ht.c
  10. +++ b/net/mac80211/rc80211_minstrel_ht.c
  11. @@ -1135,7 +1135,6 @@ minstrel_ht_update_caps(void *priv, stru
  12. struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
  13. u16 ht_cap = sta->ht_cap.cap;
  14. struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
  15. - struct sta_info *sinfo = container_of(sta, struct sta_info, sta);
  16. int use_vht;
  17. int n_supported = 0;
  18. int ack_dur;
  19. @@ -1267,8 +1266,7 @@ minstrel_ht_update_caps(void *priv, stru
  20. if (!n_supported)
  21. goto use_legacy;
  22. - if (test_sta_flag(sinfo, WLAN_STA_SHORT_PREAMBLE))
  23. - mi->cck_supported_short |= mi->cck_supported_short << 4;
  24. + mi->supported[MINSTREL_CCK_GROUP] |= mi->cck_supported_short << 4;
  25. /* create an initial rate table with the lowest supported rates */
  26. minstrel_ht_update_stats(mp, mi);