aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2007-07-15 17:09:55 -0700
committerJohn W. Linville <linville@tuxdriver.com>2007-08-06 15:06:03 -0400
commitc43bff43e0617dd56515b4ea42a8037c699c86f1 (patch)
tree7d74ae44dca335178ac6dd510e35b52e66da4add /drivers/net
parent313b0d3d863453cb596ea42aed07f8e1a9b0a7e2 (diff)
[PATCH] rtl8187: ensure priv->hwaddr is always valid
conf->mac_addr is not guaranteed to be set. This ensures priv->hwaddr is always set to a valid mac address. Thanks to Johannes Berg <johannes@sipsolutions.net> for finding this problem. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rtl8187_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index cea85894b7f..e61c6d5ba1a 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/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;
}