ethernet: Convert mac address uses of 6 to ETH_ALEN

[karo-tx-linux.git] / drivers / net / ethernet / dec / tulip / tulip_core.c

diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index c94152f1c6be5396b511902a28478bae1c00e442..4e8cfa2ac803abb13c9c692ef971618cc26d664b 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1304,7 +1304,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        struct tulip_private *tp;
        /* See note below on the multiport cards. */
-       static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'};
+       static unsigned char last_phys_addr[ETH_ALEN] = {
+               0x00, 'L', 'i', 'n', 'u', 'x'
+       };
        static int last_irq;
        static int multiport_cnt;       /* For four-port boards w/one EEPROM */
        int i, irq;
@@ -1627,8 +1629,8 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev->dev_addr[i] = last_phys_addr[i] + 1;
 #if defined(CONFIG_SPARC)
                addr = of_get_property(dp, "local-mac-address", &len);
-               if (addr && len == 6)
-                       memcpy(dev->dev_addr, addr, 6);
+               if (addr && len == ETH_ALEN)
+                       memcpy(dev->dev_addr, addr, ETH_ALEN);
 #endif
 #if defined(__i386__) || defined(__x86_64__)   /* Patch up x86 BIOS bug. */
                if (last_irq)