Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Pirko and committed by
David S. Miller
aaeb6cdf 948b337e

+42 -128
-1
drivers/infiniband/hw/nes/nes_nic.c
··· 1705 1705 netdev->dev_addr[3] = (u8)(u64temp>>16); 1706 1706 netdev->dev_addr[4] = (u8)(u64temp>>8); 1707 1707 netdev->dev_addr[5] = (u8)u64temp; 1708 - memcpy(netdev->perm_addr, netdev->dev_addr, 6); 1709 1708 1710 1709 netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX; 1711 1710 if ((nesvnic->logical_port < 2) || (nesdev->nesadapter->hw_rev != NE020_REV))
-1
drivers/net/ethernet/3com/3c59x.c
··· 1293 1293 pr_cont(" ***INVALID CHECKSUM %4.4x*** ", checksum); 1294 1294 for (i = 0; i < 3; i++) 1295 1295 ((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]); 1296 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1297 1296 if (print_info) 1298 1297 pr_cont(" %pM", dev->dev_addr); 1299 1298 /* Unfortunately an all zero eeprom passes the checksum and this
-1
drivers/net/ethernet/8390/ne2k-pci.c
··· 374 374 NS8390_init(dev, 0); 375 375 376 376 memcpy(dev->dev_addr, SA_prom, dev->addr_len); 377 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 378 377 379 378 i = register_netdev(dev); 380 379 if (i)
+1 -2
drivers/net/ethernet/amd/pcnet32.c
··· 1688 1688 memcpy(dev->dev_addr, promaddr, 6); 1689 1689 } 1690 1690 } 1691 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1692 1691 1693 1692 /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */ 1694 - if (!is_valid_ether_addr(dev->perm_addr)) 1693 + if (!is_valid_ether_addr(dev->dev_addr)) 1695 1694 memset(dev->dev_addr, 0, ETH_ALEN); 1696 1695 1697 1696 if (pcnet32_debug & NETIF_MSG_PROBE) {
-1
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
··· 2542 2542 netdev->addr_assign_type = NET_ADDR_RANDOM; 2543 2543 } 2544 2544 memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); 2545 - memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); 2546 2545 if (netif_msg_probe(adapter)) 2547 2546 dev_dbg(&pdev->dev, "mac address : %pM\n", 2548 2547 adapter->hw.mac_addr);
-1
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
··· 2342 2342 } 2343 2343 2344 2344 memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); 2345 - memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); 2346 2345 netdev_dbg(netdev, "mac address : %pM\n", adapter->hw.mac_addr); 2347 2346 2348 2347 INIT_WORK(&adapter->reset_task, atl1e_reset_task);
-7
drivers/net/ethernet/atheros/atlx/atl2.c
··· 1433 1433 /* copy the MAC address out of the EEPROM */ 1434 1434 atl2_read_mac_addr(&adapter->hw); 1435 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 1436 if (!is_valid_ether_addr(netdev->dev_addr)) { 1443 - #endif 1444 1437 err = -EIO; 1445 1438 goto err_eeprom; 1446 1439 }
-2
drivers/net/ethernet/broadcom/b44.c
··· 2111 2111 return -EINVAL; 2112 2112 } 2113 2113 2114 - memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); 2115 - 2116 2114 bp->imask = IMASK_DEF; 2117 2115 2118 2116 /* XXX - really required?
-1
drivers/net/ethernet/broadcom/bnx2.c
··· 8543 8543 pci_set_drvdata(pdev, dev); 8544 8544 8545 8545 memcpy(dev->dev_addr, bp->mac_addr, 6); 8546 - memcpy(dev->perm_addr, bp->mac_addr, 6); 8547 8546 8548 8547 dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | 8549 8548 NETIF_F_TSO | NETIF_F_TSO_ECN |
-1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
··· 10806 10806 } 10807 10807 10808 10808 memcpy(bp->link_params.mac_addr, bp->dev->dev_addr, ETH_ALEN); 10809 - memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); 10810 10809 10811 10810 if (!bnx2x_is_valid_ether_addr(bp, bp->dev->dev_addr)) 10812 10811 dev_err(&bp->pdev->dev,
-3
drivers/net/ethernet/broadcom/tg3.c
··· 15772 15772 addr = of_get_property(dp, "local-mac-address", &len); 15773 15773 if (addr && len == 6) { 15774 15774 memcpy(dev->dev_addr, addr, 6); 15775 - memcpy(dev->perm_addr, dev->dev_addr, 6); 15776 15775 return 0; 15777 15776 } 15778 15777 return -ENODEV; ··· 15782 15783 struct net_device *dev = tp->dev; 15783 15784 15784 15785 memcpy(dev->dev_addr, idprom->id_ethaddr, 6); 15785 - memcpy(dev->perm_addr, idprom->id_ethaddr, 6); 15786 15786 return 0; 15787 15787 } 15788 15788 #endif ··· 15858 15860 #endif 15859 15861 return -EINVAL; 15860 15862 } 15861 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 15862 15863 return 0; 15863 15864 } 15864 15865
-2
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
··· 3725 3725 3726 3726 memcpy(adapter->port[i]->dev_addr, hw_addr, 3727 3727 ETH_ALEN); 3728 - memcpy(adapter->port[i]->perm_addr, hw_addr, 3729 - ETH_ALEN); 3730 3728 init_link_config(&p->link_config, p->phy.caps); 3731 3729 p->phy.ops->power_down(&p->phy, 1); 3732 3730
-1
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
··· 3603 3603 p->lport = j; 3604 3604 p->rss_size = rss_size; 3605 3605 memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN); 3606 - memcpy(adap->port[i]->perm_addr, addr, ETH_ALEN); 3607 3606 adap->port[i]->dev_id = j; 3608 3607 3609 3608 ret = ntohl(c.u.info.lstatus_to_modtype);
-1
drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
··· 466 466 u8 hw_addr[]) 467 467 { 468 468 memcpy(adapter->port[pidx]->dev_addr, hw_addr, ETH_ALEN); 469 - memcpy(adapter->port[pidx]->perm_addr, hw_addr, ETH_ALEN); 470 469 } 471 470 472 471 /**
-1
drivers/net/ethernet/dlink/sundance.c
··· 530 530 for (i = 0; i < 3; i++) 531 531 ((__le16 *)dev->dev_addr)[i] = 532 532 cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET)); 533 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 534 533 535 534 np = netdev_priv(dev); 536 535 np->base = ioaddr;
+1 -2
drivers/net/ethernet/intel/e100.c
··· 2928 2928 e100_phy_init(nic); 2929 2929 2930 2930 memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); 2931 - memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN); 2932 - if (!is_valid_ether_addr(netdev->perm_addr)) { 2931 + if (!is_valid_ether_addr(netdev->dev_addr)) { 2933 2932 if (!eeprom_bad_csum_allow) { 2934 2933 netif_err(nic, probe, nic->netdev, "Invalid MAC address from EEPROM, aborting\n"); 2935 2934 err = -EAGAIN;
+1 -2
drivers/net/ethernet/intel/e1000/e1000_main.c
··· 1123 1123 } 1124 1124 /* don't block initalization here due to bad MAC address */ 1125 1125 memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); 1126 - memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len); 1127 1126 1128 - if (!is_valid_ether_addr(netdev->perm_addr)) 1127 + if (!is_valid_ether_addr(netdev->dev_addr)) 1129 1128 e_err(probe, "Invalid MAC Address\n"); 1130 1129 1131 1130
+2 -3
drivers/net/ethernet/intel/e1000e/netdev.c
··· 6228 6228 "NVM Read Error while reading MAC address\n"); 6229 6229 6230 6230 memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len); 6231 - memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); 6232 6231 6233 - if (!is_valid_ether_addr(netdev->perm_addr)) { 6232 + if (!is_valid_ether_addr(netdev->dev_addr)) { 6234 6233 dev_err(&pdev->dev, "Invalid MAC Address: %pM\n", 6235 - netdev->perm_addr); 6234 + netdev->dev_addr); 6236 6235 err = -EIO; 6237 6236 goto err_eeprom; 6238 6237 }
+1 -2
drivers/net/ethernet/intel/igb/igb_main.c
··· 2022 2022 dev_err(&pdev->dev, "NVM Read Error\n"); 2023 2023 2024 2024 memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len); 2025 - memcpy(netdev->perm_addr, hw->mac.addr, netdev->addr_len); 2026 2025 2027 - if (!is_valid_ether_addr(netdev->perm_addr)) { 2026 + if (!is_valid_ether_addr(netdev->dev_addr)) { 2028 2027 dev_err(&pdev->dev, "Invalid MAC Address\n"); 2029 2028 err = -EIO; 2030 2029 goto err_eeprom;
-2
drivers/net/ethernet/intel/igbvf/netdev.c
··· 2757 2757 goto err_hw_init; 2758 2758 } 2759 2759 2760 - memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); 2761 - 2762 2760 setup_timer(&adapter->watchdog_timer, &igbvf_watchdog, 2763 2761 (unsigned long) adapter); 2764 2762
+1 -2
drivers/net/ethernet/intel/ixgb/ixgb_main.c
··· 500 500 } 501 501 502 502 ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr); 503 - memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); 504 503 505 - if (!is_valid_ether_addr(netdev->perm_addr)) { 504 + if (!is_valid_ether_addr(netdev->dev_addr)) { 506 505 netif_err(adapter, probe, adapter->netdev, "Invalid MAC Address\n"); 507 506 err = -EIO; 508 507 goto err_eeprom;
+1 -2
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
··· 7444 7444 } 7445 7445 7446 7446 memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len); 7447 - memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len); 7448 7447 7449 - if (!is_valid_ether_addr(netdev->perm_addr)) { 7448 + if (!is_valid_ether_addr(netdev->dev_addr)) { 7450 7449 e_dev_err("invalid MAC address\n"); 7451 7450 err = -EIO; 7452 7451 goto err_sw_init;
-2
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
··· 3328 3328 goto err_sw_init; 3329 3329 3330 3330 /* The HW MAC address was set and/or determined in sw_init */ 3331 - memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); 3332 - 3333 3331 if (!is_valid_ether_addr(netdev->dev_addr)) { 3334 3332 pr_err("invalid MAC address\n"); 3335 3333 err = -EIO;
-1
drivers/net/ethernet/marvell/skge.c
··· 3855 3855 3856 3856 /* read the mac address */ 3857 3857 memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN); 3858 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 3859 3858 3860 3859 return dev; 3861 3860 }
-1
drivers/net/ethernet/marvell/sky2.c
··· 4801 4801 4802 4802 /* read the mac address */ 4803 4803 memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); 4804 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 4805 4804 4806 4805 return dev; 4807 4806 }
+1 -3
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
··· 1655 1655 1656 1656 /* Set defualt MAC */ 1657 1657 dev->addr_len = ETH_ALEN; 1658 - for (i = 0; i < ETH_ALEN; i++) { 1658 + for (i = 0; i < ETH_ALEN; i++) 1659 1659 dev->dev_addr[ETH_ALEN - 1 - i] = (u8) (priv->mac >> (8 * i)); 1660 - dev->perm_addr[ETH_ALEN - 1 - i] = (u8) (priv->mac >> (8 * i)); 1661 - } 1662 1660 1663 1661 /* 1664 1662 * Set driver features
-3
drivers/net/ethernet/natsemi/natsemi.c
··· 862 862 prev_eedata = eedata; 863 863 } 864 864 865 - /* Store MAC Address in perm_addr */ 866 - memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); 867 - 868 865 np = netdev_priv(dev); 869 866 np->ioaddr = ioaddr; 870 867
-1
drivers/net/ethernet/neterion/s2io.c
··· 8014 8014 /* Set the factory defined MAC address initially */ 8015 8015 dev->addr_len = ETH_ALEN; 8016 8016 memcpy(dev->dev_addr, sp->def_mac_addr, ETH_ALEN); 8017 - memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); 8018 8017 8019 8018 /* initialize number of multicast & unicast MAC entries variables */ 8020 8019 if (sp->device_type == XFRAME_I_DEVICE) {
-1
drivers/net/ethernet/neterion/vxge/vxge-main.c
··· 4682 4682 /* Store the fw version for ethttool option */ 4683 4683 strcpy(vdev->fw_version, ll_config->device_hw_info.fw_version.version); 4684 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 4686 /* Copy the station mac address to the list */ 4688 4687 for (i = 0; i < vdev->no_of_vpath; i++) {
+1 -2
drivers/net/ethernet/nvidia/forcedeth.c
··· 5730 5730 "%s: set workaround bit for reversed mac addr\n", 5731 5731 __func__); 5732 5732 } 5733 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 5734 5733 5735 - if (!is_valid_ether_addr(dev->perm_addr)) { 5734 + if (!is_valid_ether_addr(dev->dev_addr)) { 5736 5735 /* 5737 5736 * Bad mac address. At least one bios sets the mac address 5738 5737 * to 01:23:45:67:89:ab
+1 -2
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
··· 501 501 for (i = 0; i < 6; i++) 502 502 netdev->dev_addr[i] = *(p + 5 - i); 503 503 504 - memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); 505 504 memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len); 506 505 507 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 509 dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr); 511 510 512 511 return 0;
-1
drivers/net/ethernet/qlogic/qla3xxx.c
··· 3867 3867 ndev->mtu = qdev->nvram_data.macCfg_port0.etherMtu_mac ; 3868 3868 ql_set_mac_addr(ndev, qdev->nvram_data.funcCfg_fn0.macAddress); 3869 3869 } 3870 - memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); 3871 3870 3872 3871 ndev->tx_queue_len = NUM_REQ_Q_ENTRIES; 3873 3872
+1 -2
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
··· 208 208 return -EIO; 209 209 210 210 memcpy(netdev->dev_addr, mac_addr, ETH_ALEN); 211 - memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); 212 211 memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len); 213 212 214 213 /* set station address */ 215 214 216 - if (!is_valid_ether_addr(netdev->perm_addr)) 215 + if (!is_valid_ether_addr(netdev->dev_addr)) 217 216 dev_warn(&pdev->dev, "Bad MAC address %pM.\n", 218 217 netdev->dev_addr); 219 218
-1
drivers/net/ethernet/qlogic/qlge/qlge_main.c
··· 4586 4586 goto err_out2; 4587 4587 } 4588 4588 4589 - memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); 4590 4589 /* Keep local copy of current mac address. */ 4591 4590 memcpy(qdev->current_mac_addr, ndev->dev_addr, ndev->addr_len); 4592 4591
-3
drivers/net/ethernet/rdc/r6040.c
··· 755 755 iowrite16(adrp[0], ioaddr + MID_0L); 756 756 iowrite16(adrp[1], ioaddr + MID_0M); 757 757 iowrite16(adrp[2], ioaddr + MID_0H); 758 - 759 - /* Store MAC Address in perm_addr */ 760 - memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); 761 758 } 762 759 763 760 static int r6040_open(struct net_device *dev)
-1
drivers/net/ethernet/realtek/8139cp.c
··· 1949 1949 for (i = 0; i < 3; i++) 1950 1950 ((__le16 *) (dev->dev_addr))[i] = 1951 1951 cpu_to_le16(read_eeprom (regs, i + 7, addr_len)); 1952 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1953 1952 1954 1953 dev->netdev_ops = &cp_netdev_ops; 1955 1954 netif_napi_add(dev, &cp->napi, cp_rx_poll, 16);
-1
drivers/net/ethernet/realtek/8139too.c
··· 991 991 for (i = 0; i < 3; i++) 992 992 ((__le16 *) (dev->dev_addr))[i] = 993 993 cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len)); 994 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 995 994 996 995 /* The Rtl8139-specific entries in the device structure. */ 997 996 dev->netdev_ops = &rtl8139_netdev_ops;
-1
drivers/net/ethernet/realtek/r8169.c
··· 6948 6948 /* Get MAC address */ 6949 6949 for (i = 0; i < ETH_ALEN; i++) 6950 6950 dev->dev_addr[i] = RTL_R8(MAC0 + i); 6951 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 6952 6951 6953 6952 SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); 6954 6953 dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
+6 -6
drivers/net/ethernet/silan/sc92031.c
··· 1458 1458 1459 1459 mac0 = ioread32(port_base + MAC0); 1460 1460 mac1 = ioread32(port_base + MAC0 + 4); 1461 - dev->dev_addr[0] = dev->perm_addr[0] = mac0 >> 24; 1462 - dev->dev_addr[1] = dev->perm_addr[1] = mac0 >> 16; 1463 - dev->dev_addr[2] = dev->perm_addr[2] = mac0 >> 8; 1464 - dev->dev_addr[3] = dev->perm_addr[3] = mac0; 1465 - dev->dev_addr[4] = dev->perm_addr[4] = mac1 >> 8; 1466 - dev->dev_addr[5] = dev->perm_addr[5] = mac1; 1461 + dev->dev_addr[0] = mac0 >> 24; 1462 + dev->dev_addr[1] = mac0 >> 16; 1463 + dev->dev_addr[2] = mac0 >> 8; 1464 + dev->dev_addr[3] = mac0; 1465 + dev->dev_addr[4] = mac1 >> 8; 1466 + dev->dev_addr[5] = mac1; 1467 1467 1468 1468 err = register_netdev(dev); 1469 1469 if (err < 0)
+4 -18
drivers/net/ethernet/sis/sis900.c
··· 247 247 * @net_dev: the net device to get address for 248 248 * 249 249 * Older SiS900 and friends, use EEPROM to store MAC address. 250 - * MAC address is read from read_eeprom() into @net_dev->dev_addr and 251 - * @net_dev->perm_addr. 250 + * MAC address is read from read_eeprom() into @net_dev->dev_addr. 252 251 */ 253 252 254 253 static int sis900_get_mac_addr(struct pci_dev *pci_dev, ··· 270 271 for (i = 0; i < 3; i++) 271 272 ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr); 272 273 273 - /* Store MAC Address in perm_addr */ 274 - memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN); 275 - 276 274 return 1; 277 275 } 278 276 ··· 280 284 * 281 285 * SiS630E model, use APC CMOS RAM to store MAC address. 282 286 * APC CMOS RAM is accessed through ISA bridge. 283 - * MAC address is read into @net_dev->dev_addr and 284 - * @net_dev->perm_addr. 287 + * MAC address is read into @net_dev->dev_addr. 285 288 */ 286 289 287 290 static int sis630e_get_mac_addr(struct pci_dev *pci_dev, ··· 306 311 ((u8 *)(net_dev->dev_addr))[i] = inb(0x71); 307 312 } 308 313 309 - /* Store MAC Address in perm_addr */ 310 - memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN); 311 - 312 314 pci_write_config_byte(isa_bridge, 0x48, reg & ~0x40); 313 315 pci_dev_put(isa_bridge); 314 316 ··· 320 328 * 321 329 * SiS635 model, set MAC Reload Bit to load Mac address from APC 322 330 * to rfdr. rfdr is accessed through rfcr. MAC address is read into 323 - * @net_dev->dev_addr and @net_dev->perm_addr. 331 + * @net_dev->dev_addr. 324 332 */ 325 333 326 334 static int sis635_get_mac_addr(struct pci_dev *pci_dev, ··· 345 353 *( ((u16 *)net_dev->dev_addr) + i) = sr16(rfdr); 346 354 } 347 355 348 - /* Store MAC Address in perm_addr */ 349 - memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN); 350 - 351 356 /* enable packet filtering */ 352 357 sw32(rfcr, rfcrSave | RFEN); 353 358 ··· 364 375 * EEDONE signal to refuse EEPROM access by LAN. 365 376 * The EEPROM map of SiS962 or SiS963 is different to SiS900. 366 377 * The signature field in SiS962 or SiS963 spec is meaningless. 367 - * MAC address is read into @net_dev->dev_addr and @net_dev->perm_addr. 378 + * MAC address is read into @net_dev->dev_addr. 368 379 */ 369 380 370 381 static int sis96x_get_mac_addr(struct pci_dev *pci_dev, ··· 383 394 /* get MAC address from EEPROM */ 384 395 for (i = 0; i < 3; i++) 385 396 mac[i] = read_eeprom(ioaddr, i + EEPROMMACAddr); 386 - 387 - /* Store MAC Address in perm_addr */ 388 - memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN); 389 397 390 398 rc = 1; 391 399 break;
+20 -26
drivers/net/ethernet/sun/niu.c
··· 8366 8366 return; 8367 8367 } 8368 8368 8369 - memcpy(dev->perm_addr, vpd->local_mac, ETH_ALEN); 8369 + memcpy(dev->dev_addr, vpd->local_mac, ETH_ALEN); 8370 8370 8371 - val8 = dev->perm_addr[5]; 8372 - dev->perm_addr[5] += np->port; 8373 - if (dev->perm_addr[5] < val8) 8374 - dev->perm_addr[4]++; 8375 - 8376 - memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len); 8371 + val8 = dev->dev_addr[5]; 8372 + dev->dev_addr[5] += np->port; 8373 + if (dev->dev_addr[5] < val8) 8374 + dev->dev_addr[4]++; 8377 8375 } 8378 8376 8379 8377 static int niu_pci_probe_sprom(struct niu *np) ··· 8468 8470 val = nr64(ESPC_MAC_ADDR0); 8469 8471 netif_printk(np, probe, KERN_DEBUG, np->dev, 8470 8472 "SPROM: MAC_ADDR0[%08llx]\n", (unsigned long long)val); 8471 - dev->perm_addr[0] = (val >> 0) & 0xff; 8472 - dev->perm_addr[1] = (val >> 8) & 0xff; 8473 - dev->perm_addr[2] = (val >> 16) & 0xff; 8474 - dev->perm_addr[3] = (val >> 24) & 0xff; 8473 + dev->dev_addr[0] = (val >> 0) & 0xff; 8474 + dev->dev_addr[1] = (val >> 8) & 0xff; 8475 + dev->dev_addr[2] = (val >> 16) & 0xff; 8476 + dev->dev_addr[3] = (val >> 24) & 0xff; 8475 8477 8476 8478 val = nr64(ESPC_MAC_ADDR1); 8477 8479 netif_printk(np, probe, KERN_DEBUG, np->dev, 8478 8480 "SPROM: MAC_ADDR1[%08llx]\n", (unsigned long long)val); 8479 - dev->perm_addr[4] = (val >> 0) & 0xff; 8480 - dev->perm_addr[5] = (val >> 8) & 0xff; 8481 + dev->dev_addr[4] = (val >> 0) & 0xff; 8482 + dev->dev_addr[5] = (val >> 8) & 0xff; 8481 8483 8482 - if (!is_valid_ether_addr(&dev->perm_addr[0])) { 8484 + if (!is_valid_ether_addr(&dev->dev_addr[0])) { 8483 8485 dev_err(np->device, "SPROM MAC address invalid [ %pM ]\n", 8484 - dev->perm_addr); 8486 + dev->dev_addr); 8485 8487 return -EINVAL; 8486 8488 } 8487 8489 8488 - val8 = dev->perm_addr[5]; 8489 - dev->perm_addr[5] += np->port; 8490 - if (dev->perm_addr[5] < val8) 8491 - dev->perm_addr[4]++; 8492 - 8493 - memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len); 8490 + val8 = dev->dev_addr[5]; 8491 + dev->dev_addr[5] += np->port; 8492 + if (dev->dev_addr[5] < val8) 8493 + dev->dev_addr[4]++; 8494 8494 8495 8495 val = nr64(ESPC_MOD_STR_LEN); 8496 8496 netif_printk(np, probe, KERN_DEBUG, np->dev, ··· 9263 9267 netdev_err(dev, "%s: OF MAC address prop len (%d) is wrong\n", 9264 9268 dp->full_name, prop_len); 9265 9269 } 9266 - memcpy(dev->perm_addr, mac_addr, dev->addr_len); 9267 - if (!is_valid_ether_addr(&dev->perm_addr[0])) { 9270 + memcpy(dev->dev_addr, mac_addr, dev->addr_len); 9271 + if (!is_valid_ether_addr(&dev->dev_addr[0])) { 9268 9272 netdev_err(dev, "%s: OF MAC address is invalid\n", 9269 9273 dp->full_name); 9270 - netdev_err(dev, "%s: [ %pM ]\n", dp->full_name, dev->perm_addr); 9274 + netdev_err(dev, "%s: [ %pM ]\n", dp->full_name, dev->dev_addr); 9271 9275 return -EINVAL; 9272 9276 } 9273 - 9274 - memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len); 9275 9277 9276 9278 model = of_get_property(dp, "model", &prop_len); 9277 9279
-2
drivers/net/ethernet/sun/sunvnet.c
··· 1032 1032 for (i = 0; i < ETH_ALEN; i++) 1033 1033 dev->dev_addr[i] = (*local_mac >> (5 - i) * 8) & 0xff; 1034 1034 1035 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1036 - 1037 1035 vp = netdev_priv(dev); 1038 1036 1039 1037 spin_lock_init(&vp->lock);
-1
drivers/net/ethernet/toshiba/tc35815.c
··· 856 856 if (rc) 857 857 goto err_out; 858 858 859 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 860 859 printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n", 861 860 dev->name, 862 861 chip_info[ent->driver_data].name,
-1
drivers/net/ethernet/via/via-rhine.c
··· 990 990 netdev_info(dev, "Using random MAC address: %pM\n", 991 991 dev->dev_addr); 992 992 } 993 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 994 993 995 994 /* For Rhine-I/II, phy_id is loaded from EEPROM */ 996 995 if (!phy_id)
-1
drivers/net/ieee802154/fakehard.c
··· 372 372 373 373 memcpy(dev->dev_addr, "\xba\xbe\xca\xfe\xde\xad\xbe\xef", 374 374 dev->addr_len); 375 - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 376 375 377 376 /* 378 377 * For now we'd like to emulate 2.4 GHz-only device,
-1
drivers/net/usb/kalmia.c
··· 159 159 } 160 160 161 161 memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN); 162 - memcpy(dev->net->perm_addr, ethernet_addr, ETH_ALEN); 163 162 164 163 return status; 165 164 }
-1
drivers/net/usb/rndis_host.c
··· 431 431 goto halt_fail_and_release; 432 432 } 433 433 memcpy(net->dev_addr, bp, ETH_ALEN); 434 - memcpy(net->perm_addr, bp, ETH_ALEN); 435 434 436 435 /* set a nonzero filter to enable data transfers */ 437 436 memset(u.set, 0, sizeof *u.set);
-1
drivers/net/wimax/i2400m/fw.c
··· 1055 1055 result = 0; 1056 1056 } 1057 1057 net_dev->addr_len = ETH_ALEN; 1058 - memcpy(net_dev->perm_addr, ack_buf.ack_pl, ETH_ALEN); 1059 1058 memcpy(net_dev->dev_addr, ack_buf.ack_pl, ETH_ALEN); 1060 1059 error_read_mac: 1061 1060 d_fnend(5, dev, "(i2400m %p) = %d\n", i2400m, result);
-1
drivers/net/wireless/ipw2x00/ipw2200.c
··· 11327 11327 if (!(priv->config & CFG_CUSTOM_MAC)) 11328 11328 eeprom_parse_mac(priv, priv->mac_addr); 11329 11329 memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN); 11330 - memcpy(priv->net_dev->perm_addr, priv->mac_addr, ETH_ALEN); 11331 11330 11332 11331 ipw_set_geo(priv); 11333 11332
-1
drivers/net/wireless/mwifiex/cfg80211.c
··· 2117 2117 dev->ieee80211_ptr = priv->wdev; 2118 2118 dev->ieee80211_ptr->iftype = priv->bss_mode; 2119 2119 memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN); 2120 - memcpy(dev->perm_addr, wiphy->perm_addr, ETH_ALEN); 2121 2120 SET_NETDEV_DEV(dev, wiphy_dev(wiphy)); 2122 2121 2123 2122 dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
-1
drivers/net/wireless/orinoco/main.c
··· 2290 2290 netif_carrier_off(dev); 2291 2291 2292 2292 memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN); 2293 - memcpy(dev->perm_addr, wiphy->perm_addr, ETH_ALEN); 2294 2293 2295 2294 dev->base_addr = base_addr; 2296 2295 dev->irq = irq;