aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2008-03-28 12:15:11 -0400
committerJeff Garzik <jeff@garzik.org>2008-03-28 22:14:58 -0400
commite2de3eb69c40c01739ce9b154c65e51d94d72966 (patch)
tree939a0f1f8d5effedaf0fa88e69d9603ab1bdd0f6 /drivers/net/e1000e/netdev.c
parentad68076e07fa01bd0c98278a959d0fd2bb26f1ac (diff)
e1000e: rename mc_addr_list_update
Rename this function to be consistent with function naming (verb first) Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 88fac392d4e0..2e07534c35f7 100644
--- 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)
1889} 1889}
1890 1890
1891/** 1891/**
1892 * e1000_mc_addr_list_update - Update Multicast addresses 1892 * e1000_update_mc_addr_list - Update Multicast addresses
1893 * @hw: pointer to the HW structure 1893 * @hw: pointer to the HW structure
1894 * @mc_addr_list: array of multicast addresses to program 1894 * @mc_addr_list: array of multicast addresses to program
1895 * @mc_addr_count: number of multicast addresses to program 1895 * @mc_addr_count: number of multicast addresses to program
@@ -1903,11 +1903,11 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
1903 * exists and all implementations are handled in the generic version of this 1903 * exists and all implementations are handled in the generic version of this
1904 * function. 1904 * function.
1905 **/ 1905 **/
1906static void e1000_mc_addr_list_update(struct e1000_hw *hw, u8 *mc_addr_list, 1906static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
1907 u32 mc_addr_count, u32 rar_used_count, 1907 u32 mc_addr_count, u32 rar_used_count,
1908 u32 rar_count) 1908 u32 rar_count)
1909{ 1909{
1910 hw->mac.ops.mc_addr_list_update(hw, mc_addr_list, mc_addr_count, 1910 hw->mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count,
1911 rar_used_count, rar_count); 1911 rar_used_count, rar_count);
1912} 1912}
1913 1913
@@ -1961,7 +1961,7 @@ static void e1000_set_multi(struct net_device *netdev)
1961 mc_ptr = mc_ptr->next; 1961 mc_ptr = mc_ptr->next;
1962 } 1962 }
1963 1963
1964 e1000_mc_addr_list_update(hw, mta_list, i, 1, 1964 e1000_update_mc_addr_list(hw, mta_list, i, 1,
1965 mac->rar_entry_count); 1965 mac->rar_entry_count);
1966 kfree(mta_list); 1966 kfree(mta_list);
1967 } else { 1967 } else {
@@ -1969,8 +1969,7 @@ static void e1000_set_multi(struct net_device *netdev)
1969 * if we're called from probe, we might not have 1969 * if we're called from probe, we might not have
1970 * anything to do here, so clear out the list 1970 * anything to do here, so clear out the list
1971 */ 1971 */
1972 e1000_mc_addr_list_update(hw, NULL, 0, 1, 1972 e1000_update_mc_addr_list(hw, NULL, 0, 1, mac->rar_entry_count);
1973 mac->rar_entry_count);
1974 } 1973 }
1975} 1974}
1976 1975