net: convert multicast list to list_head

Converts the list and the core manipulating with it to be the same as uc_list.

+uses two functions for adding/removing mc address (normal and "global"
 variant) instead of a function parameter.
+removes dev_mcast.c completely.
+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for
 manipulation with lists on a sandbox (used in bonding and 80211 drivers)

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 91fdde382e82..ce9ef6bc865c 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -876,7 +876,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) {
@@ -884,9 +884,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 19eba3c877cb..c8a0f7dab5b0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -783,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;
@@ -808,14 +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,
-                                               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)) {