From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 16 May 2011 18:55:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v4.13~14821^2~54^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e00cf3b9eb7839b952e434a75bff6b99e47337ac;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h
---

e00cf3b9eb7839b952e434a75bff6b99e47337ac
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 4afae1446582,7c1becf9e2c1..342de780a366
--- 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);