12 files changed, 76 insertions, 126 deletions

diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index 5272f9d4dda9..3574e1499dfc 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -21,10 +21,10 @@ config NET_VENDOR_FREESCALE
 if NET_VENDOR_FREESCALE
 
 config FEC
-        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
+        tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
         depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \
-                   ARCH_MXC || ARCH_MXS)
-        default ARCH_MXC || ARCH_MXS if ARM
+                   ARCH_MXC || SOC_IMX28)
+        default ARCH_MXC || SOC_IMX28 if ARM
         select PHYLIB
         ---help---
           Say Y here if you want to use the built-in 10/100 Fast ethernet
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 112af9b056dc..ddcbbb34d1b9 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -99,7 +99,7 @@ static struct platform_device_id fec_devtype[] = {
 MODULE_DEVICE_TABLE(platform, fec_devtype);
 
 enum imx_fec_type {
-        IMX25_FEC = 1,  /* runs on i.mx25/50/53 */
+        IMX25_FEC = 1,  /* runs on i.mx25/50/53 */
         IMX27_FEC,      /* runs on i.mx27/35/51 */
         IMX28_FEC,
         IMX6Q_FEC,
@@ -132,7 +132,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
 #elif defined (CONFIG_M5272C3)
 #define FEC_FLASHMAC    (0xffe04000 + 4)
 #elif defined(CONFIG_MOD5272)
-#define FEC_FLASHMAC    0xffc0406b
+#define FEC_FLASHMAC    0xffc0406b
 #else
 #define FEC_FLASHMAC    0
 #endif
@@ -255,11 +255,13 @@ struct fec_enet_private {
 #define FEC_MMFR_TA             (2 << 16)
 #define FEC_MMFR_DATA(v)        (v & 0xffff)
 
-#define FEC_MII_TIMEOUT         1000 /* us */
+#define FEC_MII_TIMEOUT         30000 /* us */
 
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)
 
+static int mii_cnt;
+
 static void *swap_buffer(void *bufaddr, int len)
 {
         int i;
@@ -516,6 +518,7 @@ fec_stop(struct net_device *ndev)
         struct fec_enet_private *fep = netdev_priv(ndev);
         const struct platform_device_id *id_entry =
                                 platform_get_device_id(fep->pdev);
+        u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8);
 
         /* We cannot expect a graceful transmit stop without link !!! */
         if (fep->link) {
@@ -532,8 +535,10 @@ fec_stop(struct net_device *ndev)
         writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 
         /* We have to keep ENET enabled to have MII interrupt stay working */
-        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC)
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
                 writel(2, fep->hwp + FEC_ECNTRL);
+                writel(rmii_mode, fep->hwp + FEC_R_CNTRL);
+        }
 }
 
 
@@ -819,7 +824,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
                         iap = (unsigned char *)FEC_FLASHMAC;
 #else
                 if (pdata)
-                        memcpy(iap, pdata->mac, ETH_ALEN);
+                        iap = (unsigned char *)&pdata->mac;
 #endif
         }
 
@@ -866,6 +871,8 @@ static void fec_enet_adjust_link(struct net_device *ndev)
         if (phy_dev->link) {
                 if (fep->full_duplex != phy_dev->duplex) {
                         fec_restart(ndev, phy_dev->duplex);
+                        /* prevent unnecessary second fec_restart() below */
+                        fep->link = phy_dev->link;
                         status_change = 1;
                 }
         }
@@ -973,8 +980,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         }
 
         if (phy_id >= PHY_MAX_ADDR) {
-                printk(KERN_INFO "%s: no PHY, assuming direct connection "
-                        "to switch\n", ndev->name);
+                printk(KERN_INFO
+                        "%s: no PHY, assuming direct connection to switch\n",
+                        ndev->name);
                 strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
                 phy_id = 0;
         }
@@ -999,8 +1007,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         fep->link = 0;
         fep->full_duplex = 0;
 
-        printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name,
+        printk(KERN_INFO
+                "%s: Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
+                ndev->name,
                 fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
                 fep->phy_dev->irq);
 
@@ -1034,8 +1043,12 @@ static int fec_enet_mii_init(struct platform_device *pdev)
          */
         if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
                 /* fec1 uses fec0 mii_bus */
-                fep->mii_bus = fec0_mii_bus;
-                return 0;
+                if (mii_cnt && fec0_mii_bus) {
+                        fep->mii_bus = fec0_mii_bus;
+                        mii_cnt++;
+                        return 0;
+                }
+                return -ENOENT;
         }
 
         fep->mii_timeout = 0;
@@ -1080,6 +1093,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)
         if (mdiobus_register(fep->mii_bus))
                 goto err_out_free_mdio_irq;
 
+        mii_cnt++;
+
         /* save fec0 mii_bus */
         if (id_entry->driver_data & FEC_QUIRK_ENET_MAC)
                 fec0_mii_bus = fep->mii_bus;
@@ -1096,11 +1111,11 @@ err_out:
 
 static void fec_enet_mii_remove(struct fec_enet_private *fep)
 {
-        if (fep->phy_dev)
-                phy_disconnect(fep->phy_dev);
-        mdiobus_unregister(fep->mii_bus);
-        kfree(fep->mii_bus->irq);
-        mdiobus_free(fep->mii_bus);
+        if (--mii_cnt == 0) {
+                mdiobus_unregister(fep->mii_bus);
+                kfree(fep->mii_bus->irq);
+                mdiobus_free(fep->mii_bus);
+        }
 }
 
 static int fec_enet_get_settings(struct net_device *ndev,
@@ -1137,7 +1152,7 @@ static void fec_enet_get_drvinfo(struct net_device *ndev,
         strcpy(info->bus_info, dev_name(&ndev->dev));
 }
 
-static struct ethtool_ops fec_enet_ethtool_ops = {
+static const struct ethtool_ops fec_enet_ethtool_ops = {
         .get_settings           = fec_enet_get_settings,
         .set_settings           = fec_enet_set_settings,
         .get_drvinfo            = fec_enet_get_drvinfo,
@@ -1574,8 +1589,12 @@ fec_probe(struct platform_device *pdev)
 
         for (i = 0; i < FEC_IRQ_NUM; i++) {
                 irq = platform_get_irq(pdev, i);
-                if (i && irq < 0)
-                        break;
+                if (irq < 0) {
+                        if (i)
+                                break;
+                        ret = irq;
+                        goto failed_irq;
+                }
                 ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);
                 if (ret) {
                         while (--i >= 0) {
@@ -1586,7 +1605,7 @@ fec_probe(struct platform_device *pdev)
                 }
         }
 
-        fep->clk = clk_get(&pdev->dev, "fec_clk");
+        fep->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(fep->clk)) {
                 ret = PTR_ERR(fep->clk);
                 goto failed_clk;
@@ -1638,13 +1657,18 @@ fec_drv_remove(struct platform_device *pdev)
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct fec_enet_private *fep = netdev_priv(ndev);
         struct resource *r;
+        int i;
 
-        fec_stop(ndev);
+        unregister_netdev(ndev);
         fec_enet_mii_remove(fep);
+        for (i = 0; i < FEC_IRQ_NUM; i++) {
+                int irq = platform_get_irq(pdev, i);
+                if (irq > 0)
+                        free_irq(irq, ndev);
+        }
         clk_disable_unprepare(fep->clk);
         clk_put(fep->clk);
         iounmap(fep->hwp);
-        unregister_netdev(ndev);
         free_netdev(ndev);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 5bf5471f06ff..910a8e18a9ae 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1171,16 +1171,6 @@ static struct platform_driver fs_enet_driver = {
         .remove = fs_enet_remove,
 };
 
-static int __init fs_init(void)
-{
-        return platform_driver_register(&fs_enet_driver);
-}
-
-static void __exit fs_cleanup(void)
-{
-        platform_driver_unregister(&fs_enet_driver);
-}
-
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void fs_enet_netpoll(struct net_device *dev)
 {
@@ -1190,7 +1180,4 @@ static void fs_enet_netpoll(struct net_device *dev)
 }
 #endif
 
-/**************************************************************************************/
-
-module_init(fs_init);
-module_exit(fs_cleanup);
+module_platform_driver(fs_enet_driver);
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index b09270b5d0a5..0f2d1a710909 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -232,15 +232,4 @@ static struct platform_driver fs_enet_bb_mdio_driver = {
         .remove = fs_enet_mdio_remove,
 };
 
-static int fs_enet_mdio_bb_init(void)
-{
-        return platform_driver_register(&fs_enet_bb_mdio_driver);
-}
-
-static void fs_enet_mdio_bb_exit(void)
-{
-        platform_driver_unregister(&fs_enet_bb_mdio_driver);
-}
-
-module_init(fs_enet_mdio_bb_init);
-module_exit(fs_enet_mdio_bb_exit);
+module_platform_driver(fs_enet_bb_mdio_driver);
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index e0e9d6c35d83..55bb867258e6 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -237,15 +237,4 @@ static struct platform_driver fs_enet_fec_mdio_driver = {
         .remove = fs_enet_mdio_remove,
 };
 
-static int fs_enet_mdio_fec_init(void)
-{
-        return platform_driver_register(&fs_enet_fec_mdio_driver);
-}
-
-static void fs_enet_mdio_fec_exit(void)
-{
-        platform_driver_unregister(&fs_enet_fec_mdio_driver);
-}
-
-module_init(fs_enet_mdio_fec_init);
-module_exit(fs_enet_mdio_fec_exit);
+module_platform_driver(fs_enet_fec_mdio_driver);
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 4d9f84b8ab97..9eb815941df5 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -360,12 +360,11 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)
 
         if (tbiaddr == -1) {
                 err = -EBUSY;
-
                 goto err_free_irqs;
+        } else {
+                out_be32(tbipa, tbiaddr);
         }
 
-        out_be32(tbipa, tbiaddr);
-
         err = of_mdiobus_register(new_bus, np);
         if (err) {
                 printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
@@ -443,15 +442,6 @@ static struct platform_driver fsl_pq_mdio_driver = {
         .remove = fsl_pq_mdio_remove,
 };
 
-int __init fsl_pq_mdio_init(void)
-{
-        return platform_driver_register(&fsl_pq_mdio_driver);
-}
-module_init(fsl_pq_mdio_init);
+module_platform_driver(fsl_pq_mdio_driver);
 
-void fsl_pq_mdio_exit(void)
-{
-        platform_driver_unregister(&fsl_pq_mdio_driver);
-}
-module_exit(fsl_pq_mdio_exit);
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 83199fd0d62b..e01cdaa722a9 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -734,7 +734,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
 
         mac_addr = of_get_mac_address(np);
         if (mac_addr)
-                memcpy(dev->dev_addr, mac_addr, MAC_ADDR_LEN);
+                memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
 
         if (model && !strcasecmp(model, "TSEC"))
                 priv->device_flags =
@@ -2306,7 +2306,7 @@ void gfar_check_rx_parser_mode(struct gfar_private *priv)
 }
 
 /* Enables and disables VLAN insertion/extraction */
-void gfar_vlan_mode(struct net_device *dev, u32 features)
+void gfar_vlan_mode(struct net_device *dev, netdev_features_t features)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = NULL;
@@ -3114,7 +3114,7 @@ static void gfar_set_multi(struct net_device *dev)
 static void gfar_clear_exact_match(struct net_device *dev)
 {
         int idx;
-        static const u8 zero_arr[MAC_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
+        static const u8 zero_arr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
 
         for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
                 gfar_set_mac_for_addr(dev, idx, zero_arr);
@@ -3137,7 +3137,7 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
 {
         u32 tempval;
         struct gfar_private *priv = netdev_priv(dev);
-        u32 result = ether_crc(MAC_ADDR_LEN, addr);
+        u32 result = ether_crc(ETH_ALEN, addr);
         int width = priv->hash_width;
         u8 whichbit = (result >> (32 - width)) & 0x1f;
         u8 whichreg = result >> (32 - width + 5);
@@ -3158,7 +3158,7 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = priv->gfargrp[0].regs;
         int idx;
-        char tmpbuf[MAC_ADDR_LEN];
+        char tmpbuf[ETH_ALEN];
         u32 tempval;
         u32 __iomem *macptr = &regs->macstnaddr1;
 
@@ -3166,8 +3166,8 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
 
         /* Now copy it into the mac registers backwards, cuz */
         /* little endian is silly */
-        for (idx = 0; idx < MAC_ADDR_LEN; idx++)
-                tmpbuf[MAC_ADDR_LEN - 1 - idx] = addr[idx];
+        for (idx = 0; idx < ETH_ALEN; idx++)
+                tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];
 
         gfar_write(macptr, *((u32 *) (tmpbuf)));
 
@@ -3281,16 +3281,4 @@ static struct platform_driver gfar_driver = {
         .remove = gfar_remove,
 };
 
-static int __init gfar_init(void)
-{
-        return platform_driver_register(&gfar_driver);
-}
-
-static void __exit gfar_exit(void)
-{
-        platform_driver_unregister(&gfar_driver);
-}
-
-module_init(gfar_init);
-module_exit(gfar_exit);
-
+module_platform_driver(gfar_driver);
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 9aa43773e8e3..fe7ac3a83194 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -74,9 +74,6 @@ struct ethtool_rx_list {
  * will be the next highest multiple of 512 bytes. */
 #define INCREMENTAL_BUFFER_SIZE 512
 
-
-#define MAC_ADDR_LEN 6
-
 #define PHY_INIT_TIMEOUT 100000
 #define GFAR_PHY_CHANGE_TIME 2
 
@@ -1179,9 +1176,9 @@ extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,
 extern void gfar_configure_coalescing(struct gfar_private *priv,
                 unsigned long tx_mask, unsigned long rx_mask);
 void gfar_init_sysfs(struct net_device *dev);
-int gfar_set_features(struct net_device *dev, u32 features);
+int gfar_set_features(struct net_device *dev, netdev_features_t features);
 extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
-extern void gfar_vlan_mode(struct net_device *dev, u32 features);
+extern void gfar_vlan_mode(struct net_device *dev, netdev_features_t features);
 
 extern const struct ethtool_ops gfar_ethtool_ops;
 
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 212736bab6bb..5a3b2e5b2880 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -519,12 +519,12 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
         return err;
 }
 
-int gfar_set_features(struct net_device *dev, u32 features)
+int gfar_set_features(struct net_device *dev, netdev_features_t features)
 {
         struct gfar_private *priv = netdev_priv(dev);
         unsigned long flags;
         int err = 0, i = 0;
-        u32 changed = dev->features ^ features;
+        netdev_features_t changed = dev->features ^ features;
 
         if (changed & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))
                 gfar_vlan_mode(dev, features);
@@ -1410,10 +1410,9 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
 
         /* We need a copy of the filer table because
          * we want to change its order */
-        temp_table = kmalloc(sizeof(*temp_table), GFP_KERNEL);
+        temp_table = kmemdup(tab, sizeof(*temp_table), GFP_KERNEL);
         if (temp_table == NULL)
                 return -ENOMEM;
-        memcpy(temp_table, tab, sizeof(*temp_table));
 
         mask_table = kcalloc(MAX_FILER_CACHE_IDX / 2 + 1,
                         sizeof(struct gfar_mask_entry), GFP_KERNEL);
@@ -1693,8 +1692,9 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
                 ret = gfar_set_hash_opts(priv, cmd);
                 break;
         case ETHTOOL_SRXCLSRLINS:
-                if (cmd->fs.ring_cookie != RX_CLS_FLOW_DISC &&
-                        cmd->fs.ring_cookie >= priv->num_rx_queues) {
+                if ((cmd->fs.ring_cookie != RX_CLS_FLOW_DISC &&
+                     cmd->fs.ring_cookie >= priv->num_rx_queues) ||
+                    cmd->fs.location >= MAX_FILER_IDX) {
                         ret = -EINVAL;
                         break;
                 }
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index f67b8aebc89c..83e0ed757e33 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -562,21 +562,7 @@ static struct platform_driver gianfar_ptp_driver = {
         .remove      = gianfar_ptp_remove,
 };
 
-/* module operations */
-
-static int __init ptp_gianfar_init(void)
-{
-        return platform_driver_register(&gianfar_ptp_driver);
-}
-
-module_init(ptp_gianfar_init);
-
-static void __exit ptp_gianfar_exit(void)
-{
-        platform_driver_unregister(&gianfar_ptp_driver);
-}
-
-module_exit(ptp_gianfar_exit);
+module_platform_driver(gianfar_ptp_driver);
 
 MODULE_AUTHOR("Richard Cochran <richard.cochran@omicron.at>");
 MODULE_DESCRIPTION("PTP clock using the eTSEC");
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index b5dc0273a1d1..ba2dc083bfc0 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -443,7 +443,7 @@ static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth,
 
 static inline int compare_addr(u8 **addr1, u8 **addr2)
 {
-        return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS);
+        return memcmp(addr1, addr2, ETH_ALEN);
 }
 
 #ifdef DEBUG
diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index d12fcad145e9..2e395a2566b8 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
@@ -20,6 +20,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/if_ether.h>
 
 #include <asm/immap_qe.h>
 #include <asm/qe.h>
@@ -881,7 +882,6 @@ struct ucc_geth_hardware_statistics {
 #define TX_RING_MOD_MASK(size)                  (size-1)
 #define RX_RING_MOD_MASK(size)                  (size-1)
 
-#define ENET_NUM_OCTETS_PER_ADDRESS             6
 #define ENET_GROUP_ADDR                         0x01    /* Group address mask
                                                            for ethernet
                                                            addresses */
@@ -1051,7 +1051,7 @@ enum ucc_geth_num_of_station_addresses {
 
 /* UCC GETH 82xx Ethernet Address Container */
 struct enet_addr_container {
-        u8 address[ENET_NUM_OCTETS_PER_ADDRESS];        /* ethernet address */
+        u8 address[ETH_ALEN];   /* ethernet address */
         enum ucc_geth_enet_address_recognition_location location;       /* location in
                                                                    82xx address
                                                                    recognition
@@ -1194,7 +1194,7 @@ struct ucc_geth_private {
         u16 cpucount[NUM_TX_QUEUES];
         u16 __iomem *p_cpucount[NUM_TX_QUEUES];
         int indAddrRegUsed[NUM_OF_PADDRS];
-        u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS];   /* ethernet address */
+        u8 paddr[NUM_OF_PADDRS][ETH_ALEN];      /* ethernet address */
         u8 numGroupAddrInHash;
         u8 numIndAddrInHash;
         u8 numIndAddrInReg;