diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index bc4d98991a32..b7696eb2029e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -15772,7 +15772,6 @@ static int tg3_get_macaddr_sparc(struct tg3 *tp) | |||
15772 | addr = of_get_property(dp, "local-mac-address", &len); | 15772 | addr = of_get_property(dp, "local-mac-address", &len); |
15773 | if (addr && len == 6) { | 15773 | if (addr && len == 6) { |
15774 | memcpy(dev->dev_addr, addr, 6); | 15774 | memcpy(dev->dev_addr, addr, 6); |
15775 | memcpy(dev->perm_addr, dev->dev_addr, 6); | ||
15776 | return 0; | 15775 | return 0; |
15777 | } | 15776 | } |
15778 | return -ENODEV; | 15777 | return -ENODEV; |
@@ -15783,7 +15782,6 @@ static int tg3_get_default_macaddr_sparc(struct tg3 *tp) | |||
15783 | struct net_device *dev = tp->dev; | 15782 | struct net_device *dev = tp->dev; |
15784 | 15783 | ||
15785 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 15784 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); |
15786 | memcpy(dev->perm_addr, idprom->id_ethaddr, 6); | ||
15787 | return 0; | 15785 | return 0; |
15788 | } | 15786 | } |
15789 | #endif | 15787 | #endif |
@@ -15860,7 +15858,6 @@ static int tg3_get_device_address(struct tg3 *tp) | |||
15860 | #endif | 15858 | #endif |
15861 | return -EINVAL; | 15859 | return -EINVAL; |
15862 | } | 15860 | } |
15863 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
15864 | return 0; | 15861 | return 0; |
15865 | } | 15862 | } |
15866 | 15863 | ||