Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / net / ac3200.c

diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index c01f87f5bed77b4f6d93cb5cf013a73f6f9e7122..5136d94923aa3910e0007982dd7893c493e2fd62 100644 (file)
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -103,8 +103,6 @@ static int __init do_ac3200_probe(struct net_device *dev)
        int irq = dev->irq;
        int mem_start = dev->mem_start;
 
-       SET_MODULE_OWNER(dev);
-
        if (ioaddr > 0x1ff)             /* Check a single specified location. */
                return ac_probe1(ioaddr, dev);
        else if (ioaddr > 0)            /* Don't probe at all. */
@@ -148,6 +146,7 @@ out:
 static int __init ac_probe1(int ioaddr, struct net_device *dev)
 {
        int i, retval;
+       DECLARE_MAC_BUF(mac);
 
        if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
                return -EBUSY;
@@ -169,10 +168,11 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
                   inb(ioaddr + AC_ID_PORT + 2), inb(ioaddr + AC_ID_PORT + 3));
 #endif
 
-       printk("AC3200 in EISA slot %d, node", ioaddr/0x1000);
-       for(i = 0; i < 6; i++)
-               printk(" %02x", dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i));
+       for (i = 0; i < 6; i++)
+               dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
 
+       printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s",
+              ioaddr/0x1000, print_mac(mac, dev->dev_addr));
 #if 0
        /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
        if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0
@@ -327,8 +327,7 @@ static void ac_block_input(struct net_device *dev, int count, struct sk_buff *sk
                memcpy_fromio(skb->data + semi_count,
                                ei_status.mem + TX_PAGES*256, count);
        } else {
-               /* Packet is in one chunk -- we can copy + cksum. */
-               eth_io_copy_and_sum(skb, start, count, 0);
+               memcpy_fromio(skb->data, start, count);
        }
 }