diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-27 01:29:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-27 01:29:56 +0000 |
| commit | 1e884c092331cf9df113b8d479f2d7fe4c467b42 (patch) | |
| tree | 6e535aa59615b0ba99fafd11e3db46a5be186981 /package/mac80211/patches/561-ath9k_antenna_mask_validate.patch | |
| parent | d20470702fa0f89483fbf82a5366c6a201c22ca2 (diff) | |
| download | upstream-1e884c092331cf9df113b8d479f2d7fe4c467b42.tar.gz upstream-1e884c092331cf9df113b8d479f2d7fe4c467b42.tar.bz2 upstream-1e884c092331cf9df113b8d479f2d7fe4c467b42.zip | |
ath9k: enable rx for tx antennas earlier (and only for multi-stream devices) to fix some validation corner cases
SVN-Revision: 32509
Diffstat (limited to 'package/mac80211/patches/561-ath9k_antenna_mask_validate.patch')
| -rw-r--r-- | package/mac80211/patches/561-ath9k_antenna_mask_validate.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch b/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch index f837c686c7..8b5005b7d8 100644 --- a/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch +++ b/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch @@ -1,6 +1,6 @@ --- a/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; } @@ -24,10 +24,10 @@ struct ath_hw *ah = sc->sc_ah; - if (!rx_ant || !tx_ant) ++ if (ah->caps.rx_chainmask != 1) ++ rx_ant |= 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; - |