The patch titled
ath5k: fix beacon-update deadlock
has been removed from the -mm tree. Its filename was
ath5k-fix-beacon-update-deadlock.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ath5k: fix beacon-update deadlock
From: Jiri Slaby <jirislaby@xxxxxxxxx>
Commit 9d139c810a2aa17365cc548d0cd2a189d8433c65 introduced AA deadlock --
ath5k_config_interface(); holds sc->lock and it calls
ath5k_beacon_update(); which tries to grab the lock again.
Don't grab the lock in beacon update, since only caller is config iface
for now.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: John W. Linville <linville@xxxxxxxxxxxxx>
Cc: Nick Kossifidis <mickflemm@xxxxxxxxx>
Cc: Luis R. Rodriguez <mcgrof@xxxxxxxxx>
Cc: "Bob Copeland" <me@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/ath5k/base.c | 4 ----
1 file changed, 4 deletions(-)
diff -puN drivers/net/wireless/ath5k/base.c~ath5k-fix-beacon-update-deadlock drivers/net/wireless/ath5k/base.c
--- a/drivers/net/wireless/ath5k/base.c~ath5k-fix-beacon-update-deadlock
+++ a/drivers/net/wireless/ath5k/base.c
@@ -3065,8 +3065,6 @@ ath5k_beacon_update(struct ieee80211_hw
ath5k_debug_dump_skb(sc, skb, "BC ", 1);
- mutex_lock(&sc->lock);
-
if (sc->opmode != IEEE80211_IF_TYPE_IBSS) {
ret = -EIO;
goto end;
@@ -3081,9 +3079,7 @@ ath5k_beacon_update(struct ieee80211_hw
ath5k_beacon_config(sc);
mmiowb();
}
-
end:
- mutex_unlock(&sc->lock);
return ret;
}
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
origin.patch
ath5k-mask-out-unneeded-interrupts.patch
ath5k-unify-resets.patch
ip2-fix-iielliscleanup-as-it-is-static-but-not-always-used.patch
char-merge-ip2main-and-ip2base.patch
char-ip2-cleanup-globals.patch
char-ip2-fix-sparse-warnings.patch
char-ip2-init-deinit-cleanup.patch
ip2-avoid-add_timer-with-pending-timer.patch
char-ds1286-eliminate-busy-waiting.patch
reiser4.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
