diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-06-08 15:26:31 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-08 14:19:05 -0400 |
commit | 51e65257142a87fe46a1ce5c35c86c5baf012614 (patch) | |
tree | e5210ffad470c6b7b9c969aac667d5d5b491f76c /drivers/net/wireless/iwlegacy/iwl-core.h | |
parent | f3209bea110cade12e2b133da8b8499689cb0e2e (diff) | |
download | kernel_samsung_smdk4412-51e65257142a87fe46a1ce5c35c86c5baf012614.zip kernel_samsung_smdk4412-51e65257142a87fe46a1ce5c35c86c5baf012614.tar.gz kernel_samsung_smdk4412-51e65257142a87fe46a1ce5c35c86c5baf012614.tar.bz2 |
iwlegacy: fix channel switch locking
We use priv->mutex to avoid race conditions between chswitch_done()
and mac_channel_switch(), when marking channel switch in
progress. But chswitch_done() can be called in atomic context
from rx_csa() or with mutex already taken from commit_rxon().
To fix remove mutex from chswitch_done() and use atomic bitops
for marking channel switch pending.
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-core.h')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.h b/drivers/net/wireless/iwlegacy/iwl-core.h index bc66c60..c5fbda0 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.h +++ b/drivers/net/wireless/iwlegacy/iwl-core.h @@ -560,7 +560,7 @@ void iwl_legacy_free_geos(struct iwl_priv *priv); #define STATUS_SCAN_HW 15 #define STATUS_POWER_PMI 16 #define STATUS_FW_ERROR 17 - +#define STATUS_CHANNEL_SWITCH_PENDING 18 static inline int iwl_legacy_is_ready(struct iwl_priv *priv) { |