minstrel_ht: move minstrel_mcs_groups declaration to header file

[mv-sheeva.git] / net / mac80211 / scan.c

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index e14c44195ae9ac6c7c27d7b74f4e8d5200be320d..439c98d93a79cedee816fa34e1fc7e5069d2e5f5 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -286,6 +286,8 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
        local->scanning = 0;
        local->scan_channel = NULL;
 
+       drv_sw_scan_complete(local);
+
        /* we only have to protect scan_req and hw/sw scan */
        mutex_unlock(&local->scan_mtx);
 
@@ -295,8 +297,6 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
 
        ieee80211_configure_filter(local);
 
-       drv_sw_scan_complete(local);
-
        ieee80211_offchannel_return(local, true);
 
  done:
@@ -510,7 +510,7 @@ static int ieee80211_scan_state_decision(struct ieee80211_local *local,
                bad_latency = time_after(jiffies +
                                ieee80211_scan_get_channel_time(next_chan),
                                local->leave_oper_channel_time +
-                               usecs_to_jiffies(pm_qos_requirement(PM_QOS_NETWORK_LATENCY)));
+                               usecs_to_jiffies(pm_qos_request(PM_QOS_NETWORK_LATENCY)));
 
                listen_int_exceeded = time_after(jiffies +
                                ieee80211_scan_get_channel_time(next_chan),
@@ -734,7 +734,7 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        int ret = -EBUSY;
-       enum nl80211_band band;
+       enum ieee80211_band band;
 
        mutex_lock(&local->scan_mtx);