aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/igb/e1000_82575.c8
-rw-r--r--drivers/net/igb/e1000_82575.h2
-rw-r--r--drivers/net/igb/igb_main.c7
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 527d4c8e53fc..68a9822f4059 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -787,7 +787,7 @@ static void igb_init_rx_addrs_82575(struct e1000_hw *hw, u16 rar_count)
787} 787}
788 788
789/** 789/**
790 * igb_update_mc_addr_list_82575 - Update Multicast addresses 790 * igb_update_mc_addr_list - Update Multicast addresses
791 * @hw: pointer to the HW structure 791 * @hw: pointer to the HW structure
792 * @mc_addr_list: array of multicast addresses to program 792 * @mc_addr_list: array of multicast addresses to program
793 * @mc_addr_count: number of multicast addresses to program 793 * @mc_addr_count: number of multicast addresses to program
@@ -799,9 +799,9 @@ static void igb_init_rx_addrs_82575(struct e1000_hw *hw, u16 rar_count)
799 * The parameter rar_count will usually be hw->mac.rar_entry_count 799 * The parameter rar_count will usually be hw->mac.rar_entry_count
800 * unless there are workarounds that change this. 800 * unless there are workarounds that change this.
801 **/ 801 **/
802void igb_update_mc_addr_list_82575(struct e1000_hw *hw, 802void igb_update_mc_addr_list(struct e1000_hw *hw,
803 u8 *mc_addr_list, u32 mc_addr_count, 803 u8 *mc_addr_list, u32 mc_addr_count,
804 u32 rar_used_count, u32 rar_count) 804 u32 rar_used_count, u32 rar_count)
805{ 805{
806 u32 hash_value; 806 u32 hash_value;
807 u32 i; 807 u32 i;
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h
index c1928b5efe1f..e0a376fa28a1 100644
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/igb/e1000_82575.h
@@ -28,7 +28,7 @@
28#ifndef _E1000_82575_H_ 28#ifndef _E1000_82575_H_
29#define _E1000_82575_H_ 29#define _E1000_82575_H_
30 30
31void igb_update_mc_addr_list_82575(struct e1000_hw*, u8*, u32, u32, u32); 31void igb_update_mc_addr_list(struct e1000_hw*, u8*, u32, u32, u32);
32extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw); 32extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw);
33extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw); 33extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);
34 34
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index cbb385856335..2d169a45c425 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -2227,8 +2227,8 @@ static void igb_set_multi(struct net_device *netdev)
2227 2227
2228 if (!netdev->mc_count) { 2228 if (!netdev->mc_count) {
2229 /* nothing to program, so clear mc list */ 2229 /* nothing to program, so clear mc list */
2230 igb_update_mc_addr_list_82575(hw, NULL, 0, 1, 2230 igb_update_mc_addr_list(hw, NULL, 0, 1,
2231 mac->rar_entry_count); 2231 mac->rar_entry_count);
2232 return; 2232 return;
2233 } 2233 }
2234 2234
@@ -2245,8 +2245,7 @@ static void igb_set_multi(struct net_device *netdev)
2245 memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN); 2245 memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN);
2246 mc_ptr = mc_ptr->next; 2246 mc_ptr = mc_ptr->next;
2247 } 2247 }
2248 igb_update_mc_addr_list_82575(hw, mta_list, i, 1, 2248 igb_update_mc_addr_list(hw, mta_list, i, 1, mac->rar_entry_count);
2249 mac->rar_entry_count);
2250 kfree(mta_list); 2249 kfree(mta_list);
2251} 2250}
2252 2251