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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	include/net/nfc/nfc.h
	net/nfc/netlink.c
	net/wireless/nl80211.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index f31a0629c6c6..bb275098bb10 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -536,7 +536,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                 break;
 
         case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-                if (priv->shrd->eeprom) {
+                if (priv->eeprom) {
                         skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
                                 cfg(priv)->base_params->eeprom_size + 20);
                         if (!skb) {
@@ -547,7 +547,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                         IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
                             nla_put(skb, IWL_TM_ATTR_EEPROM,
                                     cfg(priv)->base_params->eeprom_size,
-                                    priv->shrd->eeprom))
+                                    priv->eeprom))
                                 goto nla_put_failure;
                         status = cfg80211_testmode_reply(skb);
                         if (status < 0)