diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-08-04 18:00:06 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 01:55:16 -0400 |
commit | 549bdd84dce242e15a9d7b42787ae481ba29f458 (patch) | |
tree | 384c87869bbf59df397fca7a04b95633f2df2f5d | |
parent | 726c09e7b6b7b9f9015ae7ce803ba4cd67121d67 (diff) |
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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 2 | ||||
-rw-r--r-- | drivers/net/igb/e1000_hw.h | 1 | ||||
-rw-r--r-- | drivers/net/igb/e1000_mac.c | 2 | ||||
-rw-r--r-- | drivers/net/igb/e1000_mac.h | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index cd75a2bc24a0..76f9f866f8c7 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
@@ -850,7 +850,7 @@ void igb_update_mc_addr_list_82575(struct e1000_hw *hw, | |||
850 | for (; mc_addr_count > 0; mc_addr_count--) { | 850 | for (; mc_addr_count > 0; mc_addr_count--) { |
851 | hash_value = igb_hash_mc_addr(hw, mc_addr_list); | 851 | hash_value = igb_hash_mc_addr(hw, mc_addr_list); |
852 | hw_dbg("Hash value = 0x%03X\n", hash_value); | 852 | hw_dbg("Hash value = 0x%03X\n", hash_value); |
853 | hw->mac.ops.mta_set(hw, hash_value); | 853 | igb_mta_set(hw, hash_value); |
854 | mc_addr_list += ETH_ALEN; | 854 | mc_addr_list += ETH_ALEN; |
855 | } | 855 | } |
856 | } | 856 | } |
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 19fa4ee96f2e..a65ccc3095c3 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
@@ -420,7 +420,6 @@ struct e1000_mac_operations { | |||
420 | void (*rar_set)(struct e1000_hw *, u8 *, u32); | 420 | void (*rar_set)(struct e1000_hw *, u8 *, u32); |
421 | s32 (*read_mac_addr)(struct e1000_hw *); | 421 | s32 (*read_mac_addr)(struct e1000_hw *); |
422 | s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); | 422 | s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); |
423 | void (*mta_set)(struct e1000_hw *, u32); | ||
424 | }; | 423 | }; |
425 | 424 | ||
426 | struct e1000_phy_operations { | 425 | struct e1000_phy_operations { |
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c index 20408aa1f916..9b0f0afdaeb8 100644 --- a/drivers/net/igb/e1000_mac.c +++ b/drivers/net/igb/e1000_mac.c | |||
@@ -271,7 +271,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) | |||
271 | * current value is read, the new bit is OR'd in and the new value is | 271 | * current value is read, the new bit is OR'd in and the new value is |
272 | * written back into the register. | 272 | * written back into the register. |
273 | **/ | 273 | **/ |
274 | static void igb_mta_set(struct e1000_hw *hw, u32 hash_value) | 274 | void igb_mta_set(struct e1000_hw *hw, u32 hash_value) |
275 | { | 275 | { |
276 | u32 hash_bit, hash_reg, mta; | 276 | u32 hash_bit, hash_reg, mta; |
277 | 277 | ||
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/igb/e1000_mac.h index dc2f8cce15e7..c2a9365ee040 100644 --- a/drivers/net/igb/e1000_mac.h +++ b/drivers/net/igb/e1000_mac.h | |||
@@ -63,6 +63,7 @@ void igb_clear_hw_cntrs_base(struct e1000_hw *hw); | |||
63 | void igb_clear_vfta(struct e1000_hw *hw); | 63 | void igb_clear_vfta(struct e1000_hw *hw); |
64 | void igb_config_collision_dist(struct e1000_hw *hw); | 64 | void igb_config_collision_dist(struct e1000_hw *hw); |
65 | void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count); | 65 | void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count); |
66 | void igb_mta_set(struct e1000_hw *hw, u32 hash_value); | ||
66 | void igb_put_hw_semaphore(struct e1000_hw *hw); | 67 | void igb_put_hw_semaphore(struct e1000_hw *hw); |
67 | void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index); | 68 | void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index); |
68 | s32 igb_check_alt_mac_addr(struct e1000_hw *hw); | 69 | s32 igb_check_alt_mac_addr(struct e1000_hw *hw); |