diff mbox series

wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz

Message ID 20230726044624.20507-1-quic_adisi@quicinc.com (mailing list archive)
State Accepted
Commit 72c8caf904aed2caed5d6e75233294b6159ddb5d
Delegated to: Kalle Valo
Headers show
Series wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz | expand

Commit Message

Aditya Kumar Singh July 26, 2023, 4:46 a.m. UTC
5 GHz band channel 177 support was added with the commit
"wifi: ath11k: add channel 177 into 5 GHz channel list". However,
during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel
number is checked only till 173. This leads to driver code checking for
channel and then fetching the band from it which is extra effort since
firmware has already given the channel number in the meta deta.

Fix this issue by checking the channel number till 177 since we support
it now.

Found via code review. Compile tested only.

Fixes: e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
---
 drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jeff Johnson July 26, 2023, 4:54 p.m. UTC | #1
On 7/25/2023 9:46 PM, Aditya Kumar Singh wrote:
> 5 GHz band channel 177 support was added with the commit
> "wifi: ath11k: add channel 177 into 5 GHz channel list". However,

I'd use the same syntax here as in the Fixes tag:
e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")

> during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel
> number is checked only till 173. This leads to driver code checking for
> channel and then fetching the band from it which is extra effort since
> firmware has already given the channel number in the meta deta.

nit: s/meta deta/metadata/

> 
> Fix this issue by checking the channel number till 177 since we support
> it now.
> 
> Found via code review. Compile tested only.
> 
> Fixes: e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
> Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
> ---
>   drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
> index 5c76664ba0dd..1e488eed282b 100644
> --- a/drivers/net/wireless/ath/ath11k/dp_rx.c
> +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
> @@ -2408,7 +2408,7 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc,
>   		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) {
> +	} else if (channel_num >= 36 && channel_num <= 177) {
>   		rx_status->band = NL80211_BAND_5GHZ;
>   	} else {
>   		spin_lock_bh(&ar->data_lock);
Kalle Valo July 27, 2023, 6:12 a.m. UTC | #2
Jeff Johnson <quic_jjohnson@quicinc.com> writes:

> On 7/25/2023 9:46 PM, Aditya Kumar Singh wrote:
>> 5 GHz band channel 177 support was added with the commit
>> "wifi: ath11k: add channel 177 into 5 GHz channel list". However,
>
> I'd use the same syntax here as in the Fixes tag:
> e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
>
>> during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel
>> number is checked only till 173. This leads to driver code checking for
>> channel and then fetching the band from it which is extra effort since
>> firmware has already given the channel number in the meta deta.
>
> nit: s/meta deta/metadata/

I can fix these in the pending branch.
Aditya Kumar Singh July 27, 2023, noon UTC | #3
On 7/27/2023 11:42, Kalle Valo wrote:
> Jeff Johnson <quic_jjohnson@quicinc.com> writes:
> 
>> On 7/25/2023 9:46 PM, Aditya Kumar Singh wrote:
>>> 5 GHz band channel 177 support was added with the commit
>>> "wifi: ath11k: add channel 177 into 5 GHz channel list". However,
>>
>> I'd use the same syntax here as in the Fixes tag:
>> e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
>>
>>> during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel
>>> number is checked only till 173. This leads to driver code checking for
>>> channel and then fetching the band from it which is extra effort since
>>> firmware has already given the channel number in the meta deta.
>>
>> nit: s/meta deta/metadata/
> 
> I can fix these in the pending branch.
Thanks Kalle.
Aditya Kumar Singh July 27, 2023, 12:02 p.m. UTC | #4
On 7/26/2023 22:24, Jeff Johnson wrote:
> On 7/25/2023 9:46 PM, Aditya Kumar Singh wrote:
>> 5 GHz band channel 177 support was added with the commit
>> "wifi: ath11k: add channel 177 into 5 GHz channel list". However,
> 
> I'd use the same syntax here as in the Fixes tag:
> e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
> 
Sure, I'll keep in mind from next time.

>> during processing for the received ppdu in ath11k_dp_rx_h_ppdu(), channel
>> number is checked only till 173. This leads to driver code checking for
>> channel and then fetching the band from it which is extra effort since
>> firmware has already given the channel number in the meta deta.
> 
> nit: s/meta deta/metadata/
Oops! Thanks for pointing out.

Thanks Jeff for your comments.
Kalle Valo Aug. 2, 2023, 11:49 a.m. UTC | #5
Aditya Kumar Singh <quic_adisi@quicinc.com> wrote:

> 5 GHz band channel 177 support was added with the commit e5e94d10c856 ("wifi:
> ath11k: add channel 177 into 5 GHz channel list"). However, during processing
> for the received ppdu in ath11k_dp_rx_h_ppdu(), channel number is checked only
> till 173. This leads to driver code checking for channel and then fetching the
> band from it which is extra effort since firmware has already given the channel
> number in the metadata.
> 
> Fix this issue by checking the channel number till 177 since we support
> it now.
> 
> Found via code review. Compile tested only.
> 
> Fixes: e5e94d10c856 ("wifi: ath11k: add channel 177 into 5 GHz channel list")
> Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

72c8caf904ae wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index 5c76664ba0dd..1e488eed282b 100644
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -2408,7 +2408,7 @@  static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc,
 		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) {
+	} else if (channel_num >= 36 && channel_num <= 177) {
 		rx_status->band = NL80211_BAND_5GHZ;
 	} else {
 		spin_lock_bh(&ar->data_lock);