net:drivers/net: Miscellaneous conversions to ETH_ALEN

Convert the memset/memcpy uses of 6 to ETH_ALEN
where appropriate.

Also convert some struct definitions and u8 array
declarations of [6] to ETH_ALEN.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index d653bac4cfc4..861fa15e1e81 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -607,7 +607,7 @@ static int init_i596_mem(struct net_device *dev)
         i596_add_cmd(dev, &dma->cf_cmd.cmd);
 
         DEB(DEB_INIT, printk(KERN_DEBUG "%s: queuing CmdSASetup\n", dev->name));
-        memcpy(dma->sa_cmd.eth_addr, dev->dev_addr, 6);
+        memcpy(dma->sa_cmd.eth_addr, dev->dev_addr, ETH_ALEN);
         dma->sa_cmd.cmd.command = SWAP16(CmdSASetup);
         DMA_WBACK(dev, &(dma->sa_cmd), sizeof(struct sa_cmd));
         i596_add_cmd(dev, &dma->sa_cmd.cmd);
@@ -1396,13 +1396,13 @@ static void set_multicast_list(struct net_device *dev)
                 netdev_for_each_mc_addr(ha, dev) {
                         if (!cnt--)
                                 break;
-                        memcpy(cp, ha->addr, 6);
+                        memcpy(cp, ha->addr, ETH_ALEN);
                         if (i596_debug > 1)
                                 DEB(DEB_MULTI,
                                     printk(KERN_DEBUG
                                            "%s: Adding address %pM\n",
                                            dev->name, cp));
-                        cp += 6;
+                        cp += ETH_ALEN;
                 }
                 DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
                 i596_add_cmd(dev, &cmd->cmd);