diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:25:04 -0400 |
| commit | 0440507bbc44149e63bbfb9df730ba3820371904 (patch) | |
| tree | 7275e41aa1aa7e4d19d0503f1c15f07991c1a120 /net/mac80211/scan.c | |
| parent | 8d242488ce4627dd7e6333caab56df11ea25e239 (diff) | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
| download | kernel_goldelico_gta04-0440507bbc44149e63bbfb9df730ba3820371904.zip kernel_goldelico_gta04-0440507bbc44149e63bbfb9df730ba3820371904.tar.gz kernel_goldelico_gta04-0440507bbc44149e63bbfb9df730ba3820371904.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 6d90a56..267b294 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -322,7 +322,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted, ieee80211_mlme_notify_scan_completed(local); ieee80211_ibss_notify_scan_completed(local); ieee80211_mesh_notify_scan_completed(local); - ieee80211_queue_work(&local->hw, &local->work_work); + ieee80211_start_next_roc(local); } void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) @@ -375,7 +375,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) static bool ieee80211_can_scan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata) { - if (!list_empty(&local->work_list)) + if (!list_empty(&local->roc_list)) return false; if (sdata->vif.type == NL80211_IFTYPE_STATION && |