linux-next: manual merge of the net tree with the wireless-currenttree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-tx.c between commit
3995bd9332a51b626237d6671cfeb7235e6c1305 ("iwlwifi: fix TX queue race")
from the wireless-current tree and commit
45af81956e990440fe78d6d41f847664cb620609 ("iwlwifi: make software queue
assignment more efficient") from the net tree.

Just overlapping context.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
index 2e89040,0912987..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@@ -744,21 -749,16 +747,19 @@@ int iwl_tx_skb(struct iwl_priv *priv, s
  		hdr->seq_ctrl |= cpu_to_le16(seq_number);
  		seq_number += 0x10;
  		/* aggregation is on for this <sta,tid> */
- 		if (info->flags & IEEE80211_TX_CTL_AMPDU) {
+ 		if (info->flags & IEEE80211_TX_CTL_AMPDU)
  			txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
  	}
  
  	txq = &priv->txq[txq_id];
+ 	swq_id = txq->swq_id;
  	q = &txq->q;
- 	txq->swq_id = swq_id;
  
 -	spin_lock_irqsave(&priv->lock, flags);
 +	if (unlikely(iwl_queue_space(q) < q->high_mark))
 +		goto drop_unlock;
 +
 +	if (ieee80211_is_data_qos(fc))
 +		priv->stations[sta_id].tid[tid].tfds_in_queue++;
  
  	/* Set up driver data for this TFD */
  	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/