Merge branch 'master' of git://1984.lsi.us.es/nf

[karo-tx-linux.git] / drivers / net / ethernet / sis / sis900.c

diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 5bffd9749a58e0e658a7413cf39ea7d21697756e..efca14eaefa9324487e3a0aa496730145920795d 100644 (file)
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -247,8 +247,7 @@ static const struct ethtool_ops sis900_ethtool_ops;
  *     @net_dev: the net device to get address for
  *
  *     Older SiS900 and friends, use EEPROM to store MAC address.
- *     MAC address is read from read_eeprom() into @net_dev->dev_addr and
- *     @net_dev->perm_addr.
+ *     MAC address is read from read_eeprom() into @net_dev->dev_addr.
  */
 
 static int sis900_get_mac_addr(struct pci_dev *pci_dev,
@@ -271,9 +270,6 @@ static int sis900_get_mac_addr(struct pci_dev *pci_dev,
        for (i = 0; i < 3; i++)
                ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr);
 
-       /* Store MAC Address in perm_addr */
-       memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
-
        return 1;
 }
 
@@ -284,8 +280,7 @@ static int sis900_get_mac_addr(struct pci_dev *pci_dev,
  *
  *     SiS630E model, use APC CMOS RAM to store MAC address.
  *     APC CMOS RAM is accessed through ISA bridge.
- *     MAC address is read into @net_dev->dev_addr and
- *     @net_dev->perm_addr.
+ *     MAC address is read into @net_dev->dev_addr.
  */
 
 static int sis630e_get_mac_addr(struct pci_dev *pci_dev,
@@ -311,9 +306,6 @@ static int sis630e_get_mac_addr(struct pci_dev *pci_dev,
                ((u8 *)(net_dev->dev_addr))[i] = inb(0x71);
        }
 
-       /* Store MAC Address in perm_addr */
-       memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
-
        pci_write_config_byte(isa_bridge, 0x48, reg & ~0x40);
        pci_dev_put(isa_bridge);
 
@@ -328,7 +320,7 @@ static int sis630e_get_mac_addr(struct pci_dev *pci_dev,
  *
  *     SiS635 model, set MAC Reload Bit to load Mac address from APC
  *     to rfdr. rfdr is accessed through rfcr. MAC address is read into
- *     @net_dev->dev_addr and @net_dev->perm_addr.
+ *     @net_dev->dev_addr.
  */
 
 static int sis635_get_mac_addr(struct pci_dev *pci_dev,
@@ -353,9 +345,6 @@ static int sis635_get_mac_addr(struct pci_dev *pci_dev,
                *( ((u16 *)net_dev->dev_addr) + i) = sr16(rfdr);
        }
 
-       /* Store MAC Address in perm_addr */
-       memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
-
        /* enable packet filtering */
        sw32(rfcr, rfcrSave | RFEN);
 
@@ -375,7 +364,7 @@ static int sis635_get_mac_addr(struct pci_dev *pci_dev,
  *     EEDONE signal to refuse EEPROM access by LAN.
  *     The EEPROM map of SiS962 or SiS963 is different to SiS900.
  *     The signature field in SiS962 or SiS963 spec is meaningless.
- *     MAC address is read into @net_dev->dev_addr and @net_dev->perm_addr.
+ *     MAC address is read into @net_dev->dev_addr.
  */
 
 static int sis96x_get_mac_addr(struct pci_dev *pci_dev,
@@ -395,9 +384,6 @@ static int sis96x_get_mac_addr(struct pci_dev *pci_dev,
                        for (i = 0; i < 3; i++)
                                mac[i] = read_eeprom(ioaddr, i + EEPROMMACAddr);
 
-                       /* Store MAC Address in perm_addr */
-                       memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
-
                        rc = 1;
                        break;
                }