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

1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index e13685a570f4..8249a394a4e1 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -84,7 +84,6 @@ static char *media[MAX_UNITS];
 #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/netdevice.h>
@@ -206,7 +205,7 @@ IVc. Errata
 #define USE_IO_OPS 1
 #endif
 
-static const struct pci_device_id sundance_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(sundance_pci_tbl) = {
         { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },
         { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },
         { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
@@ -603,8 +602,8 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
                             strcmp (media[card_idx], "4") == 0) {
                                 np->speed = 100;
                                 np->mii_if.full_duplex = 1;
-                        } else if (strcmp (media[card_idx], "100mbps_hd") == 0
-                                   || strcmp (media[card_idx], "3") == 0) {
+                        } else if (strcmp (media[card_idx], "100mbps_hd") == 0 ||
+                                   strcmp (media[card_idx], "3") == 0) {
                                 np->speed = 100;
                                 np->mii_if.full_duplex = 0;
                         } else if (strcmp (media[card_idx], "10mbps_fd") == 0 ||
@@ -819,7 +818,7 @@ static int netdev_open(struct net_device *dev)
 
         /* Do we need to reset the chip??? */
 
-        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+        i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (i)
                 return i;
 
@@ -1079,8 +1078,8 @@ start_tx (struct sk_buff *skb, struct net_device *dev)
         tasklet_schedule(&np->tx_tasklet);
 
         /* On some architectures: explicitly flush cache lines here. */
-        if (np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 1
-                        && !netif_queue_stopped(dev)) {
+        if (np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 1 &&
+            !netif_queue_stopped(dev)) {
                 /* do nothing */
         } else {
                 netif_stop_queue (dev);
@@ -1336,8 +1335,8 @@ static void rx_poll(unsigned long data)
 #endif
                         /* 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(np->pci_dev,
                                                             le32_to_cpu(desc->frag[0].addr),
@@ -1517,19 +1516,18 @@ static void set_rx_mode(struct net_device *dev)
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys;
-        } else if ((dev->mc_count > multicast_filter_limit)
-                           ||  (dev->flags & IFF_ALLMULTI)) {
+        } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to match, or accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
-        } else if (dev->mc_count) {
+        } else if (!netdev_mc_empty(dev)) {
                 struct dev_mc_list *mclist;
                 int bit;
                 int index;
                 int crc;
                 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) {
                         crc = ether_crc_le (ETH_ALEN, mclist->dmi_addr);
                         for (index=0, bit=0; bit < 6; bit++, crc <<= 1)
                                 if (crc & 0x80000000) index |= 1 << bit;