qlcnic: change adapter name display

[safe/jmp/linux-2.6] / drivers / net / depca.c

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 357f565..bf66e9b 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -237,6 +237,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
@@ -516,7 +517,8 @@ struct depca_private {
 ** Public Functions
 */
 static int depca_open(struct net_device *dev);
-static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t depca_start_xmit(struct sk_buff *skb,
+                                   struct net_device *dev);
 static irqreturn_t depca_interrupt(int irq, void *dev_id);
 static int depca_close(struct net_device *dev);
 static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -810,7 +812,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
 
        dev->mem_start = 0;
 
-       device->driver_data = dev;
+       dev_set_drvdata(device, dev);
        SET_NETDEV_DEV (dev, device);
 
        status = register_netdev(dev);
@@ -847,7 +849,7 @@ static int depca_open(struct net_device *dev)
 
        depca_dbg_open(dev);
 
-       if (request_irq(dev->irq, &depca_interrupt, 0, lp->adapter_name, dev)) {
+       if (request_irq(dev->irq, depca_interrupt, 0, lp->adapter_name, dev)) {
                printk("depca_open(): Requested IRQ%d is busy\n", dev->irq);
                status = -EAGAIN;
        } else {
@@ -919,7 +921,7 @@ static void depca_tx_timeout(struct net_device *dev)
        STOP_DEPCA;
        depca_init_ring(dev);
        LoadCSRs(dev);
-       dev->trans_start = jiffies;
+       dev->trans_start = jiffies; /* prevent tx timeout */
        netif_wake_queue(dev);
        InitRestartDepca(dev);
 }
@@ -928,7 +930,8 @@ static void depca_tx_timeout(struct net_device *dev)
 /*
 ** Writes a socket buffer to TX descriptor ring and starts transmission
 */
-static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t depca_start_xmit(struct sk_buff *skb,
+                                   struct net_device *dev)
 {
        struct depca_private *lp = netdev_priv(dev);
        u_long ioaddr = dev->base_addr;
@@ -951,13 +954,12 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        outw(CSR0, DEPCA_ADDR);
                        outw(INEA | TDMD, DEPCA_DATA);
 
-                       dev->trans_start = jiffies;
                        dev_kfree_skb(skb);
                }
                if (TX_BUFFS_AVAIL)
                        netif_start_queue(dev);
        } else
-               status = -1;
+               status = NETDEV_TX_LOCKED;
 
       out:
        return status;
@@ -1201,8 +1203,6 @@ static void LoadCSRs(struct net_device *dev)
        outw(ACON, DEPCA_DATA);
 
        outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */
-
-       return;
 }
 
 static int InitRestartDepca(struct net_device *dev)
@@ -1269,7 +1269,7 @@ static void set_multicast_list(struct net_device *dev)
 static void SetMulticastFilter(struct net_device *dev)
 {
        struct depca_private *lp = netdev_priv(dev);
-       struct dev_mc_list *dmi = dev->mc_list;
+       struct netdev_hw_addr *ha;
        char *addrs;
        int i, j, bit, byte;
        u16 hashcode;
@@ -1284,9 +1284,8 @@ static void SetMulticastFilter(struct net_device *dev)
                        lp->init_block.mcast_table[i] = 0;
                }
                /* Add multicast addresses */
-               for (i = 0; i < dev->mc_count; i++) {   /* for each address in the list */
-                       addrs = dmi->dmi_addr;
-                       dmi = dmi->next;
+               netdev_for_each_mc_addr(ha, dev) {
+                       addrs = ha->addr;
                        if ((*addrs & 0x01) == 1) {     /* multicast address? */
                                crc = ether_crc(ETH_ALEN, addrs);
                                hashcode = (crc & 1);   /* hashcode is 6 LSb of CRC ... */
@@ -1301,8 +1300,6 @@ static void SetMulticastFilter(struct net_device *dev)
                        }
                }
        }
-
-       return;
 }
 
 static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
@@ -1614,7 +1611,7 @@ static int __devexit depca_device_remove (struct device *device)
        struct depca_private *lp;
        int bus;
 
-       dev  = device->driver_data;
+       dev  = dev_get_drvdata(device);
        lp   = netdev_priv(dev);
 
        unregister_netdev (dev);
@@ -1793,7 +1790,7 @@ static int __init get_hw_addr(struct net_device *dev)
 static int load_packet(struct net_device *dev, struct sk_buff *skb)
 {
        struct depca_private *lp = netdev_priv(dev);
-       int i, entry, end, len, status = 0;
+       int i, entry, end, len, status = NETDEV_TX_OK;
 
        entry = lp->tx_new;     /* Ring around buffer number. */
        end = (entry + (skb->len - 1) / TX_BUFF_SZ) & lp->txRingMask;
@@ -1839,7 +1836,7 @@ static int load_packet(struct net_device *dev, struct sk_buff *skb)
 
                lp->tx_new = (++end) & lp->txRingMask;  /* update current pointers */
        } else {
-               status = -1;
+               status = NETDEV_TX_LOCKED;
        }
 
        return status;
@@ -1907,8 +1904,6 @@ static void depca_dbg_open(struct net_device *dev)
                outw(CSR3, DEPCA_ADDR);
                printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA));
        }
-
-       return;
 }
 
 /*