---

yaml --- r: 63722 b: refs/heads/master c: c43bff4 h: refs/heads/master v: v3
git-mirror · Aug 6, 2007 · 7eda302 · 7eda302
1 parent 6557321
commit 7eda302
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }