Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index bb275098bb108869085b414dccf9b06e9dc96b49,bd92bd824c1ef7ff398c8f3ac4301c7e9cbeea34..060aac3e22f15ea33b203aa6fe5d027e3ce38d79
--- 1/drivers/net/wireless/iwlwifi/iwl-testmode.c
--- 2/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -543,12 -538,11 +542,12 @@@ static int iwl_testmode_driver(struct i
                                IWL_ERR(priv, "Memory allocation fail\n");
                                return -ENOMEM;
                        }
 -                      NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
 -                              IWL_TM_CMD_DEV2APP_EEPROM_RSP);
 -                      NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
 -                              priv->cfg->base_params->eeprom_size,
 -                              priv->eeprom);
 +                      if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
 +                                      IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
 +                          nla_put(skb, IWL_TM_ATTR_EEPROM,
-                                   cfg(priv)->base_params->eeprom_size,
++                                  priv->cfg->base_params->eeprom_size,
 +                                  priv->eeprom))
 +                              goto nla_put_failure;
                        status = cfg80211_testmode_reply(skb);
                        if (status < 0)
                                IWL_ERR(priv, "Error sending msg : %d\n",

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge