diff mbox series

wifi: ath12k: fix invalid AMPDU factor calculation in ath12k_peer_assoc_h_he()

Message ID 20240710021819.87216-1-quic_bqiang@quicinc.com (mailing list archive)
State Accepted
Commit a66de2d0f22b1740f3f9777776ad98c4bee62dff
Delegated to: Kalle Valo
Headers show
Series wifi: ath12k: fix invalid AMPDU factor calculation in ath12k_peer_assoc_h_he() | expand

Commit Message

Baochen Qiang July 10, 2024, 2:18 a.m. UTC
Currently ampdu_factor is wrongly calculated in
ath12k_peer_assoc_h_he(), fix it.

This is found during code review.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4

Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
---
 drivers/net/wireless/ath/ath12k/mac.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


base-commit: 9fddbf081f2da3a20fecda0b58adacbf1379e304

Comments

Jeff Johnson July 15, 2024, 5:31 p.m. UTC | #1
On 7/9/2024 7:18 PM, Baochen Qiang wrote:
> Currently ampdu_factor is wrongly calculated in
> ath12k_peer_assoc_h_he(), fix it.

You have 70+ columns for commit text, use them

What are the user-visible ramifications of this error? Just curious if this
needs to go into 6.11 via ath-current or can wait for 6.12.

/jeff
Baochen Qiang July 16, 2024, 1:50 a.m. UTC | #2
On 7/16/2024 1:31 AM, Jeff Johnson wrote:
> On 7/9/2024 7:18 PM, Baochen Qiang wrote:
>> Currently ampdu_factor is wrongly calculated in
>> ath12k_peer_assoc_h_he(), fix it.
> 
> You have 70+ columns for commit text, use them
Thank you Jeff for pointing this, do I need to respin for it?

> 
> What are the user-visible ramifications of this error? Just curious if this
> needs to go into 6.11 via ath-current or can wait for 6.12.
not sure of userspace ramifications. I think we can wait for 6.12.

> 
> /jeff
Kalle Valo Aug. 7, 2024, 8:14 a.m. UTC | #3
Baochen Qiang <quic_bqiang@quicinc.com> wrote:

> Currently ampdu_factor is wrongly calculated in ath12k_peer_assoc_h_he(), fix it.
> 
> This is found during code review.
> 
> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
> 
> Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
> Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

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

a66de2d0f22b wifi: ath12k: fix invalid AMPDU factor calculation in ath12k_peer_assoc_h_he()
Kalle Valo Aug. 7, 2024, 8:15 a.m. UTC | #4
Baochen Qiang <quic_bqiang@quicinc.com> writes:

> On 7/16/2024 1:31 AM, Jeff Johnson wrote:
>> On 7/9/2024 7:18 PM, Baochen Qiang wrote:
>>> Currently ampdu_factor is wrongly calculated in
>>> ath12k_peer_assoc_h_he(), fix it.
>> 
>> You have 70+ columns for commit text, use them
>
> Thank you Jeff for pointing this, do I need to respin for it?

No need to respin, I can edit commit messages and fixed it in my pending
branch.
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..a7b86e6a2655 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -2196,9 +2196,8 @@  static void ath12k_peer_assoc_h_he(struct ath12k *ar,
 	 * request, then use MAX_AMPDU_LEN_FACTOR as 16 to calculate max_ampdu
 	 * length.
 	 */
-	ampdu_factor = (he_cap->he_cap_elem.mac_cap_info[3] &
-			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) >>
-			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK;
+	ampdu_factor = u8_get_bits(he_cap->he_cap_elem.mac_cap_info[3],
+				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);
 
 	if (ampdu_factor) {
 		if (sta->deflink.vht_cap.vht_supported)