From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Date: Mon, 16 Sep 2013 04:54:51 +0000 (+0530)
Subject: ath9k: Fix regression in LNA diversity
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d29a5fd888918c35eb74496637d448ac37866c6e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

ath9k: Fix regression in LNA diversity

The commit "ath9k: Optimize LNA check" tried
to use the "rs_firstaggr" flag to optimize the LNA
combining algorithm when processing subframes in
an A-MPDU. This doesn't appear to work well in practice,
so revert it and use the old method of relying on
"rs_moreaggr".

Cc: stable@vger.kernel.org # 3.11
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 4ee472a5a4e4..ab9e3a8410bc 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1269,13 +1269,6 @@ static void ath9k_antenna_check(struct ath_softc *sc,
 	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB))
 		return;
 
-	/*
-	 * All MPDUs in an aggregate will use the same LNA
-	 * as the first MPDU.
-	 */
-	if (rs->rs_isaggr && !rs->rs_firstaggr)
-		return;
-
 	/*
 	 * Change the default rx antenna if rx diversity
 	 * chooses the other antenna 3 times in a row.