diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-03-23 14:03:00 +0000 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-23 16:18:47 -0500 |
| commit | 4edac92fcf5956b0ef52fb281207863902e430bc (patch) | |
| tree | db4539351c227c70504294715885a20bd3e60a05 | |
| parent | 9320199957cebc39ccef372fa1fccf5ba3d3fd7d (diff) | |
[PATCH] Restore channel setting after scan.
After a scan, we weren't switching back to the original channel if we
were associated with an AP. So NetworkManager's periodic scans would
disrupt connectivity until the ESSID was manually set again. Fix that.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_scan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c index 290ddb0951d..bb9ab8b45d0 100644 --- a/net/ieee80211/softmac/ieee80211softmac_scan.c +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c @@ -232,6 +232,13 @@ void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm) sm->scanning = 0; spin_unlock_irqrestore(&sm->lock, flags); + if (sm->associnfo.bssvalid) { + struct ieee80211softmac_network *net; + + net = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); + if (net) + sm->set_channel(sm->dev, net->channel); + } ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL); } EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); |