Merge branch 'linux-2.6' into for-2.6.22

[sfrench/cifs-2.6.git] / drivers / net / 3c505.c

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 19c0b856c488097494f69c27ff14e2c3f615deeb..e985a85a56237b6bccb13ac689a92e061ff418d1 100644 (file)
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -315,11 +315,11 @@ static inline void check_3c505_dma(struct net_device *dev)
                spin_lock_irqsave(&adapter->lock, flags);
                adapter->dmaing = 0;
                adapter->busy = 0;
-               
+
                f=claim_dma_lock();
                disable_dma(dev->dma);
                release_dma_lock(f);
-               
+
                if (adapter->rx_active)
                        adapter->rx_active--;
                outb_control(adapter->hcr_val & ~(DMAE | TCEN | DIR), dev);
@@ -615,7 +615,6 @@ static void receive_packet(struct net_device *dev, int len)
        if (test_and_set_bit(0, (void *) &adapter->dmaing))
                printk(KERN_ERR "%s: rx blocked, DMA in progress, dir %d\n", dev->name, adapter->current_dma.direction);
 
-       skb->dev = dev;
        adapter->current_dma.direction = 0;
        adapter->current_dma.length = rlen;
        adapter->current_dma.skb = skb;
@@ -649,7 +648,7 @@ static void receive_packet(struct net_device *dev, int len)
  *
  ******************************************************/
 
-static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
+static irqreturn_t elp_interrupt(int irq, void *dev_id)
 {
        int len;
        int dlen;
@@ -660,7 +659,7 @@ static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
 
        dev = dev_id;
        adapter = (elp_device *) dev->priv;
-       
+
        spin_lock(&adapter->lock);
 
        do {
@@ -712,7 +711,7 @@ static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
                timeout = jiffies + 3*HZ/100;
                while ((inb_status(dev->base_addr) & ACRF) != 0 && time_before(jiffies, timeout)) {
                        if (receive_pcb(dev, &adapter->irx_pcb)) {
-                               switch (adapter->irx_pcb.command) 
+                               switch (adapter->irx_pcb.command)
                                {
                                case 0:
                                        break;
@@ -889,7 +888,7 @@ static int elp_open(struct net_device *dev)
        adapter->send_pcb_semaphore = 0;
        adapter->rx_backlog.in = 0;
        adapter->rx_backlog.out = 0;
-       
+
        spin_lock_init(&adapter->lock);
 
        /*
@@ -1003,7 +1002,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
        }
 
        adapter->stats.tx_bytes += nlen;
-       
+
        /*
         * send the adapter a transmit packet command. Ignore segment and offset
         * and make sure the length is even
@@ -1026,7 +1025,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
        adapter->current_dma.start_time = jiffies;
 
        if ((unsigned long)(skb->data + nlen) >= MAX_DMA_ADDRESS || nlen != skb->len) {
-               memcpy(adapter->dma_buffer, skb->data, nlen);
+               skb_copy_from_linear_data(skb, adapter->dma_buffer, nlen);
                memset(adapter->dma_buffer+skb->len, 0, nlen-skb->len);
                target = isa_virt_to_bus(adapter->dma_buffer);
        }
@@ -1044,7 +1043,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
        outb_control(adapter->hcr_val | DMAE | TCEN, dev);
        enable_dma(dev->dma);
        release_dma_lock(flags);
-       
+
        if (elp_debug >= 3)
                printk(KERN_DEBUG "%s: DMA transfer started\n", dev->name);
 
@@ -1054,7 +1053,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
 /*
  *     The upper layer thinks we timed out
  */
- 
+
 static void elp_timeout(struct net_device *dev)
 {
        elp_device *adapter = dev->priv;
@@ -1080,7 +1079,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        unsigned long flags;
        elp_device *adapter = dev->priv;
-       
+
        spin_lock_irqsave(&adapter->lock, flags);
        check_3c505_dma(dev);
 
@@ -1088,7 +1087,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
                printk(KERN_DEBUG "%s: request to send packet of length %d\n", dev->name, (int) skb->len);
 
        netif_stop_queue(dev);
-       
+
        /*
         * send the packet at skb->data for skb->len
         */
@@ -1169,7 +1168,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
        debug = level;
 }
 
-static struct ethtool_ops netdev_ethtool_ops = {
+static const struct ethtool_ops netdev_ethtool_ops = {
        .get_drvinfo            = netdev_get_drvinfo,
        .get_msglevel           = netdev_get_msglevel,
        .set_msglevel           = netdev_set_msglevel,
@@ -1235,7 +1234,7 @@ static void elp_set_mc_list(struct net_device *dev)
                printk(KERN_DEBUG "%s: request to set multicast list\n", dev->name);
 
        spin_lock_irqsave(&adapter->lock, flags);
-       
+
        if (!(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) {
                /* send a "load multicast list" command to the board, max 10 addrs/cmd */
                /* if num_addrs==0 the list will be cleared */
@@ -1670,7 +1669,7 @@ int __init init_module(void)
        return 0;
 }
 
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;