linux-next: manual merge of the wireless tree with the wireless-current tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ece6444c2fe80dab679beb5f0d58b091f1933b00 ("iwlwifi: need check for valid
qos packet before free") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 89aba76,6edae9b..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2020,10 -2013,8 +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) &&
@@@ -2048,18 -2039,15 +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");