diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-10-23 06:25:00 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-10-23 06:25:00 -0400 |
| commit | 070b6d3122b5e6da7113588aeacbaf54b5ab03a6 (patch) | |
| tree | 9f8da6e883a96aeb19d1038ca9690d80032ac502 /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | ea8e6ff212a50e9aa666de36df051b0d9bd8fe3e (diff) | |
| parent | e8ddbcf9344bb742465f78779c6854fabf5c8341 (diff) | |
Merge tag 'v3.8.13.8' into v3.8-rt
v3.8.13.8
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index c784f691f70d..70c32db877e1 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -961,7 +961,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return; - if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status)) + if (!test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status)) + return; + + if (ctx->vif) ieee80211_chswitch_done(ctx->vif, is_success); } |