greearb@xxxxxxxxxxxxxxx writes: > From: Ben Greear <greearb@xxxxxxxxxxxxxxx> > > The ath10k hw_rate codes are duplicated for > cck and ofdm modes, so we have to check a flag to > see if rate is cck or not when searching for > the proper bitrate. > > This fixes monitor mode reporting invalid rates > on my setup. > > Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx> Please rebase, doesn't apply and it used unknown SHA1 ids: Applying: ath10k: Fix OFDM rx-rate reporting. fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/htt_rx.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ath10k: Fix OFDM rx-rate reporting. > u8 ath10k_mac_hw_rate_to_idx(const struct ieee80211_supported_band *sband, > - u8 hw_rate) > + u8 hw_rate, u8 cck) A boolean for cck would be nice because that's what it release is. > @@ -99,6 +99,12 @@ u8 ath10k_mac_hw_rate_to_idx(const struct ieee80211_supported_band *sband, > for (i = 0; i < sband->n_bitrates; i++) { > rate = &sband->bitrates[i]; > > + /* hw_rate values are not unique, have to tie-break with bitrate > + * and cck check. > + */ > + if (ath10k_mac_bitrate_is_cck(rate->bitrate) && !cck) > + continue; Then this check could be just 'if (is_cck() != cck) -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html