mac80211: prevent tuning during scanning

[linux-2.6-omap-h63xx.git] / net / mac80211 / ieee80211_ioctl.c

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 8e8e5a19d8937c0e1c621f878db67c7db58f18b9..5af23d31872692ee9961a5667646aa1260c9c510 100644 (file)
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/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);