Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/wl12xx/wl1271_main.c

1 files changed, 41 insertions, 4 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 7cd5f56662f..dfff02f5c86 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -291,7 +291,8 @@ struct mac80211_hwsim_data {
         struct ieee80211_channel *channel;
         unsigned long beacon_int; /* in jiffies unit */
         unsigned int rx_filter;
-        bool started, idle;
+        bool started, idle, scanning;
+        struct mutex mutex;
         struct timer_list beacon_timer;
         enum ps_mode {
                 PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL
@@ -957,9 +958,9 @@ static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw,
         hsd->hw = hw;
         INIT_DELAYED_WORK(&hsd->w, hw_scan_done);
 
-        printk(KERN_DEBUG "hwsim scan request\n");
+        printk(KERN_DEBUG "hwsim hw_scan request\n");
         for (i = 0; i < req->n_channels; i++)
-                printk(KERN_DEBUG "hwsim scan freq %d\n",
+                printk(KERN_DEBUG "hwsim hw_scan freq %d\n",
                         req->channels[i]->center_freq);
 
         ieee80211_queue_delayed_work(hw, &hsd->w, 2 * HZ);
@@ -967,6 +968,36 @@ static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw,
         return 0;
 }
 
+static void mac80211_hwsim_sw_scan(struct ieee80211_hw *hw)
+{
+        struct mac80211_hwsim_data *hwsim = hw->priv;
+
+        mutex_lock(&hwsim->mutex);
+
+        if (hwsim->scanning) {
+                printk(KERN_DEBUG "two hwsim sw_scans detected!\n");
+                goto out;
+        }
+
+        printk(KERN_DEBUG "hwsim sw_scan request, prepping stuff\n");
+        hwsim->scanning = true;
+
+out:
+        mutex_unlock(&hwsim->mutex);
+}
+
+static void mac80211_hwsim_sw_scan_complete(struct ieee80211_hw *hw)
+{
+        struct mac80211_hwsim_data *hwsim = hw->priv;
+
+        mutex_lock(&hwsim->mutex);
+
+        printk(KERN_DEBUG "hwsim sw_scan_complete\n");
+        hwsim->scanning = true;
+
+        mutex_unlock(&hwsim->mutex);
+}
+
 static struct ieee80211_ops mac80211_hwsim_ops =
 {
         .tx = mac80211_hwsim_tx,
@@ -984,6 +1015,8 @@ static struct ieee80211_ops mac80211_hwsim_ops =
         .conf_tx = mac80211_hwsim_conf_tx,
         CFG80211_TESTMODE_CMD(mac80211_hwsim_testmode_cmd)
         .ampdu_action = mac80211_hwsim_ampdu_action,
+        .sw_scan_start = mac80211_hwsim_sw_scan,
+        .sw_scan_complete = mac80211_hwsim_sw_scan_complete,
         .flush = mac80211_hwsim_flush,
 };
 
@@ -1179,8 +1212,11 @@ static int __init init_mac80211_hwsim(void)
         if (radios < 1 || radios > 100)
                 return -EINVAL;
 
-        if (fake_hw_scan)
+        if (fake_hw_scan) {
                 mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
+                mac80211_hwsim_ops.sw_scan_start = NULL;
+                mac80211_hwsim_ops.sw_scan_complete = NULL;
+        }
 
         spin_lock_init(&hwsim_radio_lock);
         INIT_LIST_HEAD(&hwsim_radios);
@@ -1285,6 +1321,7 @@ static int __init init_mac80211_hwsim(void)
                 }
                 /* By default all radios are belonging to the first group */
                 data->group = 1;
+                mutex_init(&data->mutex);
 
                 /* Work to be done prior to ieee80211_register_hw() */
                 switch (regtest) {