diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-19 14:24:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-19 14:24:45 -0400 |
| commit | 22f0d2d1e7e76758f75887e616f2976323f85c26 (patch) | |
| tree | 9470a4a7f4fe9deac91bd5bba2dbd9bfd6e7c84d /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a (diff) | |
| parent | 48c3e371350701444db51e8b35b5928d74dbacc3 (diff) | |
| download | op-kernel-dev-22f0d2d1e7e76758f75887e616f2976323f85c26.zip op-kernel-dev-22f0d2d1e7e76758f75887e616f2976323f85c26.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 822f1a0..3193872 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -1068,7 +1068,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); } |
