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

Commit 549bdd84 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Garzik
Browse files

igb: correct issue of set_mta member of mac.ops not being populated 



The igb_mta_set function was not being correctly used

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 726c09e7

drivers/net/igb/e1000_82575.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ void igb_update_mc_addr_list_82575(struct e1000_hw *hw, 
	for (; mc_addr_count > 0; mc_addr_count--) {

		hash_value = igb_hash_mc_addr(hw, mc_addr_list);

		hw_dbg("Hash value = 0x%03X\n", hash_value);

		hw->mac.ops.mta_set(hw, hash_value);

		igb_mta_set(hw, hash_value);

		mc_addr_list += ETH_ALEN;

	}

}

drivers/net/igb/e1000_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ struct e1000_mac_operations { 
	void (*rar_set)(struct e1000_hw *, u8 *, u32);

	s32  (*read_mac_addr)(struct e1000_hw *);

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

	void (*mta_set)(struct e1000_hw *, u32);

};



struct e1000_phy_operations {

drivers/net/igb/e1000_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) 
 *  current value is read, the new bit is OR'd in and the new value is

 *  written back into the register.

 **/

static void igb_mta_set(struct e1000_hw *hw, u32 hash_value)

void igb_mta_set(struct e1000_hw *hw, u32 hash_value)

{

	u32 hash_bit, hash_reg, mta;

drivers/net/igb/e1000_mac.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ void igb_clear_hw_cntrs_base(struct e1000_hw *hw); 
void igb_clear_vfta(struct e1000_hw *hw);

void igb_config_collision_dist(struct e1000_hw *hw);

void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

void igb_mta_set(struct e1000_hw *hw, u32 hash_value);

void igb_put_hw_semaphore(struct e1000_hw *hw);

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

s32  igb_check_alt_mac_addr(struct e1000_hw *hw);