diff options
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 72e3f5574e9f..4c424acc01a4 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -598,7 +598,7 @@ static int ieee80211_stop(struct net_device *dev) | |||
598 | * the scan_sdata is NULL already don't send out a | 598 | * the scan_sdata is NULL already don't send out a |
599 | * scan event to userspace -- the scan is incomplete. | 599 | * scan event to userspace -- the scan is incomplete. |
600 | */ | 600 | */ |
601 | if (local->sta_sw_scanning) | 601 | if (local->sw_scanning) |
602 | ieee80211_scan_completed(&local->hw); | 602 | ieee80211_scan_completed(&local->hw); |
603 | } | 603 | } |
604 | 604 | ||
@@ -732,7 +732,7 @@ int ieee80211_hw_config(struct ieee80211_local *local) | |||
732 | struct ieee80211_channel *chan; | 732 | struct ieee80211_channel *chan; |
733 | int ret = 0; | 733 | int ret = 0; |
734 | 734 | ||
735 | if (local->sta_sw_scanning) | 735 | if (local->sw_scanning) |
736 | chan = local->scan_channel; | 736 | chan = local->scan_channel; |
737 | else | 737 | else |
738 | chan = local->oper_channel; | 738 | chan = local->oper_channel; |
@@ -1290,7 +1290,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
1290 | 1290 | ||
1291 | spin_lock_init(&local->key_lock); | 1291 | spin_lock_init(&local->key_lock); |
1292 | 1292 | ||
1293 | INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work); | 1293 | INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work); |
1294 | 1294 | ||
1295 | sta_info_init(local); | 1295 | sta_info_init(local); |
1296 | 1296 | ||