From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 5 Dec 2011 14:20:34 +0000 (+0000)
Subject: ath9k: fix antenna configuration on ar9285 for devices without antenna diversity
X-Git-Tag: reboot~15380
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84b97dc0fbb8a5767776d9e3784864fcf12d5826;p=openwrt%2Fstaging%2Fpepe2k.git

ath9k: fix antenna configuration on ar9285 for devices without antenna diversity

SVN-Revision: 29438
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 4493579131..c6dc5e6012 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -65,6 +65,15 @@
  		mode = ATH9K_PM_FULL_SLEEP;
  	else if (sc->ps_enabled &&
  		 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
+@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct at
+ 			ath_start_ani(common);
+ 	}
+ 
+-	if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {
++	if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
+ 		struct ath_hw_antcomb_conf div_ant_conf;
+ 		u8 lna_conf;
+ 
 @@ -332,7 +332,8 @@ static int ath_reset_internal(struct ath
  		hchan = ah->curchan;
  	}