From e2c8e0411ecc68f5d4e7f3c6d37ccffa3333fd71 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 6 Oct 2009 16:27:18 -0400
Subject: [PATCH] --- yaml --- r: 170608 b: refs/heads/master c:
 0adc23f58e21cb47be998063ea1b82de33ccdd46 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec2b7dc69a7e..69582ef9e604 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff9fc791940f9ff51387c35f9332efe5007154f1
+refs/heads/master: 0adc23f58e21cb47be998063ea1b82de33ccdd46
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index f6005adcbf90..87aff1d923ba 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -184,10 +184,12 @@ static int ieee80211_open(struct net_device *dev)
 		 * No need to check netif_running since we do not allow
 		 * it to start up with this invalid address.
 		 */
-		if (compare_ether_addr(null_addr, ndev->dev_addr) == 0)
+		if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) {
 			memcpy(ndev->dev_addr,
 			       local->hw.wiphy->perm_addr,
 			       ETH_ALEN);
+			memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
+		}
 	}
 
 	/*
@@ -784,6 +786,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 		goto fail;
 
 	memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
+	memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
 	SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
 
 	/* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */