KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 32508
This commit is contained in:
Felix Fietkau 2012-06-27 01:23:17 +00:00
parent 3d83a7b636
commit d20470702f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package/mac80211/patches/561-ath9k_antenna_mask_validate.patch
View file

@ -1,16 +1,18 @@
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/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; 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 0x1:
+ case 0x3: + case 0x3:
+ case 0x7: + case 0x7:
+ return true; + return true;
+ case 0x2:
+ return (ah->caps.rx_chainmask == 1);
+ default: + default:
+ return false; + return false;
+ } + }
@ -22,7 +24,10 @@
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
- if (!rx_ant || !tx_ant) - 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; return -EINVAL;
+ rx_ant |= tx_ant;
sc->ant_rx = rx_ant; sc->ant_rx = rx_ant;
sc->ant_tx = tx_ant;