1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index d41ea27be5e1..c8a0f7dab5b0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -767,11 +767,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;
@@ -786,7 +783,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;
@@ -811,15 +808,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)) {