Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / drivers / net / wireless / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 8d58e6ed4e7d7208a2fc2e28a7d94829122006bc..61ef8904af9717af7179495447cb0b616d43cd40 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11275,6 +11275,7 @@ static int ipw_up(struct ipw_priv *priv)
                if (!(priv->config & CFG_CUSTOM_MAC))
                        eeprom_parse_mac(priv, priv->mac_addr);
                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+               memcpy(priv->net_dev->perm_addr, priv->mac_addr, ETH_ALEN);
 
                for (j = 0; j < ARRAY_SIZE(ipw_geos); j++) {
                        if (!memcmp(&priv->eeprom[EEPROM_COUNTRY_CODE],