| Message ID | 1572332456-5419-1-git-send-email-akolli@codeaurora.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: mac: Remove WAR on max a-mpdu len in vht | expand |
Anilkumar Kolli <akolli@codeaurora.org> wrote: > Revert commit a24b88b56074424a413a ("ath10k: Fix bug in max. > VHT A-MPDU size"), Moving this logic to mac80211. > > Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org> The mac80211 patch is not yet in my tree so I'll put this patch into my wait queue. Patch set to Awaiting Upstream.
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index d2a4bae6e057..2c9f57e741c3 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -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;
Revert commit a24b88b56074424a413a ("ath10k: Fix bug in max. VHT A-MPDU size"), Moving this logic to mac80211. Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org> --- drivers/net/wireless/ath/ath11k/mac.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)