diff options
Diffstat (limited to 'drivers/net/ethernet/i825xx/lib82596.c')
-rw-r--r-- | drivers/net/ethernet/i825xx/lib82596.c | 6 |
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) | |||
607 | i596_add_cmd(dev, &dma->cf_cmd.cmd); | 607 | i596_add_cmd(dev, &dma->cf_cmd.cmd); |
608 | 608 | ||
609 | DEB(DEB_INIT, printk(KERN_DEBUG "%s: queuing CmdSASetup\n", dev->name)); | 609 | DEB(DEB_INIT, printk(KERN_DEBUG "%s: queuing CmdSASetup\n", dev->name)); |
610 | memcpy(dma->sa_cmd.eth_addr, dev->dev_addr, 6); | 610 | memcpy(dma->sa_cmd.eth_addr, dev->dev_addr, ETH_ALEN); |
611 | dma->sa_cmd.cmd.command = SWAP16(CmdSASetup); | 611 | dma->sa_cmd.cmd.command = SWAP16(CmdSASetup); |
612 | DMA_WBACK(dev, &(dma->sa_cmd), sizeof(struct sa_cmd)); | 612 | DMA_WBACK(dev, &(dma->sa_cmd), sizeof(struct sa_cmd)); |
613 | i596_add_cmd(dev, &dma->sa_cmd.cmd); | 613 | i596_add_cmd(dev, &dma->sa_cmd.cmd); |
@@ -1396,13 +1396,13 @@ static void set_multicast_list(struct net_device *dev) | |||
1396 | netdev_for_each_mc_addr(ha, dev) { | 1396 | netdev_for_each_mc_addr(ha, dev) { |
1397 | if (!cnt--) | 1397 | if (!cnt--) |
1398 | break; | 1398 | break; |
1399 | memcpy(cp, ha->addr, 6); | 1399 | memcpy(cp, ha->addr, ETH_ALEN); |
1400 | if (i596_debug > 1) | 1400 | if (i596_debug > 1) |
1401 | DEB(DEB_MULTI, | 1401 | DEB(DEB_MULTI, |
1402 | printk(KERN_DEBUG | 1402 | printk(KERN_DEBUG |
1403 | "%s: Adding address %pM\n", | 1403 | "%s: Adding address %pM\n", |
1404 | dev->name, cp)); | 1404 | dev->name, cp)); |
1405 | cp += 6; | 1405 | cp += ETH_ALEN; |
1406 | } | 1406 | } |
1407 | DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd)); | 1407 | DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd)); |
1408 | i596_add_cmd(dev, &cmd->cmd); | 1408 | i596_add_cmd(dev, &cmd->cmd); |