2 files changed, 8 insertions, 14 deletions

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 9f4cadf9f851..e95e8d09ff38 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -877,7 +877,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
         if (!mc_all_on) {
                 char *addrs;
                 int i;
-                struct dev_mc_list *mcaddr;
+                struct netdev_hw_addr *ha;
 
                 addrs = kmalloc(ETH_ALEN * mc_count, GFP_ATOMIC);
                 if (!addrs) {
@@ -885,9 +885,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
                         goto unlock;
                 }
                 i = 0;
-                netdev_for_each_mc_addr(mcaddr, netdev)
-                        memcpy(get_addr(addrs, i++),
-                               mcaddr->dmi_addr, ETH_ALEN);
+                netdev_for_each_mc_addr(ha, netdev)
+                        memcpy(get_addr(addrs, i++), ha->addr, ETH_ALEN);
 
                 perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW +
                                                 pft_entries_preallocated * 0x8;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index b166bb75753d..3871ac663554 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -768,11 +768,8 @@ void ipoib_mcast_dev_flush(struct net_device *dev)
         }
 }
 
-static int ipoib_mcast_addr_is_valid(const u8 *addr, unsigned int addrlen,
-                                     const u8 *broadcast)
+static int ipoib_mcast_addr_is_valid(const u8 *addr, const u8 *broadcast)
 {
-        if (addrlen != INFINIBAND_ALEN)
-                return 0;
         /* reserved QPN, prefix, scope */
         if (memcmp(addr, broadcast, 6))
                 return 0;
@@ -787,7 +784,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
         struct ipoib_dev_priv *priv =
                 container_of(work, struct ipoib_dev_priv, restart_task);
         struct net_device *dev = priv->dev;
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         struct ipoib_mcast *mcast, *tmcast;
         LIST_HEAD(remove_list);
         unsigned long flags;
@@ -812,15 +809,13 @@ void ipoib_mcast_restart_task(struct work_struct *work)
                 clear_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags);
 
         /* Mark all of the entries that are found or don't exist */
-        netdev_for_each_mc_addr(mclist, dev) {
+        netdev_for_each_mc_addr(ha, dev) {
                 union ib_gid mgid;
 
-                if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr,
-                                               mclist->dmi_addrlen,
-                                               dev->broadcast))
+                if (!ipoib_mcast_addr_is_valid(ha->addr, dev->broadcast))
                         continue;
 
-                memcpy(mgid.raw, mclist->dmi_addr + 4, sizeof mgid);
+                memcpy(mgid.raw, ha->addr + 4, sizeof mgid);
 
                 mcast = __ipoib_mcast_find(dev, &mgid);
                 if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {