1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index a4cff23dcdf9..cb429723b2c8 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -677,18 +677,17 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
         memset(hash_table, 0, sizeof(hash_table));
         set_bit_le(255, hash_table);                    /* Broadcast entry */
         /* This should work on big-endian machines as well. */
-        for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
-             i++, mclist = mclist->next) {
+        netdev_for_each_mc_addr(mclist, dev) {
                 int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff;
 
                 set_bit_le(index, hash_table);
+        }
 
-                for (i = 0; i < 32; i++) {
-                        *setup_frm++ = hash_table[i];
-                        *setup_frm++ = hash_table[i];
-                }
-                setup_frm = &de->setup_frame[13*6];
+        for (i = 0; i < 32; i++) {
+                *setup_frm++ = hash_table[i];
+                *setup_frm++ = hash_table[i];
         }
+        setup_frm = &de->setup_frame[13*6];
 
         /* Fill the final entry with our physical address. */
         eaddrs = (u16 *)dev->dev_addr;
@@ -701,20 +700,18 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
         struct dev_mc_list *mclist;
-        int i;
         u16 *eaddrs;
 
         /* We have <= 14 addresses so we can use the wonderful
            16 address perfect filtering of the Tulip. */
-        for (i = 0, mclist = dev->mc_list; i < netdev_mc_count(dev);
-             i++, mclist = mclist->next) {
+        netdev_for_each_mc_addr(mclist, dev) {
                 eaddrs = (u16 *)mclist->dmi_addr;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
         }
         /* Fill the unused entries with the broadcast address. */
-        memset(setup_frm, 0xff, (15-i)*12);
+        memset(setup_frm, 0xff, (15 - netdev_mc_count(dev)) * 12);
         setup_frm = &de->setup_frame[15*6];
 
         /* Fill the final entry with our physical address. */