Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 16 May 2011 18:55:42 +0000 (14:55 -0400)]
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h

24 files changed:
1  2 
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/wl12xx/cmd.c
drivers/net/wireless/wl12xx/conf.h
include/linux/nl80211.h
include/net/mac80211.h
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/mesh_pathtbl.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/mac80211/sta_info.c
net/wireless/reg.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge