net: convert multiple drivers to use netdev_for_each_mc_addr, part3

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

3 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index ee16b374e02c..c8a2bacb1d13 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1134,8 +1134,7 @@ err:
  * (mc == NULL) => multicast promiscous
  */
 int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
-                struct dev_mc_list *mc_list, u32 mc_count,
-                struct be_dma_mem *mem)
+                struct net_device *netdev, struct be_dma_mem *mem)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_mcast_mac_config *req = mem->va;
@@ -1162,13 +1161,14 @@ int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
                 OPCODE_COMMON_NTWK_MULTICAST_SET, sizeof(*req));
 
         req->interface_id = if_id;
-        if (mc_list) {
+        if (netdev) {
                 int i;
                 struct dev_mc_list *mc;
 
-                req->num_mac = cpu_to_le16(mc_count);
+                req->num_mac = cpu_to_le16(netdev_mc_count(netdev));
 
-                for (mc = mc_list, i = 0; mc; mc = mc->next, i++)
+                i = 0;
+                netdev_for_each_mc_addr(mc, netdev)
                         memcpy(req->mac[i].byte, mc->dmi_addr, ETH_ALEN);
         } else {
                 req->promiscuous = 1;
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 3464924d6c28..728b0d736929 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -912,8 +912,7 @@ extern int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id,
 extern int be_cmd_promiscuous_config(struct be_adapter *adapter,
                         u8 port_num, bool en);
 extern int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
-                        struct dev_mc_list *mc_list, u32 mc_count,
-                        struct be_dma_mem *mem);
+                        struct net_device *netdev, struct be_dma_mem *mem);
 extern int be_cmd_set_flow_control(struct be_adapter *adapter,
                         u32 tx_fc, u32 rx_fc);
 extern int be_cmd_get_flow_control(struct be_adapter *adapter,
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index de0830e14aa5..27ccdd80257b 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -577,13 +577,13 @@ static void be_set_multicast_list(struct net_device *netdev)
         /* Enable multicast promisc if num configured exceeds what we support */
         if (netdev->flags & IFF_ALLMULTI ||
             netdev_mc_count(netdev) > BE_MAX_MC) {
-                be_cmd_multicast_set(adapter, adapter->if_handle, NULL, 0,
+                be_cmd_multicast_set(adapter, adapter->if_handle, NULL,
                                 &adapter->mc_cmd_mem);
                 goto done;
         }
 
-        be_cmd_multicast_set(adapter, adapter->if_handle, netdev->mc_list,
-                netdev_mc_count(netdev), &adapter->mc_cmd_mem);
+        be_cmd_multicast_set(adapter, adapter->if_handle, netdev,
+                        &adapter->mc_cmd_mem);
 done:
         return;
 }