mlx4_core: Support ICM tables in coherent memory

[pandora-kernel.git] / drivers / net / smc-ultra32.c

diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 85be22a..88a30e5 100644 (file)
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -74,7 +74,7 @@ static void ultra32_block_output(struct net_device *dev, int count,
                                 const unsigned char *buf,
                                 const int start_page);
 static int ultra32_close(struct net_device *dev);
-\f
+
 #define ULTRA32_CMDREG 0       /* Offset to ASIC command register. */
 #define         ULTRA32_RESET  0x80    /* Board reset, in ULTRA32_CMDREG. */
 #define         ULTRA32_MEMENB 0x40    /* Enable the shared memory. */
@@ -314,7 +314,7 @@ static int ultra32_close(struct net_device *dev)
        int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* CMDREG */
 
        netif_stop_queue(dev);
-       
+
        if (ei_debug > 1)
                printk("%s: Shutting down ethercard.\n", dev->name);
 
@@ -395,8 +395,7 @@ static void ultra32_block_input(struct net_device *dev,
                        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, xfer_start, count, 0);
+               memcpy_fromio(skb->data, xfer_start, count);
        }
 }
 
@@ -413,7 +412,7 @@ static void ultra32_block_output(struct net_device *dev,
 
        memcpy_toio(xfer_start, buf, count);
 }
-\f
+
 #ifdef MODULE
 #define MAX_ULTRA32_CARDS   4  /* Max number of Ultra cards per module */
 static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
@@ -437,7 +436,7 @@ int __init init_module(void)
        return -ENXIO;
 }
 
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;