From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Jan 2011 00:00:37 +0000 (-0800)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: upstream/snapshot3+hdmi~11215^2~448
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8571a19c4ac140f1a507f3e7eb716892afa27109;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of ssh:///linux/kernel/git/linville/wireless-next-2.6
---

8571a19c4ac140f1a507f3e7eb716892afa27109
diff --cc drivers/net/wireless/ath/ath9k/main.c
index c79c97b,bed6eb9..facff10
--- a/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 net/mac80211/agg-rx.c
index 227ca82,1f51f41..0c9d0c0
--- a/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);