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/qlogic/netxen/netxen_nic_main.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/qlogic/netxen/netxen_nic_main.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 6098fd4adfeb..8e40ea09d7fc 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -501,12 +501,11 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) | |||
501 | for (i = 0; i < 6; i++) | 501 | for (i = 0; i < 6; i++) |
502 | netdev->dev_addr[i] = *(p + 5 - i); | 502 | netdev->dev_addr[i] = *(p + 5 - i); |
503 | 503 | ||
504 | memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); | ||
505 | memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len); | 504 | memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len); |
506 | 505 | ||
507 | /* set station address */ | 506 | /* set station address */ |
508 | 507 | ||
509 | if (!is_valid_ether_addr(netdev->perm_addr)) | 508 | if (!is_valid_ether_addr(netdev->dev_addr)) |
510 | dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr); | 509 | dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr); |
511 | 510 | ||
512 | return 0; | 511 | return 0; |