forked from openwrt-mirror/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Felix Fietkau <[email protected]> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40428 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
nbd
committed
Apr 8, 2014
1 parent
6f06731
commit 0086cc8
Showing
1 changed file
with
29 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,16 @@ | ||
commit ec998e5991781ecdaad0911dc64f1c8d3749c308 | ||
Author: Felix Fietkau <[email protected]> | ||
Date: Tue Apr 8 23:42:17 2014 +0200 | ||
|
||
ath9k: fix a scheduling while atomic bug in CSA handling | ||
|
||
Commit "ath9k: prepare for multi-interface CSA support" added a call to | ||
ieee80211_iterate_active_interfaces in atomic context (beacon tasklet), | ||
which is crashing. | ||
Use ieee80211_iterate_active_interfaces_atomic instead. | ||
|
||
Signed-off-by: Felix Fietkau <[email protected]> | ||
|
||
commit 93f310a38a1d81a4bc8fcd9bf29628bd721cf2ef | ||
Author: Felix Fietkau <[email protected]> | ||
Date: Sun Apr 6 23:35:28 2014 +0200 | ||
|
@@ -26,3 +39,19 @@ Date: Sun Apr 6 23:35:28 2014 +0200 | |
|
||
if (level != aniState->firstepLevel) { | ||
ath_dbg(common, ANI, | ||
--- a/drivers/net/wireless/ath/ath9k/beacon.c | ||
+++ b/drivers/net/wireless/ath/ath9k/beacon.c | ||
@@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *d | ||
|
||
void ath9k_csa_update(struct ath_softc *sc) | ||
{ | ||
- ieee80211_iterate_active_interfaces(sc->hw, | ||
- IEEE80211_IFACE_ITER_NORMAL, | ||
- ath9k_csa_update_vif, | ||
- sc); | ||
+ ieee80211_iterate_active_interfaces_atomic(sc->hw, | ||
+ IEEE80211_IFACE_ITER_NORMAL, | ||
+ ath9k_csa_update_vif, sc); | ||
} | ||
|
||
void ath9k_beacon_tasklet(unsigned long data) |