aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-05-12 06:33:08 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-06-06 02:13:03 -0400
commit041fa0cdf1c1edc2b9efa08c28cc8193e68b1f8f (patch)
treeedf5c855eb4294874a9b8dc7c8fd1f2fd4c5cba5 /drivers/net
parent467429b475e56f154f93b3b14fd75f238d14597a (diff)
iwlwifi: remove useless node_addr assignments
iwl_connection_init_rx_config() will already have set up the entire RXON command, so these assignments are duplicate. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f81f9d176993..87ed28b13c2f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2444,8 +2444,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
2444 2444
2445 if (priv->cfg->ops->hcmd->set_rxon_chain) 2445 if (priv->cfg->ops->hcmd->set_rxon_chain)
2446 priv->cfg->ops->hcmd->set_rxon_chain(priv); 2446 priv->cfg->ops->hcmd->set_rxon_chain(priv);
2447
2448 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
2449 } 2447 }
2450 2448
2451 /* Configure Bluetooth device coexistence support */ 2449 /* Configure Bluetooth device coexistence support */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 682342cf6394..3754762f6823 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1880,8 +1880,6 @@ static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif)
1880 if (priv->cfg->ops->hcmd->set_rxon_chain) 1880 if (priv->cfg->ops->hcmd->set_rxon_chain)
1881 priv->cfg->ops->hcmd->set_rxon_chain(priv); 1881 priv->cfg->ops->hcmd->set_rxon_chain(priv);
1882 1882
1883 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
1884
1885 return iwlcore_commit_rxon(priv); 1883 return iwlcore_commit_rxon(priv);
1886} 1884}
1887 1885