1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 0f405ef51858..6dfa69899019 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1825,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 < netdev_mc_count(dev);
-                     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;