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/neterion | |
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/neterion')
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 7c94c089212f..bfd887382e19 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -8014,7 +8014,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
8014 | /* Set the factory defined MAC address initially */ | 8014 | /* Set the factory defined MAC address initially */ |
8015 | dev->addr_len = ETH_ALEN; | 8015 | dev->addr_len = ETH_ALEN; |
8016 | memcpy(dev->dev_addr, sp->def_mac_addr, ETH_ALEN); | 8016 | memcpy(dev->dev_addr, sp->def_mac_addr, ETH_ALEN); |
8017 | memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); | ||
8018 | 8017 | ||
8019 | /* initialize number of multicast & unicast MAC entries variables */ | 8018 | /* initialize number of multicast & unicast MAC entries variables */ |
8020 | if (sp->device_type == XFRAME_I_DEVICE) { | 8019 | if (sp->device_type == XFRAME_I_DEVICE) { |
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 7c87105ca049..794444e09492 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -4682,7 +4682,6 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
4682 | /* Store the fw version for ethttool option */ | 4682 | /* Store the fw version for ethttool option */ |
4683 | strcpy(vdev->fw_version, ll_config->device_hw_info.fw_version.version); | 4683 | strcpy(vdev->fw_version, ll_config->device_hw_info.fw_version.version); |
4684 | memcpy(vdev->ndev->dev_addr, (u8 *)vdev->vpaths[0].macaddr, ETH_ALEN); | 4684 | memcpy(vdev->ndev->dev_addr, (u8 *)vdev->vpaths[0].macaddr, ETH_ALEN); |
4685 | memcpy(vdev->ndev->perm_addr, vdev->ndev->dev_addr, ETH_ALEN); | ||
4686 | 4685 | ||
4687 | /* Copy the station mac address to the list */ | 4686 | /* Copy the station mac address to the list */ |
4688 | for (i = 0; i < vdev->no_of_vpath; i++) { | 4687 | for (i = 0; i < vdev->no_of_vpath; i++) { |