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

1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index a36e2b51e88c..6dfa69899019 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -301,7 +301,7 @@ enum chipset {
         CH_6915 = 0,
 };
 
-static struct pci_device_id starfire_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(starfire_pci_tbl) = {
         { 0x9004, 0x6915, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_6915 },
         { 0, }
 };
@@ -928,7 +928,7 @@ static int netdev_open(struct net_device *dev)
 
         /* Do we ever need to reset the chip??? */
 
-        retval = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+        retval = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -1063,7 +1063,7 @@ static int netdev_open(struct net_device *dev)
         if (retval) {
                 printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n",
                        FIRMWARE_RX);
-                return retval;
+                goto out_init;
         }
         if (fw_rx->size % 4) {
                 printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n",
@@ -1108,6 +1108,9 @@ out_tx:
         release_firmware(fw_tx);
 out_rx:
         release_firmware(fw_rx);
+out_init:
+        if (retval)
+                netdev_close(dev);
         return retval;
 }
 
@@ -1482,8 +1485,8 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                         printk(KERN_DEBUG "  netdev_rx() normal Rx pkt length %d, quota %d.\n", pkt_len, *quota);
                 /* 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,
                                                     np->rx_info[entry].mapping,
@@ -1793,22 +1796,22 @@ static void set_rx_mode(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
                 rx_mode |= AcceptAll;
-        } 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. */
                 rx_mode |= AcceptBroadcast|AcceptAllMulticast|PerfectFilter;
-        } else if (dev->mc_count <= 14) {
+        } else if (netdev_mc_count(dev) <= 14) {
                 /* Use the 16 element perfect filter, skip first two entries. */
                 void __iomem *filter_addr = ioaddr + PerfFilterTable + 2 * 16;
                 __be16 *eaddrs;
-                for (i = 2, mclist = dev->mc_list; mclist && i < dev->mc_count + 2;
-                     i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         eaddrs = (__be16 *)mclist->dmi_addr;
                         writew(be16_to_cpu(eaddrs[2]), filter_addr); filter_addr += 4;
                         writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;
                         writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 8;
                 }
                 eaddrs = (__be16 *)dev->dev_addr;
+                i = netdev_mc_count(dev) + 2;
                 while (i++ < 16) {
                         writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 4;
                         writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;
@@ -1822,8 +1825,7 @@ static void set_rx_mode(struct net_device *dev)
                 __le16 mc_filter[32] __attribute__ ((aligned(sizeof(long))));   /* Multicast hash filter */
 
                 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) {
                         /* The chip uses the upper 9 CRC bits
                            as index into the hash table */
                         int bit_nr = ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 23;