aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-core.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-05-14 09:25:58 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-06-06 02:16:50 -0400
commit3779db10f6f7de0455dd898a877a0336068f82ed (patch)
treea3b95f5d1edd88aa8dddc3117bd5c969bb952376 /drivers/net/wireless/iwlwifi/iwl-core.c
parentf8525e553210a1545615bde5b203b1913470079f (diff)
iwlwifi: remove priv->mac_addr
This variable is now no longer used, so it can be removed completely. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c6
1 files changed, 2 insertions, 4 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;