Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 641a10d2e843..7a567201e829 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -73,7 +73,6 @@ static int rx_copybreak;
 #include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
@@ -167,7 +166,7 @@ static const struct epic_chip_info pci_id_tbl[] = {
 };
 
 
-static struct pci_device_id epic_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(epic_pci_tbl) = {
         { 0x10B8, 0x0005, 0x1092, 0x0AB4, 0, 0, SMSC_83C170_0 },
         { 0x10B8, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMSC_83C170 },
         { 0x10B8, 0x0006, PCI_ANY_ID, PCI_ANY_ID,
@@ -630,8 +629,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
                 barrier();
                 if ((inl(ioaddr + MIICtrl) & MII_READOP) == 0) {
                         /* Work around read failure bug. */
-                        if (phy_id == 1 && location < 6
-                                && inw(ioaddr + MIIData) == 0xffff) {
+                        if (phy_id == 1 && location < 6 &&
+                            inw(ioaddr + MIIData) == 0xffff) {
                                 outl(read_cmd, ioaddr + MIICtrl);
                                 continue;
                         }
@@ -668,7 +667,7 @@ static int epic_open(struct net_device *dev)
         outl(0x4001, ioaddr + GENCTL);
 
         napi_enable(&ep->napi);
-        if ((retval = request_irq(dev->irq, &epic_interrupt, IRQF_SHARED, dev->name, dev))) {
+        if ((retval = request_irq(dev->irq, epic_interrupt, IRQF_SHARED, dev->name, dev))) {
                 napi_disable(&ep->napi);
                 return retval;
         }
@@ -1205,8 +1204,8 @@ static int epic_rx(struct net_device *dev, int budget)
                         }
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
-                        if (pkt_len < rx_copybreak
-                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                        if (pkt_len < rx_copybreak &&
+                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(ep->pci_dev,
                                                             ep->rx_ring[entry].bufaddr,
@@ -1390,21 +1389,20 @@ static void set_rx_mode(struct net_device *dev)
                 outl(0x002C, ioaddr + RxCtrl);
                 /* Unconditionally log net taps. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
-        } else if ((dev->mc_count > 0)  ||  (dev->flags & IFF_ALLMULTI)) {
+        } else if ((!netdev_mc_empty(dev)) || (dev->flags & IFF_ALLMULTI)) {
                 /* There is apparently a chip bug, so the multicast filter
                    is never enabled. */
                 /* Too many to filter perfectly -- accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 outl(0x000C, ioaddr + RxCtrl);
-        } else if (dev->mc_count == 0) {
+        } else if (netdev_mc_empty(dev)) {
                 outl(0x0004, ioaddr + RxCtrl);
                 return;
         } else {                                        /* Never executed, for now. */
                 struct dev_mc_list *mclist;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                         i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         unsigned int bit_nr =
                                 ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x3f;
                         mc_filter[bit_nr >> 3] |= (1 << bit_nr);