iwlwifi: remove mac_addr assignment

priv->mac_addr is the address of the operating
interface, not the permanent MAC address. They
are usually the same, but the user can override
the operating address, so we shouldn't set the
variable to the permanent one, it is assigned
when an interface is added.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 87ed28b13c2f101d2b6432841eb923f8dbf37470..7c63c0619f2aaa26ec8720e46389420bc35cfed6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3656,6 +3656,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
        unsigned long flags;
        u16 pci_cmd;
+       u8 perm_addr[ETH_ALEN];
 
        /************************
         * 1. Allocating HW data
@@ -3776,9 +3777,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_free_eeprom;
 
        /* extract MAC Address */
-       iwl_eeprom_get_mac(priv, priv->mac_addr);
-       IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->mac_addr);
-       SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+       iwl_eeprom_get_mac(priv, perm_addr);
+       IWL_DEBUG_INFO(priv, "MAC address: %pM\n", perm_addr);
+       SET_IEEE80211_PERM_ADDR(priv->hw, perm_addr);
 
        /************************
         * 5. Setup HW constants

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 42f1d3328078ff02b00b57c25e2f93dbc5e748e7..5976166cb92d72ec05e4fc0f27c45f65a3f52ee2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4015,9 +4015,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        }
        /* MAC Address location in EEPROM same for 3945/4965 */
        eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-       memcpy(priv->mac_addr, eeprom->mac_address, ETH_ALEN);
-       IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->mac_addr);
-       SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+       IWL_DEBUG_INFO(priv, "MAC address: %pM\n", eeprom->mac_address);
+       SET_IEEE80211_PERM_ADDR(priv->hw, eeprom->mac_address);
 
        /***********************
         * 5. Setup HW Constants