Skip to contentSkip to conversation

ath11k: mac: Remove WAR on max a-mpdu len in vht

PATCH In review Anilkumar Kolli 2 participants 2 messages Oct 29, 2019 – Oct 30, 2019 Qualcomm Atheros ATH11K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath11k: mac: Remove WAR on max a-mpdu len in vht

Revert commit a24b88b56074424a413a ("ath10k: Fix bug in max. VHT A-MPDU size"), Moving this logic to mac80211.

---
 drivers/net/wireless/ath/ath11k/mac.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -8
index d2a4bae6e057..2c9f57e741c3 100644
@@ -1041,14 +1041,7 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,
 			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >>
 		       IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
 
-	/* Workaround: Some Netgear/Linksys 11ac APs set Rx A-MPDU factor to
-	 * zero in VHT IE. Using it would result in degraded throughput.
-	 * arg->peer_max_mpdu at this point contains HT max_mpdu so keep
-	 * it if VHT max_mpdu is smaller.
-	 */
-	arg->peer_max_mpdu = max(arg->peer_max_mpdu,
-				 (1U << (IEEE80211_HT_MAX_AMPDU_FACTOR +
-					ampdu_factor)) - 1);
+	arg->peer_max_mpdu = BIT(IEEE80211_HT_MAX_AMPDU_FACTOR + ampdu_factor) - 1;
 
 	if (sta->bandwidth == IEEE80211_STA_RX_BW_80)
 		arg->bw_80 = true;
Signature · 7 lines
1.9.1


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#1 lore raw
Quoted 4 lines · Anilkumar Kolli

Revert commit a24b88b56074424a413a ("ath10k: Fix bug in max. VHT A-MPDU size"), Moving this logic to mac80211.

The mac80211 patch is not yet in my tree so I'll put this patch into my wait queue.

Patch set to Awaiting Upstream.

Signature · 9 lines
https://patchwork.kernel.org/patch/11217307/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k