From 5f0e5c8f58a45ae9ee4ffe27bd3aa77d665ef0f0 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 27 Jun 2012 01:29:56 +0000 Subject: 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 --- package/mac80211/patches/561-ath9k_antenna_mask_validate.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/mac80211/patches') 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; - -- cgit v1.2.3