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

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 406f06424251..598b007f1991 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -20,6 +20,7 @@
 #include <linux/crc32.h>
 #include <linux/bitrev.h>
 #include <linux/ethtool.h>
+#include <linux/slab.h>
 #include <asm/prom.h>
 #include <asm/dbdma.h>
 #include <asm/io.h>
@@ -438,8 +439,8 @@ bmac_init_phy(struct net_device *dev)
 
                 ctrl = bmac_mif_read(dev, 0);
                 capable = ((bmac_mif_read(dev, 1) & 0xf800) >> 6) | 1;
-                if (bmac_mif_read(dev, 4) != capable
-                    || (ctrl & 0x1000) == 0) {
+                if (bmac_mif_read(dev, 4) != capable ||
+                    (ctrl & 0x1000) == 0) {
                         bmac_mif_write(dev, 4, capable);
                         bmac_mif_write(dev, 0, 0x1200);
                 } else
@@ -973,7 +974,7 @@ static void bmac_set_multicast(struct net_device *dev)
 {
         struct dev_mc_list *dmi;
         struct bmac_data *bp = netdev_priv(dev);
-        int num_addrs = dev->mc_count;
+        int num_addrs = netdev_mc_count(dev);
         unsigned short rx_cfg;
         int i;
 
@@ -982,7 +983,7 @@ static void bmac_set_multicast(struct net_device *dev)
 
         XXDEBUG(("bmac: enter bmac_set_multicast, n_addrs=%d\n", num_addrs));
 
-        if((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 64)) {
+        if((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 64)) {
                 for (i=0; i<4; i++) bp->hash_table_mask[i] = 0xffff;
                 bmac_update_hash_table_mask(dev, bp);
                 rx_cfg = bmac_rx_on(dev, 1, 0);
@@ -1000,7 +1001,7 @@ static void bmac_set_multicast(struct net_device *dev)
                         rx_cfg = bmac_rx_on(dev, 0, 0);
                         XXDEBUG(("bmac: multi disabled, rx_cfg=%#08x\n", rx_cfg));
                 } else {
-                        for (dmi=dev->mc_list; dmi!=NULL; dmi=dmi->next)
+                        netdev_for_each_mc_addr(dmi, dev)
                                 bmac_addhash(bp, dmi->dmi_addr);
                         bmac_update_hash_table_mask(dev, bp);
                         rx_cfg = bmac_rx_on(dev, 1, 0);
@@ -1015,13 +1016,13 @@ static void bmac_set_multicast(struct net_device *dev)
 
 static void bmac_set_multicast(struct net_device *dev)
 {
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         char *addrs;
         int i;
         unsigned short rx_cfg;
         u32 crc;
 
-        if((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 64)) {
+        if((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 64)) {
                 bmwrite(dev, BHASH0, 0xffff);
                 bmwrite(dev, BHASH1, 0xffff);
                 bmwrite(dev, BHASH2, 0xffff);
@@ -1039,9 +1040,8 @@ static void bmac_set_multicast(struct net_device *dev)
 
                 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) {
                         addrs = dmi->dmi_addr;
-                        dmi = dmi->next;
 
                         if(!(*addrs & 1))
                                 continue;