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

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

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

diff --cc drivers/net/wireless/ath/ath9k/htc.h
Simple merge

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

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

diff --cc drivers/net/wireless/ath/ath9k/main.c
index c79c97be6cd4417afd8a2cf2ff0776c11856f17b,bed6eb97fac93abc9d2021c901e519a7b26b201b..facff102dd0e4aa02ab2307da17c096dd68216e2
--- 1/drivers/net/wireless/ath/ath9k/main.c
--- 2/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -597,10 -615,18 +613,18 @@@ void ath9k_tasklet(unsigned long data
                return;
        }
  
 +      ath9k_ps_wakeup(sc);
        spin_lock(&sc->sc_pcu_lock);
  
-       if (!ath9k_hw_check_alive(ah))
+       /*
+        * Only run the baseband hang check if beacons stop working in AP or
+        * IBSS mode, because it has a high false positive rate. For station
+        * mode it should not be necessary, since the upper layers will detect
+        * this through a beacon miss automatically and the following channel
+        * change will trigger a hardware reset anyway
+        */
+       if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
+           !ath9k_hw_check_alive(ah))
                ieee80211_queue_work(sc->hw, &sc->hw_check_work);
  
        if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)

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

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

diff --cc net/mac80211/agg-rx.c
index 227ca82eef72178253b3f4adf831ce5ae297dd28,1f51f41624264387d276ccfe2d3bc1fa4428bf4e..0c9d0c07eae6cae6ffc6f3ef1f0e91ae64107e2b
--- 1/net/mac80211/agg-rx.c
--- 2/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@@ -229,9 -231,17 +229,12 @@@ void ieee80211_process_addba_request(st
                goto end_no_lock;
        }
        /* determine default buffer size */
 -      if (buf_size == 0) {
 -              struct ieee80211_supported_band *sband;
 -
 -              sband = local->hw.wiphy->bands[conf->channel->band];
 -              buf_size = IEEE80211_MIN_AMPDU_BUF;
 -              buf_size = buf_size << sband->ht_cap.ampdu_factor;
 -      }
 +      if (buf_size == 0)
 +              buf_size = IEEE80211_MAX_AMPDU_BUF;
  
+       /* make sure the size doesn't exceed the maximum supported by the hw */
+       if (buf_size > local->hw.max_rx_aggregation_subframes)
+               buf_size = local->hw.max_rx_aggregation_subframes;
  
        /* examine state machine */
        mutex_lock(&sta->ampdu_mlme.mtx);

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

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