diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-01-07 20:38:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-08 21:00:48 -0500 |
commit | aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc (patch) | |
tree | f6d51541dbee2d6e1810fd7b5e44d149b1a01750 /drivers/net/ethernet/atheros/atlx/atl2.c | |
parent | 948b337e62ca96b6e7de06fdd5f6fe44769d7e9c (diff) |
remove init of dev->perm_addr in drivers
perm_addr is initialized correctly in register_netdevice() so to init it in
drivers is no longer needed.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atlx/atl2.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl2.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index aab83a2d4e07..1278b47022e0 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c | |||
@@ -1433,14 +1433,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1433 | /* copy the MAC address out of the EEPROM */ | 1433 | /* copy the MAC address out of the EEPROM */ |
1434 | atl2_read_mac_addr(&adapter->hw); | 1434 | atl2_read_mac_addr(&adapter->hw); |
1435 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 1435 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
1436 | /* FIXME: do we still need this? */ | ||
1437 | #ifdef ETHTOOL_GPERMADDR | ||
1438 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); | ||
1439 | |||
1440 | if (!is_valid_ether_addr(netdev->perm_addr)) { | ||
1441 | #else | ||
1442 | if (!is_valid_ether_addr(netdev->dev_addr)) { | 1436 | if (!is_valid_ether_addr(netdev->dev_addr)) { |
1443 | #endif | ||
1444 | err = -EIO; | 1437 | err = -EIO; |
1445 | goto err_eeprom; | 1438 | goto err_eeprom; |
1446 | } | 1439 | } |