Commit 9d6ae1f5 authored by Pradeep Kumar Chitrapu's avatar Pradeep Kumar Chitrapu Committed by Kalle Valo
Browse files

ath11k: fix packet drops due to incorrect 6 GHz freq value in rx status 



Frequency in rx status is being filled incorrectly in the 6 GHz band as
channel number received is invalid in this case which is causing packet
drops. So fix that.

Fixes: 5dcf42f8 ("ath11k: Use freq instead of channel number in rx path")
Signed-off-by: default avatarPradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210722102054.43419-2-jouni@codeaurora.org
parent 4a9550f5

drivers/net/wireless/ath/ath11k/dp_rx.c

+6 −3
Original line number Diff line number Diff line
@@ -2393,8 +2393,10 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc, 
	channel_num = meta_data;

	center_freq = meta_data >> 16;



	if (center_freq >= 5935 && center_freq <= 7105) {

	if (center_freq >= ATH11K_MIN_6G_FREQ &&

	    center_freq <= ATH11K_MAX_6G_FREQ) {

		rx_status->band = NL80211_BAND_6GHZ;

		rx_status->freq = center_freq;

	} else if (channel_num >= 1 && channel_num <= 14) {

		rx_status->band = NL80211_BAND_2GHZ;

	} else if (channel_num >= 36 && channel_num <= 173) {
@@ -2412,6 +2414,7 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc, 
				rx_desc, sizeof(struct hal_rx_desc));

	}



	if (rx_status->band != NL80211_BAND_6GHZ)

		rx_status->freq = ieee80211_channel_to_frequency(channel_num,

								 rx_status->band);

drivers/net/wireless/ath/ath11k/wmi.c

+7 −3
Original line number Diff line number Diff line
@@ -6184,8 +6184,10 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb) 
	if (rx_ev.status & WMI_RX_STATUS_ERR_MIC)

		status->flag |= RX_FLAG_MMIC_ERROR;



	if (rx_ev.chan_freq >= ATH11K_MIN_6G_FREQ) {

	if (rx_ev.chan_freq >= ATH11K_MIN_6G_FREQ &&

	    rx_ev.chan_freq <= ATH11K_MAX_6G_FREQ) {

		status->band = NL80211_BAND_6GHZ;

		status->freq = rx_ev.chan_freq;

	} else if (rx_ev.channel >= 1 && rx_ev.channel <= 14) {

		status->band = NL80211_BAND_2GHZ;

	} else if (rx_ev.channel >= 36 && rx_ev.channel <= ATH11K_MAX_5G_CHAN) {
@@ -6206,8 +6208,10 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb) 


	sband = &ar->mac.sbands[status->band];



	if (status->band != NL80211_BAND_6GHZ)

		status->freq = ieee80211_channel_to_frequency(rx_ev.channel,

							      status->band);



	status->signal = rx_ev.snr + ATH11K_DEFAULT_NOISE_FLOOR;

	status->rate_idx = ath11k_mac_bitrate_to_idx(sband, rx_ev.rate / 100);