Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / wireless / ath / ar9170 / main.c

diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index c53692980990153ca3b05562978cb3d010d6d215..7c4a7d84535cfb902a0b8a92b2d8b3d094c1340e 100644 (file)
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -2046,21 +2046,17 @@ out:
        return err;
 }
 
-static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
-                                      struct dev_addr_list *mclist)
+static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw,
+                                      struct netdev_hw_addr_list *mc_list)
 {
        u64 mchash;
-       int i;
+       struct netdev_hw_addr *ha;
 
        /* always get broadcast frames */
        mchash = 1ULL << (0xff >> 2);
 
-       for (i = 0; i < mc_count; i++) {
-               if (WARN_ON(!mclist))
-                       break;
-               mchash |= 1ULL << (mclist->dmi_addr[5] >> 2);
-               mclist = mclist->next;
-       }
+       netdev_hw_addr_list_for_each(ha, mc_list)
+               mchash |= 1ULL << (ha->addr[5] >> 2);
 
        return mchash;
 }