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

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index c072f7f36acf..cc0c731c4f09 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -106,7 +106,7 @@ static const char * card_names[] = {
         "SiS 900 PCI Fast Ethernet",
         "SiS 7016 PCI Fast Ethernet"
 };
-static struct pci_device_id sis900_pci_tbl [] = {
+static DEFINE_PCI_DEVICE_TABLE(sis900_pci_tbl) = {
         {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_900},
         {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016,
@@ -1016,7 +1016,7 @@ sis900_open(struct net_device *net_dev)
         /* Equalizer workaround Rule */
         sis630_set_eq(net_dev, sis_priv->chipset_rev);
 
-        ret = request_irq(net_dev->irq, &sis900_interrupt, IRQF_SHARED,
+        ret = request_irq(net_dev->irq, sis900_interrupt, IRQF_SHARED,
                                                 net_dev->name, net_dev);
         if (ret)
                 return ret;
@@ -1760,7 +1760,7 @@ static int sis900_rx(struct net_device *net_dev)
                                 sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE,
                                 PCI_DMA_FROMDEVICE);
 
-                        /* refill the Rx buffer, what if there is not enought
+                        /* refill the Rx buffer, what if there is not enough
                          * memory for new socket buffer ?? */
                         if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
                                 /*
@@ -1775,7 +1775,7 @@ static int sis900_rx(struct net_device *net_dev)
                         }
 
                         /* This situation should never happen, but due to
-                           some unknow bugs, it is possible that
+                           some unknown bugs, it is possible that
                            we are working on NULL sk_buff :-( */
                         if (sis_priv->rx_skbuff[entry] == NULL) {
                                 if (netif_msg_rx_err(sis_priv))
@@ -2288,7 +2288,7 @@ static void set_rx_mode(struct net_device *net_dev)
                 rx_mode = RFPromiscuous;
                 for (i = 0; i < table_entries; i++)
                         mc_filter[i] = 0xffff;
-        } else if ((net_dev->mc_count > multicast_filter_limit) ||
+        } else if ((netdev_mc_count(net_dev) > multicast_filter_limit) ||
                    (net_dev->flags & IFF_ALLMULTI)) {
                 /* too many multicast addresses or accept all multicast packet */
                 rx_mode = RFAAB | RFAAM;
@@ -2300,9 +2300,8 @@ static void set_rx_mode(struct net_device *net_dev)
                  * packets */
                 struct dev_mc_list *mclist;
                 rx_mode = RFAAB;
-                for (i = 0, mclist = net_dev->mc_list;
-                        mclist && i < net_dev->mc_count;
-                        i++, mclist = mclist->next) {
+
+                netdev_for_each_mc_addr(mclist, net_dev) {
                         unsigned int bit_nr =
                                 sis900_mcast_bitnr(mclist->dmi_addr, sis_priv->chipset_rev);
                         mc_filter[bit_nr >> 4] |= (1 << (bit_nr & 0xf));