From 73a1dc545cc93d9f8eff7108f33bb9c336bb99a4 Mon Sep 17 00:00:00 2001 From: Mohamed Abbas Date: Thu, 20 Mar 2008 08:14:29 -0700 Subject: [PATCH] --- yaml --- r: 90319 b: refs/heads/master c: 675ef586f04e3a4566c9f437790a340711be5bd2 h: refs/heads/master i: 90317: 9aa7bd133f7ae2cbeffc8713d2c908d85b946c2d 90315: efd2bb9032766c9fab3d0969852630104d66eaac 90311: 442d9721370e8d6c07a5595d3e2d5113d68dac0d 90303: 49c8bc5ed0005e88805ec43f4eaafc7737915ada v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_ioctl.c | 2 +- trunk/net/mac80211/ieee80211_sta.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc654754c638..6ae7824ca5b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85249e5fab13edb89258fa6d551cd4a3a4f0d569 +refs/heads/master: 675ef586f04e3a4566c9f437790a340711be5bd2 diff --git a/trunk/net/mac80211/ieee80211_ioctl.c b/trunk/net/mac80211/ieee80211_ioctl.c index 8e8e5a19d893..5af23d318726 100644 --- a/trunk/net/mac80211/ieee80211_ioctl.c +++ b/trunk/net/mac80211/ieee80211_ioctl.c @@ -287,7 +287,7 @@ int ieee80211_set_freq(struct ieee80211_local *local, int freqMHz) if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { local->oper_channel = chan; - if (local->sta_sw_scanning) + if (local->sta_sw_scanning || local->sta_hw_scanning) ret = 0; else ret = ieee80211_hw_config(local); diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c index fc73ca4abc08..bf130b6255ab 100644 --- a/trunk/net/mac80211/ieee80211_sta.c +++ b/trunk/net/mac80211/ieee80211_sta.c @@ -3615,6 +3615,9 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) if (local->sta_hw_scanning) { local->sta_hw_scanning = 0; + if (ieee80211_hw_config(local)) + printk(KERN_DEBUG "%s: failed to restore operational " + "channel after scan\n", dev->name); /* Restart STA timer for HW scan case */ rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list)