aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-06-27 01:29:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-06-27 01:29:56 +0000
commit72eebfea76f4e2d21036e17e195dbd48a4b4faf4 (patch)
treebf35345a76c5381066c5aa8849b7ee26374769b4 /package
parent6dfce4a40950afcedb64f7c61da3534e8ef1b10d (diff)
downloadupstream-72eebfea76f4e2d21036e17e195dbd48a4b4faf4.tar.gz
upstream-72eebfea76f4e2d21036e17e195dbd48a4b4faf4.tar.bz2
upstream-72eebfea76f4e2d21036e17e195dbd48a4b4faf4.zip
ath9k: enable rx for tx antennas earlier (and only for multi-stream devices) to fix some validation corner cases
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32509 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/561-ath9k_antenna_mask_validate.patch8
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;
-