Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

igb: rename igb_update_mc_addr_list_82575 to not include the 82575

Browse source 
There isn't much point in having the _82575 hanging off the end of this
function since there aren't any other version of this function running
around within this driver.  This also allows for a bit of whitespace
cleanup due to a shorter function name.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2009-02-06 23:20:10 +00:00 committed by David S. Miller
parent 4b1a987736
commit 8a900862a2
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/igb/e1000_82575.c
View file

@ -787,7 +787,7 @@ static void igb_init_rx_addrs_82575(struct e1000_hw *hw, u16 rar_count)
} }
/** /**
* igb_update_mc_addr_list_82575 - Update Multicast addresses * igb_update_mc_addr_list - Update Multicast addresses
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @mc_addr_list: array of multicast addresses to program * @mc_addr_list: array of multicast addresses to program
* @mc_addr_count: number of multicast addresses to program * @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)
* The parameter rar_count will usually be hw->mac.rar_entry_count * The parameter rar_count will usually be hw->mac.rar_entry_count
* unless there are workarounds that change this. * unless there are workarounds that change this.
**/ **/
void igb_update_mc_addr_list_82575(struct e1000_hw *hw, void igb_update_mc_addr_list(struct e1000_hw *hw,
u8 *mc_addr_list, u32 mc_addr_count, u8 *mc_addr_list, u32 mc_addr_count,
u32 rar_used_count, u32 rar_count) u32 rar_used_count, u32 rar_count)
{ {
u32 hash_value; u32 hash_value;
u32 i; u32 i;

2
drivers/net/igb/e1000_82575.h
View file

@ -28,7 +28,7 @@
#ifndef _E1000_82575_H_ #ifndef _E1000_82575_H_
#define _E1000_82575_H_ #define _E1000_82575_H_
void igb_update_mc_addr_list_82575(struct e1000_hw*, u8*, u32, u32, u32); void igb_update_mc_addr_list(struct e1000_hw*, u8*, u32, u32, u32);
extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw); extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw);
extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw); extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

7
drivers/net/igb/igb_main.c
View file

@ -2227,8 +2227,8 @@ static void igb_set_multi(struct net_device *netdev)
if (!netdev->mc_count) { if (!netdev->mc_count) {
/* nothing to program, so clear mc list */ /* nothing to program, so clear mc list */
igb_update_mc_addr_list_82575(hw, NULL, 0, 1, igb_update_mc_addr_list(hw, NULL, 0, 1,
mac->rar_entry_count); mac->rar_entry_count);
return; return;
} }
@ -2245,8 +2245,7 @@ static void igb_set_multi(struct net_device *netdev)
memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN); memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN);
mc_ptr = mc_ptr->next; mc_ptr = mc_ptr->next;
} }
igb_update_mc_addr_list_82575(hw, mta_list, i, 1, igb_update_mc_addr_list(hw, mta_list, i, 1, mac->rar_entry_count);
mac->rar_entry_count);
kfree(mta_list); kfree(mta_list);
} }