qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:41:53 +02:00
Code

ath9k: fix disabling ani on reset

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28115 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-08-29 10:40:46 +00:00
parent 6ea7b3a766
commit dfc716e609
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/mac80211/patches/581-ath9k_merge_reset_functions.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -212,83 +212,45 @@ static int ath_update_survey_stats(struc @@ -212,83 +212,46 @@ static int ath_update_survey_stats(struc
return ret; return ret;
} }
@ -28,7 +28,7 @@
sc->hw_busy_count = 0; sc->hw_busy_count = 0;
- -
- del_timer_sync(&common->ani.timer); del_timer_sync(&common->ani.timer);
cancel_work_sync(&sc->paprd_work); cancel_work_sync(&sc->paprd_work);
cancel_work_sync(&sc->hw_check_work); cancel_work_sync(&sc->hw_check_work);
cancel_delayed_work_sync(&sc->tx_complete_work); cancel_delayed_work_sync(&sc->tx_complete_work);
@ -104,7 +104,7 @@
} }
ath9k_cmn_update_txpow(ah, sc->curtxpow, ath9k_cmn_update_txpow(ah, sc->curtxpow,
@@ -296,21 +258,89 @@ static int ath_set_channel(struct ath_so @@ -296,21 +259,89 @@ static int ath_set_channel(struct ath_so
ath9k_hw_set_interrupts(ah, ah->imask); ath9k_hw_set_interrupts(ah, ah->imask);
ath9k_hw_enable_interrupts(ah); ath9k_hw_enable_interrupts(ah);
@ -125,7 +125,7 @@
+ +
+ return true; + return true;
+} +}
+
+static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, +static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
+ bool retry_tx) + bool retry_tx)
+{ +{
@ -172,7 +172,7 @@
+ return 0; + return 0;
+} +}
+ +
+
+/* +/*
+ * Set/change channels. If the channel is really being changed, it's done + * Set/change channels. If the channel is really being changed, it's done
+ * by reseting the chip. To accomplish this we must first cleanup any pending + * by reseting the chip. To accomplish this we must first cleanup any pending
@ -197,7 +197,7 @@
return r; return r;
} }
@@ -893,28 +923,13 @@ static void ath_radio_enable(struct ath_ @@ -893,28 +924,13 @@ static void ath_radio_enable(struct ath_
channel->center_freq, r); channel->center_freq, r);
} }
@ -227,7 +227,7 @@
spin_unlock_bh(&sc->sc_pcu_lock); spin_unlock_bh(&sc->sc_pcu_lock);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
@@ -927,12 +942,8 @@ void ath_radio_disable(struct ath_softc @@ -927,12 +943,8 @@ void ath_radio_disable(struct ath_softc
int r; int r;
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
@ -240,7 +240,7 @@
/* /*
* Keep the LED on when the radio is disabled * Keep the LED on when the radio is disabled
* during idle unassociated state. * during idle unassociated state.
@@ -942,13 +953,7 @@ void ath_radio_disable(struct ath_softc @@ -942,13 +954,7 @@ void ath_radio_disable(struct ath_softc
ath9k_hw_cfg_gpio_input(ah, ah->led_pin); ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
} }
@ -255,7 +255,7 @@
if (!ah->curchan) if (!ah->curchan)
ah->curchan = ath9k_cmn_get_curchannel(hw, ah); ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
@@ -970,48 +975,11 @@ void ath_radio_disable(struct ath_softc @@ -970,48 +976,11 @@ void ath_radio_disable(struct ath_softc
int ath_reset(struct ath_softc *sc, bool retry_tx) int ath_reset(struct ath_softc *sc, bool retry_tx)
{ {
@ -305,7 +305,7 @@
if (retry_tx) { if (retry_tx) {
int i; int i;
@@ -1024,12 +992,6 @@ int ath_reset(struct ath_softc *sc, bool @@ -1024,12 +993,6 @@ int ath_reset(struct ath_softc *sc, bool
} }
} }
@ -318,7 +318,7 @@
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
return r; return r;
@@ -1081,28 +1043,6 @@ static int ath9k_start(struct ieee80211_ @@ -1081,28 +1044,6 @@ static int ath9k_start(struct ieee80211_
goto mutex_unlock; goto mutex_unlock;
} }
@ -347,7 +347,7 @@
/* Setup our intr mask. */ /* Setup our intr mask. */
ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL | ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
ATH9K_INT_RXORN | ATH9K_INT_FATAL | ATH9K_INT_RXORN | ATH9K_INT_FATAL |
@@ -1125,12 +1065,14 @@ static int ath9k_start(struct ieee80211_ @@ -1125,12 +1066,14 @@ static int ath9k_start(struct ieee80211_
/* Disable BMISS interrupt when we're not associated */ /* Disable BMISS interrupt when we're not associated */
ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS); ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);

6
package/mac80211/patches/582-ath9k_antenna_control.patch
View File

@ -75,7 +75,7 @@
bool ath9k_uses_beacons(int type); bool ath9k_uses_beacons(int type);
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -268,6 +268,22 @@ static bool ath_complete_reset(struct at @@ -269,6 +269,22 @@ static bool ath_complete_reset(struct at
ath_start_ani(common); ath_start_ani(common);
} }
@ -98,7 +98,7 @@
ieee80211_wake_queues(sc->hw); ieee80211_wake_queues(sc->hw);
return true; return true;
@@ -2364,6 +2380,59 @@ static int ath9k_get_stats(struct ieee80 @@ -2365,6 +2381,59 @@ static int ath9k_get_stats(struct ieee80
return 0; return 0;
} }
@ -158,7 +158,7 @@
struct ieee80211_ops ath9k_ops = { struct ieee80211_ops ath9k_ops = {
.tx = ath9k_tx, .tx = ath9k_tx,
.start = ath9k_start, .start = ath9k_start,
@@ -2390,4 +2459,6 @@ struct ieee80211_ops ath9k_ops = { @@ -2391,4 +2460,6 @@ struct ieee80211_ops ath9k_ops = {
.tx_frames_pending = ath9k_tx_frames_pending, .tx_frames_pending = ath9k_tx_frames_pending,
.tx_last_beacon = ath9k_tx_last_beacon, .tx_last_beacon = ath9k_tx_last_beacon,
.get_stats = ath9k_get_stats, .get_stats = ath9k_get_stats,