Subject: linux-next: manual merge of the wireless tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 11 May 2011 11:52:16 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn-tx.c between commit bfd36103ec26
("iwlagn: fix "Received BA when not expected"") from Linus' tree and
commit 2c46f72e069e ("iwlagn: check DMA mapping errors") from the
wireless tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 4afae14,7c1becf..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@@ -582,17 -580,12 +580,17 @@@ int iwlagn_tx_skb(struct iwl_priv *priv
  
  	hdr_len = ieee80211_hdrlen(fc);
  
 -	/* Find index into station table for destination station */
 -	sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 -	if (sta_id == IWL_INVALID_STATION) {
 -		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 -			       hdr->addr1);
 -		goto drop_unlock_priv;
 +	/* For management frames use broadcast id to do not break aggregation */
 +	if (!ieee80211_is_data(fc))
 +		sta_id = ctx->bcast_sta_id;
 +	else {
 +		/* Find index into station table for destination station */
 +		sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 +		if (sta_id == IWL_INVALID_STATION) {
 +			IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 +				       hdr->addr1);
- 			goto drop_unlock;
++			goto drop_unlock_priv;
 +		}
  	}
  
  	IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);