From fe3306e9e04bad8953d8f9954df2824c957b13c0 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 12 May 2010 03:33:11 -0700
Subject: [PATCH] --- yaml --- r: 202863 b: refs/heads/master c:
 7684c4083114e0f0cc02f3a7cbef27b1e29381cd h: refs/heads/master i:   202861:
 4f1bf69290f54e287dbe77af53292afd627e6a1d   202859:
 debb590ff7a2e4ea65c6797ac2b61576f3fc74ae   202855:
 bf0cc45bdd88b97514953bf498a71d9ddd21aed0   202847:
 7ad27d0e12c213987c4bf90a318221c947585f57 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 783268774fae..4744deebc00b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30eabc1736c79d9b617887042ebebc0141a14170
+refs/heads/master: 7684c4083114e0f0cc02f3a7cbef27b1e29381cd
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
index 4315212ab46a..245cb906c39e 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -979,7 +979,10 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
 	/* clear both MIX and PURE40 mode flag */
 	priv->staging_rxon.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED |
 					RXON_FLG_CHANNEL_MODE_PURE_40);
-	memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
+
+	if (vif)
+		memcpy(priv->staging_rxon.node_addr, vif->addr, ETH_ALEN);
+
 	priv->staging_rxon.ofdm_ht_single_stream_basic_rates = 0xff;
 	priv->staging_rxon.ofdm_ht_dual_stream_basic_rates = 0xff;
 	priv->staging_rxon.ofdm_ht_triple_stream_basic_rates = 0xff;