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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20110511115216.d68e78e4.sfr@canb.auug.org.au>
Date:	Wed, 11 May 2011 11:52:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johannes Berg <johannes.berg@...el.com>,
	"Wey-Yi Guy" <wey-yi.w.guy@...el.com>,
	Stanislaw Gruszka <sgruszka@...hat.com>
Subject: linux-next: manual merge of the wireless tree with Linus' tree

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                    sfr@...b.auug.org.au

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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/