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/realtek | |
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/realtek')
-rw-r--r-- | drivers/net/ethernet/realtek/8139cp.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/realtek/8139too.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 5ac93323a40c..b62a32484f6a 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c | |||
@@ -1949,7 +1949,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1949 | for (i = 0; i < 3; i++) | 1949 | for (i = 0; i < 3; i++) |
1950 | ((__le16 *) (dev->dev_addr))[i] = | 1950 | ((__le16 *) (dev->dev_addr))[i] = |
1951 | cpu_to_le16(read_eeprom (regs, i + 7, addr_len)); | 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 | dev->netdev_ops = &cp_netdev_ops; | 1953 | dev->netdev_ops = &cp_netdev_ops; |
1955 | netif_napi_add(dev, &cp->napi, cp_rx_poll, 16); | 1954 | netif_napi_add(dev, &cp->napi, cp_rx_poll, 16); |
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index 5dc161630127..1276ac71353a 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c | |||
@@ -991,7 +991,6 @@ static int rtl8139_init_one(struct pci_dev *pdev, | |||
991 | for (i = 0; i < 3; i++) | 991 | for (i = 0; i < 3; i++) |
992 | ((__le16 *) (dev->dev_addr))[i] = | 992 | ((__le16 *) (dev->dev_addr))[i] = |
993 | cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len)); | 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 | /* The Rtl8139-specific entries in the device structure. */ | 995 | /* The Rtl8139-specific entries in the device structure. */ |
997 | dev->netdev_ops = &rtl8139_netdev_ops; | 996 | dev->netdev_ops = &rtl8139_netdev_ops; |
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ed96f309bca8..89184f3bc6d6 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -6948,7 +6948,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
6948 | /* Get MAC address */ | 6948 | /* Get MAC address */ |
6949 | for (i = 0; i < ETH_ALEN; i++) | 6949 | for (i = 0; i < ETH_ALEN; i++) |
6950 | dev->dev_addr[i] = RTL_R8(MAC0 + i); | 6950 | dev->dev_addr[i] = RTL_R8(MAC0 + i); |
6951 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
6952 | 6951 | ||
6953 | SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); | 6952 | SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); |
6954 | dev->watchdog_timeo = RTL8169_TX_TIMEOUT; | 6953 | dev->watchdog_timeo = RTL8169_TX_TIMEOUT; |