From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 27 Jun 2012 01:23:17 +0000 (+0000)
Subject: ath9k: make antenna mask validation more flexible, allow arbitrary tx chain combinati... 
X-Git-Tag: reboot~13513
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d20470702fa0f89483fbf82a5366c6a201c22ca2;p=oweals%2Fopenwrt.git

ath9k: make antenna mask validation more flexible, allow arbitrary tx chain combinations, enable rx for chains that have enabled tx as well, fix using the second antenna for single-stream diversity based devices

SVN-Revision: 32508
---

diff --git a/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch b/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch
index c84162fe44..f837c686c7 100644
--- a/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch
+++ b/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch
@@ -1,16 +1,18 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1929,12 +1929,24 @@ static u32 fill_chainmask(u32 cap, u32 n
+@@ -1929,14 +1929,29 @@ static u32 fill_chainmask(u32 cap, u32 n
  	return filled;
  }
  
-+static bool validate_antenna_mask(u32 val)
++static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
 +{
-+	switch (val & 0x7) {
++	switch (val & ah->caps.rx_chainmask) {
 +	case 0x1:
 +	case 0x3:
 +	case 0x7:
 +		return true;
++	case 0x2:
++		return (ah->caps.rx_chainmask == 1);
 +	default:
 +		return false;
 +	}
@@ -22,7 +24,10 @@
  	struct ath_hw *ah = sc->sc_ah;
  
 -	if (!rx_ant || !tx_ant)
-+	if (!validate_antenna_mask(rx_ant) || !validate_antenna_mask(tx_ant))
++	if (!validate_antenna_mask(ah, rx_ant) || !tx_ant)
  		return -EINVAL;
  
++	rx_ant |= tx_ant;
  	sc->ant_rx = rx_ant;
+ 	sc->ant_tx = tx_ant;
+