From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 26 Feb 2010 21:54:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=64463da913bc8f791980ba28d93ac5e716ab9cc5;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	net/mac80211/rate.c
---

64463da913bc8f791980ba28d93ac5e716ab9cc5
diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 3df79331039c,fe37d6a6bf97..4ef7739f9e8e
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -451,7 -445,9 +451,9 @@@ int iwl_tx_skb(struct iwl_priv *priv, s
  void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
  int iwl_hw_tx_queue_init(struct iwl_priv *priv,
  			 struct iwl_tx_queue *txq);
 -int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
+ void iwl_free_tfds_in_queue(struct iwl_priv *priv,
+ 			    int sta_id, int tid, int freed);
 +void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
  int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  		      int slots_num, u32 txq_id);
  void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);
diff --cc net/mac80211/rate.c
index 99ab24cc9783,12a2bff7dcdb..0b299d236fa1
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@@ -303,31 -245,26 +303,34 @@@ void rate_control_get_rate(struct ieee8
  		info->control.rates[i].count = 1;
  	}
  
+ 	if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+ 		return;
+ 
 -	if (sta && sdata->force_unicast_rateidx > -1) {
 -		info->control.rates[0].idx = sdata->force_unicast_rateidx;
 -	} else {
 -		ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
 -		info->flags |= IEEE80211_TX_INTFL_RCALGO;
 -	}
 +	ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
  
  	/*
 -	 * try to enforce the maximum rate the user wanted
 +	 * Try to enforce the rateidx mask the user wanted. skip this if the
 +	 * default mask (allow all rates) is used to save some processing for
 +	 * the common case.
  	 */
 -	if (sdata->max_ratectrl_rateidx > -1)
 +	mask = sdata->rc_rateidx_mask[info->band];
 +	if (mask != (1 << txrc->sband->n_bitrates) - 1) {
 +		if (sta) {
 +			/* Filter out rates that the STA does not support */
 +			mask &= sta->sta.supp_rates[info->band];
 +		}
 +		/*
 +		 * Make sure the rate index selected for each TX rate is
 +		 * included in the configured mask and change the rate indexes
 +		 * if needed.
 +		 */
  		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
 +			/* Rate masking supports only legacy rates for now */
  			if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
  				continue;
 -			info->control.rates[i].idx =
 -				min_t(s8, info->control.rates[i].idx,
 -				      sdata->max_ratectrl_rateidx);
 +			rate_idx_match_mask(&info->control.rates[i],
 +					    txrc->sband->n_bitrates, mask);
 +		}
  	}
  
  	BUG_ON(info->control.rates[0].idx < 0);