Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaeb6cdf authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 948b337e

drivers/infiniband/hw/nes/nes_nic.c

+0 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, 
	netdev->dev_addr[3] = (u8)(u64temp>>16);

	netdev->dev_addr[4] = (u8)(u64temp>>8);

	netdev->dev_addr[5] = (u8)u64temp;

	memcpy(netdev->perm_addr, netdev->dev_addr, 6);



	netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX;

	if ((nesvnic->logical_port < 2) || (nesdev->nesadapter->hw_rev != NE020_REV))

drivers/net/ethernet/3com/3c59x.c

+0 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,6 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 
		pr_cont(" ***INVALID CHECKSUM %4.4x*** ", checksum);

	for (i = 0; i < 3; i++)

		((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);

	if (print_info)

		pr_cont(" %pM", dev->dev_addr);

	/* Unfortunately an all zero eeprom passes the checksum and this

drivers/net/ethernet/8390/ne2k-pci.c

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static int ne2k_pci_init_one(struct pci_dev *pdev, 
	NS8390_init(dev, 0);



	memcpy(dev->dev_addr, SA_prom, dev->addr_len);

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	i = register_netdev(dev);

	if (i)

drivers/net/ethernet/amd/pcnet32.c

+1 −2
Original line number Diff line number Diff line
@@ -1688,10 +1688,9 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) 
			memcpy(dev->dev_addr, promaddr, 6);

		}

	}

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	/* if the ethernet address is not valid, force to 00:00:00:00:00:00 */

	if (!is_valid_ether_addr(dev->perm_addr))

	if (!is_valid_ether_addr(dev->dev_addr))

		memset(dev->dev_addr, 0, ETH_ALEN);



	if (pcnet32_debug & NETIF_MSG_PROBE) {

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2542,7 +2542,6 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		netdev->addr_assign_type = NET_ADDR_RANDOM;

	}

	memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);

	memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len);

	if (netif_msg_probe(adapter))

		dev_dbg(&pdev->dev, "mac address : %pM\n",

			adapter->hw.mac_addr);