From 49803c53a5a8c605eaa5055f35bdeafb7d1524a7 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 14 May 2010 06:25:58 -0700 Subject: [PATCH] --- yaml --- r: 202871 b: refs/heads/master c: 3779db10f6f7de0455dd898a877a0336068f82ed h: refs/heads/master i: 202869: aa4fa30c6b47058db5186f5997021ae92ec995dc 202867: dd4ea48414dcdb0ad9b50423332bc0a017b854ba 202863: fe3306e9e04bad8953d8f9954df2824c957b13c0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 6 ++---- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ed81db0f62e..bae3f504161a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8525e553210a1545615bde5b203b1913470079f +refs/heads/master: 3779db10f6f7de0455dd898a877a0336068f82ed diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c index 56bcf0ebec83..ec0f39c93106 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c @@ -1907,7 +1907,8 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) struct iwl_priv *priv = hw->priv; int err = 0; - IWL_DEBUG_MAC80211(priv, "enter: type %d\n", vif->type); + IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n", + vif->type, vif->addr); mutex_lock(&priv->mutex); @@ -1925,9 +1926,6 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) priv->vif = vif; priv->iw_mode = vif->type; - IWL_DEBUG_MAC80211(priv, "Set %pM\n", vif->addr); - memcpy(priv->mac_addr, vif->addr, ETH_ALEN); - err = iwl_set_mode(priv, vif); if (err) goto out_err; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h index 6663df24a0c4..4abc24ef64a5 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -1232,7 +1232,6 @@ struct iwl_priv { /* context information */ u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */ - u8 mac_addr[ETH_ALEN]; /* station table variables */