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 44935791319287035389246b3fd86a02e87f1621..c6dc5e6012dd03e6540e890a963982e03307e272 100644 (file)
--- 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;
        }