diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 56bcf0ebec83..ec0f39c93106 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1907,7 +1907,8 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) | |||
1907 | struct iwl_priv *priv = hw->priv; | 1907 | struct iwl_priv *priv = hw->priv; |
1908 | int err = 0; | 1908 | int err = 0; |
1909 | 1909 | ||
1910 | IWL_DEBUG_MAC80211(priv, "enter: type %d\n", vif->type); | 1910 | IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n", |
1911 | vif->type, vif->addr); | ||
1911 | 1912 | ||
1912 | mutex_lock(&priv->mutex); | 1913 | mutex_lock(&priv->mutex); |
1913 | 1914 | ||
@@ -1925,9 +1926,6 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) | |||
1925 | priv->vif = vif; | 1926 | priv->vif = vif; |
1926 | priv->iw_mode = vif->type; | 1927 | priv->iw_mode = vif->type; |
1927 | 1928 | ||
1928 | IWL_DEBUG_MAC80211(priv, "Set %pM\n", vif->addr); | ||
1929 | memcpy(priv->mac_addr, vif->addr, ETH_ALEN); | ||
1930 | |||
1931 | err = iwl_set_mode(priv, vif); | 1929 | err = iwl_set_mode(priv, vif); |
1932 | if (err) | 1930 | if (err) |
1933 | goto out_err; | 1931 | goto out_err; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 6663df24a0c4..4abc24ef64a5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1232,7 +1232,6 @@ struct iwl_priv { | |||
1232 | 1232 | ||
1233 | /* context information */ | 1233 | /* context information */ |
1234 | u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */ | 1234 | u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */ |
1235 | u8 mac_addr[ETH_ALEN]; | ||
1236 | 1235 | ||
1237 | /* station table variables */ | 1236 | /* station table variables */ |
1238 | 1237 | ||