6 files changed, 18 insertions, 42 deletions

diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index b405a00817c6..f894bb633040 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1269,7 +1269,7 @@ s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw)
         }
         if (i >= IXGBE_FDIRCMD_CMD_POLL) {
                 hw_dbg(hw ,"Flow Director previous command isn't complete, "
-                       "aborting table re-initialization. \n");
+                       "aborting table re-initialization.\n");
                 return IXGBE_ERR_FDIR_REINIT_FAILED;
         }
 
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index eb49020903c1..6eb5814ca7da 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1484,26 +1484,24 @@ static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)
 /**
  *  ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses
  *  @hw: pointer to hardware structure
- *  @mc_addr_list: the list of new multicast addresses
- *  @mc_addr_count: number of addresses
- *  @next: iterator function to walk the multicast address list
+ *  @netdev: pointer to net device structure
  *
  *  The given list replaces any existing list. Clears the MC addrs from receive
  *  address registers and the multicast table. Uses unused receive address
  *  registers for the first multicast addresses, and hashes the rest into the
  *  multicast table.
  **/
-s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,
-                                      u32 mc_addr_count, ixgbe_mc_addr_itr next)
+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
+                                      struct net_device *netdev)
 {
+        struct netdev_hw_addr *ha;
         u32 i;
-        u32 vmdq;
 
         /*
          * Set the new number of MC addresses that we are being requested to
          * use.
          */
-        hw->addr_ctrl.num_mc_addrs = mc_addr_count;
+        hw->addr_ctrl.num_mc_addrs = netdev_mc_count(netdev);
         hw->addr_ctrl.mta_in_use = 0;
 
         /* Clear the MTA */
@@ -1512,9 +1510,9 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,
                 IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);
 
         /* Add the new addresses */
-        for (i = 0; i < mc_addr_count; i++) {
+        netdev_for_each_mc_addr(ha, netdev) {
                 hw_dbg(hw, " Adding the multicast addresses:\n");
-                ixgbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq));
+                ixgbe_set_mta(hw, ha->addr);
         }
 
         /* Enable mta */
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 13606d4809c9..264eef575cd6 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -56,9 +56,8 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
                           u32 enable_addr);
 s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);
 s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);
-s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,
-                                      u32 mc_addr_count,
-                                      ixgbe_mc_addr_itr func);
+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
+                                      struct net_device *netdev);
 s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw,
                                       struct net_device *netdev);
 s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 0c553f6cb534..7216db218442 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2537,21 +2537,6 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
         }
 }
 
-static u8 *ixgbe_addr_list_itr(struct ixgbe_hw *hw, u8 **mc_addr_ptr, u32 *vmdq)
-{
-        struct dev_mc_list *mc_ptr;
-        u8 *addr = *mc_addr_ptr;
-        *vmdq = 0;
-
-        mc_ptr = container_of(addr, struct dev_mc_list, dmi_addr[0]);
-        if (mc_ptr->next)
-                *mc_addr_ptr = mc_ptr->next->dmi_addr;
-        else
-                *mc_addr_ptr = NULL;
-
-        return addr;
-}
-
 /**
  * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set
  * @netdev: network interface device structure
@@ -2566,8 +2551,6 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
         u32 fctrl, vlnctrl;
-        u8 *addr_list = NULL;
-        int addr_count = 0;
 
         /* Check for Promiscuous and All Multicast modes */
 
@@ -2596,11 +2579,8 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
         hw->mac.ops.update_uc_addr_list(hw, netdev);
 
         /* reprogram multicast list */
-        addr_count = netdev_mc_count(netdev);
-        if (addr_count)
-                addr_list = netdev->mc_list->dmi_addr;
-        hw->mac.ops.update_mc_addr_list(hw, addr_list, addr_count,
-                                        ixgbe_addr_list_itr);
+        hw->mac.ops.update_mc_addr_list(hw, netdev);
+
         if (adapter->num_vfs)
                 ixgbe_restore_vf_multicasts(adapter);
 }
@@ -3470,12 +3450,12 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
                 adapter->num_tx_queues = 1;
 #ifdef CONFIG_IXGBE_DCB
                 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with DCB \n");
+                        DPRINTK(PROBE, INFO, "FCoE enabled with DCB\n");
                         ixgbe_set_dcb_queues(adapter);
                 }
 #endif
                 if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with RSS \n");
+                        DPRINTK(PROBE, INFO, "FCoE enabled with RSS\n");
                         if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ||
                             (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
                                 ixgbe_set_fdir_queues(adapter);
@@ -5091,7 +5071,7 @@ static void ixgbe_fdir_reinit_task(struct work_struct *work)
                                 &(adapter->tx_ring[i]->reinit_state));
         } else {
                 DPRINTK(PROBE, ERR, "failed to finish FDIR re-initialization, "
-                        "ignored adding FDIR ATR filters \n");
+                        "ignored adding FDIR ATR filters\n");
         }
         /* Done FDIR Re-initialization, enable transmits */
         netif_tx_start_all_queues(adapter->netdev);
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index 1c1efd386956..d6d5b843d625 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -475,7 +475,7 @@ s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw)
                         msleep(edata);
                         break;
                 case IXGBE_DATA_NL:
-                        hw_dbg(hw, "DATA:  \n");
+                        hw_dbg(hw, "DATA:\n");
                         data_offset++;
                         hw->eeprom.ops.read(hw, data_offset++,
                                             &phy_offset);
@@ -491,7 +491,7 @@ s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw)
                         break;
                 case IXGBE_CONTROL_NL:
                         data_offset++;
-                        hw_dbg(hw, "CONTROL: \n");
+                        hw_dbg(hw, "CONTROL:\n");
                         if (edata == IXGBE_CONTROL_EOL_NL) {
                                 hw_dbg(hw, "EOL\n");
                                 end_data = true;
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 4ec6dc1a5b75..aed4ed665648 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -2417,8 +2417,7 @@ struct ixgbe_mac_operations {
         s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
         s32 (*init_rx_addrs)(struct ixgbe_hw *);
         s32 (*update_uc_addr_list)(struct ixgbe_hw *, struct net_device *);
-        s32 (*update_mc_addr_list)(struct ixgbe_hw *, u8 *, u32,
-                                   ixgbe_mc_addr_itr);
+        s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
         s32 (*enable_mc)(struct ixgbe_hw *);
         s32 (*disable_mc)(struct ixgbe_hw *);
         s32 (*clear_vfta)(struct ixgbe_hw *);