ALSA: usb-audio: add support for Akai MPD16

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

diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index a07a597..300c224 100644 (file)
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -482,7 +482,7 @@ static void korina_multicast_list(struct net_device *dev)
 {
        struct korina_private *lp = netdev_priv(dev);
        unsigned long flags;
-       struct dev_mc_list *dmi = dev->mc_list;
+       struct dev_mc_list *dmi;
        u32 recognise = ETH_ARC_AB;     /* always accept broadcasts */
        int i;
 
@@ -490,23 +490,21 @@ static void korina_multicast_list(struct net_device *dev)
        if (dev->flags & IFF_PROMISC)
                recognise |= ETH_ARC_PRO;
 
-       else if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 4))
+       else if ((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 4))
                /* All multicast and broadcast */
                recognise |= ETH_ARC_AM;
 
        /* Build the hash table */
-       if (dev->mc_count > 4) {
+       if (netdev_mc_count(dev) > 4) {
                u16 hash_table[4];
                u32 crc;
 
                for (i = 0; i < 4; i++)
                        hash_table[i] = 0;
 
-               for (i = 0; i < dev->mc_count; i++) {
+               netdev_for_each_mc_addr(dmi, dev) {
                        char *addrs = dmi->dmi_addr;
 
-                       dmi = dmi->next;
-
                        if (!(*addrs & 1))
                                continue;
 
@@ -1014,14 +1012,14 @@ static int korina_open(struct net_device *dev)
        /* Install the interrupt handler
         * that handles the Done Finished
         * Ovr and Und Events */
-       ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,
+       ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt,
                        IRQF_DISABLED, "Korina ethernet Rx", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n",
                    dev->name, lp->rx_irq);
                goto err_release;
        }
-       ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt,
+       ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt,
                        IRQF_DISABLED, "Korina ethernet Tx", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n",
@@ -1030,7 +1028,7 @@ static int korina_open(struct net_device *dev)
        }
 
        /* Install handler for overrun error. */
-       ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,
+       ret = request_irq(lp->ovr_irq, korina_ovr_interrupt,
                        IRQF_DISABLED, "Ethernet Overflow", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get OVR IRQ %d\n",
@@ -1039,7 +1037,7 @@ static int korina_open(struct net_device *dev)
        }
 
        /* Install handler for underflow error. */
-       ret = request_irq(lp->und_irq, &korina_und_interrupt,
+       ret = request_irq(lp->und_irq, korina_und_interrupt,
                        IRQF_DISABLED, "Ethernet Underflow", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get UND IRQ %d\n",