X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F582-ath9k_merge_reset_functions.patch;fp=package%2Fmac80211%2Fpatches%2F582-ath9k_merge_reset_functions.patch;h=54d0eafc893774182028c441ec0458b7db4c65f0;hb=26f4c203022ebc3e0c4fc9d7ec42f2bacef3e7b5;hp=975d2106fac7b98943aa542661cfc17b28475f2e;hpb=163a3a0715e50bae71ff1b1c00c13b465917e915;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
index 975d2106fa..54d0eafc89 100644
--- a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
+++ b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
@@ -118,7 +118,7 @@
  	}
  
  	ath9k_cmn_update_txpow(ah, sc->curtxpow,
-@@ -297,21 +270,95 @@ static int ath_set_channel(struct ath_so
+@@ -297,21 +270,93 @@ static int ath_set_channel(struct ath_so
  	ath9k_hw_set_interrupts(ah, ah->imask);
  	ath9k_hw_enable_interrupts(ah);
  
@@ -153,8 +153,6 @@
 +	__ath_cancel_work(sc);
 +
 +	spin_lock_bh(&sc->sc_pcu_lock);
-+
-+	sc->sc_flags &= ~SC_OP_HW_RESET;
  
 +	if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) {
 +		fastcc = false;
@@ -217,7 +215,7 @@
  	return r;
  }
  
-@@ -824,28 +871,13 @@ static void ath_radio_enable(struct ath_
+@@ -824,28 +869,13 @@ static void ath_radio_enable(struct ath_
  			channel->center_freq, r);
  	}
  
@@ -247,7 +245,7 @@
  	spin_unlock_bh(&sc->sc_pcu_lock);
  
  	ath9k_ps_restore(sc);
-@@ -858,11 +890,10 @@ void ath_radio_disable(struct ath_softc 
+@@ -858,11 +888,10 @@ void ath_radio_disable(struct ath_softc 
  	int r;
  
  	ath9k_ps_wakeup(sc);
@@ -261,7 +259,7 @@
  
  	/*
  	 * Keep the LED on when the radio is disabled
-@@ -873,13 +904,7 @@ void ath_radio_disable(struct ath_softc 
+@@ -873,13 +902,7 @@ void ath_radio_disable(struct ath_softc 
  		ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
  	}
  
@@ -276,7 +274,7 @@
  
  	if (!ah->curchan)
  		ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-@@ -901,49 +926,11 @@ void ath_radio_disable(struct ath_softc 
+@@ -901,48 +924,11 @@ void ath_radio_disable(struct ath_softc 
  
  static int ath_reset(struct ath_softc *sc, bool retry_tx)
  {
@@ -285,7 +283,6 @@
 -	struct ieee80211_hw *hw = sc->hw;
  	int r;
  
--	sc->sc_flags &= ~SC_OP_HW_RESET;
 -	sc->hw_busy_count = 0;
 -
 -	/* Stop ANI */
@@ -327,7 +324,7 @@
  
  	if (retry_tx) {
  		int i;
-@@ -956,12 +943,6 @@ static int ath_reset(struct ath_softc *s
+@@ -955,12 +941,6 @@ static int ath_reset(struct ath_softc *s
  		}
  	}
  
@@ -340,7 +337,7 @@
  	ath9k_ps_restore(sc);
  
  	return r;
-@@ -971,9 +952,7 @@ void ath_reset_work(struct work_struct *
+@@ -970,9 +950,7 @@ void ath_reset_work(struct work_struct *
  {
  	struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
  
@@ -350,7 +347,7 @@
  }
  
  void ath_hw_check(struct work_struct *work)
-@@ -994,11 +973,8 @@ void ath_hw_check(struct work_struct *wo
+@@ -993,11 +971,8 @@ void ath_hw_check(struct work_struct *wo
  	ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
  		"busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
  	if (busy >= 99) {
@@ -364,7 +361,7 @@
  
  	} else if (busy >= 0)
  		sc->hw_busy_count = 0;
-@@ -1018,9 +994,7 @@ static void ath_hw_pll_rx_hang_check(str
+@@ -1017,9 +992,7 @@ static void ath_hw_pll_rx_hang_check(str
  			/* Rx is hung for more than 500ms. Reset it */
  			ath_dbg(common, ATH_DBG_RESET,
  				"Possible RX hang, resetting");
@@ -375,7 +372,7 @@
  			count = 0;
  		}
  	} else
-@@ -1091,28 +1065,6 @@ static int ath9k_start(struct ieee80211_
+@@ -1090,28 +1063,6 @@ static int ath9k_start(struct ieee80211_
  		goto mutex_unlock;
  	}
  
@@ -404,7 +401,7 @@
  	/* Setup our intr mask. */
  	ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
  		    ATH9K_INT_RXORN | ATH9K_INT_FATAL |
-@@ -1135,12 +1087,14 @@ static int ath9k_start(struct ieee80211_
+@@ -1134,12 +1085,14 @@ static int ath9k_start(struct ieee80211_
  
  	/* Disable BMISS interrupt when we're not associated */
  	ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
@@ -423,7 +420,7 @@
  
  	if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
  	    !ah->btcoex_hw.enabled) {
-@@ -1233,11 +1187,7 @@ static void ath9k_stop(struct ieee80211_
+@@ -1232,11 +1185,7 @@ static void ath9k_stop(struct ieee80211_
  
  	mutex_lock(&sc->mutex);
  
@@ -436,7 +433,7 @@
  
  	if (sc->sc_flags & SC_OP_INVALID) {
  		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");
-@@ -2354,9 +2304,11 @@ static void ath9k_flush(struct ieee80211
+@@ -2353,9 +2302,11 @@ static void ath9k_flush(struct ieee80211
  	ath9k_ps_wakeup(sc);
  	spin_lock_bh(&sc->sc_pcu_lock);
  	drain_txq = ath_drain_all_txq(sc, false);