Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2de3eb6 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Jeff Garzik
Browse files

e1000e: rename mc_addr_list_update 



Rename this function to be consistent with function naming (verb first)

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ad68076e

drivers/net/e1000e/82571.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -972,7 +972,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw) 
}

}





/**

/**

 *  e1000_mc_addr_list_update_82571 - Update Multicast addresses

 *  e1000_update_mc_addr_list_82571 - 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
@@ -984,7 +984,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw) 
 *  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.

 **/

 **/

static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw,

static void e1000_update_mc_addr_list_82571(struct e1000_hw *hw,

					    u8 *mc_addr_list,

					    u8 *mc_addr_list,

					    u32 mc_addr_count,

					    u32 mc_addr_count,

					    u32 rar_used_count,

					    u32 rar_used_count,
@@ -993,7 +993,7 @@ static void e1000_mc_addr_list_update_82571(struct e1000_hw *hw, 
	if (e1000e_get_laa_state_82571(hw))

	if (e1000e_get_laa_state_82571(hw))

		rar_count--;

		rar_count--;





	e1000e_mc_addr_list_update_generic(hw, mc_addr_list, mc_addr_count,

	e1000e_update_mc_addr_list_generic(hw, mc_addr_list, mc_addr_count,

					   rar_used_count, rar_count);

					   rar_used_count, rar_count);

}

}
@@ -1269,7 +1269,7 @@ static struct e1000_mac_operations e82571_mac_ops = { 
	/* .get_link_up_info: media type dependent */

	/* .get_link_up_info: media type dependent */

	.led_on			= e1000e_led_on_generic,

	.led_on			= e1000e_led_on_generic,

	.led_off		= e1000e_led_off_generic,

	.led_off		= e1000e_led_off_generic,

	.mc_addr_list_update	= e1000_mc_addr_list_update_82571,

	.update_mc_addr_list	= e1000_update_mc_addr_list_82571,

	.reset_hw		= e1000_reset_hw_82571,

	.reset_hw		= e1000_reset_hw_82571,

	.init_hw		= e1000_init_hw_82571,

	.init_hw		= e1000_init_hw_82571,

	.setup_link		= e1000_setup_link_82571,

	.setup_link		= e1000_setup_link_82571,

drivers/net/e1000e/e1000.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -387,9 +387,11 @@ extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw); 
extern s32 e1000e_setup_link(struct e1000_hw *hw);

extern s32 e1000e_setup_link(struct e1000_hw *hw);

extern void e1000e_clear_vfta(struct e1000_hw *hw);

extern void e1000e_clear_vfta(struct e1000_hw *hw);

extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

extern void e1000e_mc_addr_list_update_generic(struct e1000_hw *hw,

extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,

				       u8 *mc_addr_list, u32 mc_addr_count,

					       u8 *mc_addr_list,

				       u32 rar_used_count, u32 rar_count);

					       u32 mc_addr_count,

					       u32 rar_used_count,

					       u32 rar_count);

extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);

extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);

extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);

extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);

extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);

extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);

drivers/net/e1000e/es2lan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1190,7 +1190,7 @@ static struct e1000_mac_operations es2_mac_ops = { 
	.get_link_up_info	= e1000_get_link_up_info_80003es2lan,

	.get_link_up_info	= e1000_get_link_up_info_80003es2lan,

	.led_on			= e1000e_led_on_generic,

	.led_on			= e1000e_led_on_generic,

	.led_off		= e1000e_led_off_generic,

	.led_off		= e1000e_led_off_generic,

	.mc_addr_list_update	= e1000e_mc_addr_list_update_generic,

	.update_mc_addr_list	= e1000e_update_mc_addr_list_generic,

	.reset_hw		= e1000_reset_hw_80003es2lan,

	.reset_hw		= e1000_reset_hw_80003es2lan,

	.init_hw		= e1000_init_hw_80003es2lan,

	.init_hw		= e1000_init_hw_80003es2lan,

	.setup_link		= e1000e_setup_link,

	.setup_link		= e1000e_setup_link,

drivers/net/e1000e/hw.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -685,7 +685,7 @@ struct e1000_mac_operations { 
	s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);

	s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);

	s32  (*led_on)(struct e1000_hw *);

	s32  (*led_on)(struct e1000_hw *);

	s32  (*led_off)(struct e1000_hw *);

	s32  (*led_off)(struct e1000_hw *);

	void (*mc_addr_list_update)(struct e1000_hw *, u8 *, u32, u32, u32);

	void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32);

	s32  (*reset_hw)(struct e1000_hw *);

	s32  (*reset_hw)(struct e1000_hw *);

	s32  (*init_hw)(struct e1000_hw *);

	s32  (*init_hw)(struct e1000_hw *);

	s32  (*setup_link)(struct e1000_hw *);

	s32  (*setup_link)(struct e1000_hw *);

drivers/net/e1000e/ich8lan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2212,7 +2212,7 @@ static struct e1000_mac_operations ich8_mac_ops = { 
	.get_link_up_info	= e1000_get_link_up_info_ich8lan,

	.get_link_up_info	= e1000_get_link_up_info_ich8lan,

	.led_on			= e1000_led_on_ich8lan,

	.led_on			= e1000_led_on_ich8lan,

	.led_off		= e1000_led_off_ich8lan,

	.led_off		= e1000_led_off_ich8lan,

	.mc_addr_list_update	= e1000e_mc_addr_list_update_generic,

	.update_mc_addr_list	= e1000e_update_mc_addr_list_generic,

	.reset_hw		= e1000_reset_hw_ich8lan,

	.reset_hw		= e1000_reset_hw_ich8lan,

	.init_hw		= e1000_init_hw_ich8lan,

	.init_hw		= e1000_init_hw_ich8lan,

	.setup_link		= e1000_setup_link_ich8lan,

	.setup_link		= e1000_setup_link_ich8lan,