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

ath9k: enable rx for tx antennas earlier (and only for multi-stream devices) to fix some validation corner cases

Browse source 
SVN-Revision: 32509
This commit is contained in:
Felix Fietkau 2012-06-27 01:29:56 +00:00
parent d20470702f
commit 1e884c0923
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
--- 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,14 +1929,29 @@ static u32 fill_chainmask(u32 cap, u32 n @@ -1929,12 +1929,29 @@ static u32 fill_chainmask(u32 cap, u32 n
return filled; return filled;
} }
@ -24,10 +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 (ah->caps.rx_chainmask != 1)
+ rx_ant |= tx_ant;
+
+ if (!validate_antenna_mask(ah, rx_ant) || !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;