From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Jul 2009 02:22:43 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.32-rc1~703^2~507
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=df597efb5737063497f1a4f7c996cc9aec294230

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
---

df597efb5737063497f1a4f7c996cc9aec294230
diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
index 0912987af603,2e89040e63be..c7100b9dcede
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@@ -749,16 -744,21 +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;
- 		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 -			swq_id = iwl_virtual_agg_queue_num(swq_id, 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));