e1000e: rename mc_addr_list_update

[linux-2.6-omap-h63xx.git] / drivers / net / e1000e / netdev.c

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 88fac392d4e0679c181c608cffd2333df6d8d0ee..2e07534c35f78520a9cba4765a0dce0a5355b457 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1889,7 +1889,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
 }
 
 /**
- *  e1000_mc_addr_list_update - Update Multicast addresses
+ *  e1000_update_mc_addr_list - Update Multicast addresses
  *  @hw: pointer to the HW structure
  *  @mc_addr_list: array of multicast addresses to program
  *  @mc_addr_count: number of multicast addresses to program
@@ -1903,11 +1903,11 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
  *  exists and all implementations are handled in the generic version of this
  *  function.
  **/
-static void e1000_mc_addr_list_update(struct e1000_hw *hw, u8 *mc_addr_list,
-                              u32 mc_addr_count, u32 rar_used_count,
-                              u32 rar_count)
+static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
+                                     u32 mc_addr_count, u32 rar_used_count,
+                                     u32 rar_count)
 {
-       hw->mac.ops.mc_addr_list_update(hw, mc_addr_list, mc_addr_count,
+       hw->mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count,
                                        rar_used_count, rar_count);
 }
 
@@ -1961,7 +1961,7 @@ static void e1000_set_multi(struct net_device *netdev)
                        mc_ptr = mc_ptr->next;
                }
 
-               e1000_mc_addr_list_update(hw, mta_list, i, 1,
+               e1000_update_mc_addr_list(hw, mta_list, i, 1,
                                          mac->rar_entry_count);
                kfree(mta_list);
        } else {
@@ -1969,8 +1969,7 @@ static void e1000_set_multi(struct net_device *netdev)
                 * if we're called from probe, we might not have
                 * anything to do here, so clear out the list
                 */
-               e1000_mc_addr_list_update(hw, NULL, 0, 1,
-                                         mac->rar_entry_count);
+               e1000_update_mc_addr_list(hw, NULL, 0, 1, mac->rar_entry_count);
        }
 }