Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index dcda30338b65..7b9447646f8a 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -493,14 +493,14 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
                 static const short ioaddr_table[] = { 0x300, 0x320, 0x340, 0x360};
                 int hp_port = (readl(bios + 1) & 1)  ? 0x499 : 0x99;
                 /* We can have boards other than the built-in!  Verify this is on-board. */
-                if ((inb(hp_port) & 0xc0) == 0x80
-                        && ioaddr_table[inb(hp_port) & 3] == ioaddr)
+                if ((inb(hp_port) & 0xc0) == 0x80 &&
+                    ioaddr_table[inb(hp_port) & 3] == ioaddr)
                         hp_builtin = hp_port;
         }
         iounmap(bios);
         /* We also recognize the HP Vectra on-board here, but check below. */
-        hpJ2405A = (inb(ioaddr) == 0x08 && inb(ioaddr+1) == 0x00
-                                && inb(ioaddr+2) == 0x09);
+        hpJ2405A = (inb(ioaddr) == 0x08 && inb(ioaddr+1) == 0x00 &&
+                    inb(ioaddr+2) == 0x09);
 
         /* Reset the LANCE.      */
         reset_val = inw(ioaddr+LANCE_RESET); /* Reset the LANCE */
@@ -755,7 +755,7 @@ lance_open(struct net_device *dev)
         int i;
 
         if (dev->irq == 0 ||
-                request_irq(dev->irq, &lance_interrupt, 0, lp->name, dev)) {
+                request_irq(dev->irq, lance_interrupt, 0, lp->name, dev)) {
                 return -EAGAIN;
         }
 
@@ -1035,8 +1035,8 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
         spin_lock (&lp->devlock);
 
         outw(0x00, dev->base_addr + LANCE_ADDR);
-        while ((csr0 = inw(dev->base_addr + LANCE_DATA)) & 0x8600
-                   && --boguscnt >= 0) {
+        while ((csr0 = inw(dev->base_addr + LANCE_DATA)) & 0x8600 &&
+               --boguscnt >= 0) {
                 /* Acknowledge all of the current interrupt sources ASAP. */
                 outw(csr0 & ~0x004f, dev->base_addr + LANCE_DATA);
 
@@ -1288,7 +1288,7 @@ static void set_multicast_list(struct net_device *dev)
         } else {
                 short multicast_table[4];
                 int i;
-                int num_addrs=dev->mc_count;
+                int num_addrs=netdev_mc_count(dev);
                 if(dev->flags&IFF_ALLMULTI)
                         num_addrs=1;
                 /* FIXIT: We don't use the multicast table, but rely on upper-layer filtering. */