From 7eda302c15b85110d4a17c225d8aa2e5ea1c74c6 Mon Sep 17 00:00:00 2001
From: Michael Wu <flamingice@sourmilk.net>
Date: Sun, 15 Jul 2007 17:09:55 -0700
Subject: [PATCH] --- yaml --- r: 63722 b: refs/heads/master c:
 c43bff43e0617dd56515b4ea42a8037c699c86f1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3eb469421453..36261c8b9bef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 313b0d3d863453cb596ea42aed07f8e1a9b0a7e2
+refs/heads/master: c43bff43e0617dd56515b4ea42a8037c699c86f1
diff --git a/trunk/drivers/net/wireless/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl8187_dev.c
index cea85894b7f2..e61c6d5ba1a9 100644
--- a/trunk/drivers/net/wireless/rtl8187_dev.c
+++ b/trunk/drivers/net/wireless/rtl8187_dev.c
@@ -466,7 +466,7 @@ static int rtl8187_add_interface(struct ieee80211_hw *dev,
 		return -EOPNOTSUPP;
 	}
 
-	priv->hwaddr = conf->mac_addr;
+	priv->hwaddr = conf->mac_addr ? conf->mac_addr : dev->wiphy->perm_addr;
 
 	return 0;
 }