1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 7a07430206e..371b58b1d15 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -47,7 +47,7 @@
    TBD:
    * look at deferring rx frames rather than discarding (as per tulip)
    * handle tx ring full as per tulip
-   * performace test to tune rx_copybreak
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
@@ -1094,11 +1094,9 @@ static int __devinit i82596_probe(struct net_device *dev)
                 return i;
         };
 
-        DEB(DEB_PROBE, printk(KERN_INFO "%s: 82596 at %#3lx,",
-                              dev->name, dev->base_addr));
-        for (i = 0; i < 6; i++)
-                DEB(DEB_PROBE, printk(" %2.2X", dev->dev_addr[i]));
-        DEB(DEB_PROBE, printk(" IRQ %d.\n", dev->irq));
+        DEB(DEB_PROBE, printk(KERN_INFO "%s: 82596 at %#3lx, %pM IRQ %d.\n",
+                              dev->name, dev->base_addr, dev->dev_addr,
+                              dev->irq));
         DEB(DEB_INIT, printk(KERN_INFO
                              "%s: dma at 0x%p (%d bytes), lp->scb at 0x%p\n",
                              dev->name, dma, (int)sizeof(struct i596_dma),
@@ -1382,21 +1380,21 @@ static void set_multicast_list(struct net_device *dev)
                 }
         }
 
-        cnt = dev->mc_count;
+        cnt = netdev_mc_count(dev);
         if (cnt > MAX_MC_CNT) {
                 cnt = MAX_MC_CNT;
                 printk(KERN_NOTICE "%s: Only %d multicast addresses supported",
                         dev->name, cnt);
         }
 
-        if (dev->mc_count > 0) {
+        if (!netdev_mc_empty(dev)) {
                 struct dev_mc_list *dmi;
                 unsigned char *cp;
                 struct mc_cmd *cmd;
 
                 cmd = &dma->mc_cmd;
                 cmd->cmd.command = SWAP16(CmdMulticastList);
-                cmd->mc_cnt = SWAP16(dev->mc_count * 6);
+                cmd->mc_cnt = SWAP16(netdev_mc_count(dev) * 6);
                 cp = cmd->mc_addrs;
                 for (dmi = dev->mc_list;
                      cnt && dmi != NULL;