diff options
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 8da555416858..7599f52e15b3 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -8305,6 +8305,7 @@ static struct ethtool_ops tg3_ethtool_ops = { | |||
| 8305 | .get_ethtool_stats = tg3_get_ethtool_stats, | 8305 | .get_ethtool_stats = tg3_get_ethtool_stats, |
| 8306 | .get_coalesce = tg3_get_coalesce, | 8306 | .get_coalesce = tg3_get_coalesce, |
| 8307 | .set_coalesce = tg3_set_coalesce, | 8307 | .set_coalesce = tg3_set_coalesce, |
| 8308 | .get_perm_addr = ethtool_op_get_perm_addr, | ||
| 8308 | }; | 8309 | }; |
| 8309 | 8310 | ||
| 8310 | static void __devinit tg3_get_eeprom_size(struct tg3 *tp) | 8311 | static void __devinit tg3_get_eeprom_size(struct tg3 *tp) |
| @@ -9783,6 +9784,7 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp) | |||
| 9783 | if (prom_getproplen(node, "local-mac-address") == 6) { | 9784 | if (prom_getproplen(node, "local-mac-address") == 6) { |
| 9784 | prom_getproperty(node, "local-mac-address", | 9785 | prom_getproperty(node, "local-mac-address", |
| 9785 | dev->dev_addr, 6); | 9786 | dev->dev_addr, 6); |
| 9787 | memcpy(dev->perm_addr, dev->dev_addr, 6); | ||
| 9786 | return 0; | 9788 | return 0; |
| 9787 | } | 9789 | } |
| 9788 | } | 9790 | } |
| @@ -9794,6 +9796,7 @@ static int __devinit tg3_get_default_macaddr_sparc(struct tg3 *tp) | |||
| 9794 | struct net_device *dev = tp->dev; | 9796 | struct net_device *dev = tp->dev; |
| 9795 | 9797 | ||
| 9796 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 9798 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); |
| 9799 | memcpy(dev->perm_addr, idprom->id_ethaddr, 6); | ||
| 9797 | return 0; | 9800 | return 0; |
| 9798 | } | 9801 | } |
| 9799 | #endif | 9802 | #endif |
| @@ -9863,6 +9866,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp) | |||
| 9863 | #endif | 9866 | #endif |
| 9864 | return -EINVAL; | 9867 | return -EINVAL; |
| 9865 | } | 9868 | } |
| 9869 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
| 9866 | return 0; | 9870 | return 0; |
| 9867 | } | 9871 | } |
| 9868 | 9872 | ||
