From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 9 Apr 2010 17:42:26 +0000 (-0400)
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=1805a34fa33b6284ab8139dd43779b94de58669a;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-4965.c
---

1805a34fa33b6284ab8139dd43779b94de58669a
diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 6edae9b83bb7,8972166386cb..8c889fdddf0e
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2013,8 -2014,10 +2013,10 @@@ static void iwl4965_rx_reply_tx(struct 
  			index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
  			IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "
  					   "%d index %d\n", scd_ssn , index);
 -			freed = iwl_tx_queue_reclaim(priv, txq_id, index);
 +			freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- 			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ 			if (qc)
+ 				iwl_free_tfds_in_queue(priv, sta_id,
+ 						       tid, freed);
  
  			if (priv->mac80211_registered &&
  			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
@@@ -2039,15 -2042,18 +2041,18 @@@
  				   le32_to_cpu(tx_resp->rate_n_flags),
  				   tx_resp->failure_frame);
  
 -		freed = iwl_tx_queue_reclaim(priv, txq_id, index);
 +		freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- 		iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ 		if (qc && likely(sta_id != IWL_INVALID_STATION))
+ 			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ 		else if (sta_id == IWL_INVALID_STATION)
+ 			IWL_DEBUG_TX_REPLY(priv, "Station not known\n");
  
  		if (priv->mac80211_registered &&
  		    (iwl_queue_space(&txq->q) > txq->q.low_mark))
  			iwl_wake_queue(priv, txq_id);
  	}
- 
- 	iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
+ 	if (qc && likely(sta_id != IWL_INVALID_STATION))
 -		iwl_txq_check_empty(priv, sta_id, tid, txq_id);
++		iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
  
  	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
  		IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");