Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	net/mac80211/scan.c

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/b43/b43.h
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-sta.c
Simple merge

diff --cc net/mac80211/driver-trace.h
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/scan.c
index bc061f6296742c27a578c378ca152b0c629b7057,bc17cf7d68dba0b124304c5d9fced8f271e24edc..b822dce9786706e65a30480aa97b1cfd031211e6
--- 1/net/mac80211/scan.c
--- 2/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@@ -345,6 -439,16 +345,13 @@@ static int __ieee80211_start_scan(struc
        if (local->scan_req)
                return -EBUSY;
  
 -      if (req != local->int_scan_req &&
 -          sdata->vif.type == NL80211_IFTYPE_STATION &&
 -          !list_empty(&ifmgd->work_list)) {
 -              /* actually wait for the work it's doing to finish/time out */
 -              set_bit(IEEE80211_STA_REQ_SCAN, &ifmgd->request);
++      if (!list_empty(&local->work_list)) {
++              /* wait for the work to finish/time out */
+               local->scan_req = req;
+               local->scan_sdata = sdata;
+               return 0;
+       }
+ 
        if (local->ops->hw_scan) {
                u8 *ies;
  
@@@ -364,6 -468,6 +371,14 @@@
                local->hw_scan_req->ie = ies;
  
                local->hw_scan_band = 0;
++
++              /*
++               * After allocating local->hw_scan_req, we must
++               * go through until ieee80211_prep_hw_scan(), so
++               * anything that might be changed here and leave
++               * this function early must not go after this
++               * allocation.
++               */
        }
  
        local->scan_req = req;
@@@ -378,15 -477,15 +388,16 @@@
                __set_bit(SCAN_HW_SCANNING, &local->scanning);
        else
                __set_bit(SCAN_SW_SCANNING, &local->scanning);
++
        /*
         * Kicking off the scan need not be protected,
         * only the scan variable stuff, since now
         * local->scan_req is assigned and other callers
         * will abort their scan attempts.
         *
--       * This avoids getting a scan_mtx -> iflist_mtx
--       * dependency, so that the scan completed calls
--       * have more locking freedom.
++       * This avoids too many locking dependencies
++       * so that the scan completed calls have more
++       * locking freedom.
         */
  
        ieee80211_recalc_idle(local);