---

yaml --- r: 90319 b: refs/heads/master c: 675ef58 h: refs/heads/master i: 90317: 9aa7bd1 90315: efd2bb9 90311: 442d972 90303: 49c8bc5 v: v3
git-mirror · Mar 25, 2008 · 73a1dc5 · 73a1dc5
1 parent 8c3fd18
commit 73a1dc5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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)