diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-06 20:40:06 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-06 20:40:06 +0200 |
| commit | 7c9c46c16d2d1d232f3296924162de293477f017 (patch) | |
| tree | 4dba9e4da9ad99a73251b4b0563f910f727894fb /net/mac80211/iface.c | |
| parent | net/wireless: ipw2200: introduce ipw_read_eeprom function (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
| download | linux-7c9c46c16d2d1d232f3296924162de293477f017.tar.xz linux-7c9c46c16d2d1d232f3296924162de293477f017.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-drv.c
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index bebc45db9c7a..ede5f4959904 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -637,6 +637,18 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_configure_filter(local); break; default: + mutex_lock(&local->mtx); + if (local->hw_roc_dev == sdata->dev && + local->hw_roc_channel) { + /* ignore return value since this is racy */ + drv_cancel_remain_on_channel(local); + ieee80211_queue_work(&local->hw, &local->hw_roc_done); + } + mutex_unlock(&local->mtx); + + flush_work(&local->hw_roc_start); + flush_work(&local->hw_roc_done); + flush_work(&sdata->work); /* * When we get here, the interface is marked down. |