diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2010-01-12 21:05:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-13 23:31:57 -0500 |
commit | ab8932f3e8e07df92d6ce3fa41f5af0dda865429 (patch) | |
tree | adfd802b04591e62b4743790ea8308f24f46d3e4 /drivers/net/e1000e/hw.h | |
parent | f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23 (diff) |
e1000e: genericize the update multicast address list
Make updating the multicast address list generic for all families and
enforce the requirement to update the entire multicast table array all at
once instead of piecemeal which causes problems on some parts.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/hw.h')
-rw-r--r-- | drivers/net/e1000e/hw.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 9cac5d9b94b8..8bdcd5f24eff 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
@@ -753,7 +753,7 @@ struct e1000_mac_operations { | |||
753 | s32 (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *); | 753 | s32 (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *); |
754 | s32 (*led_on)(struct e1000_hw *); | 754 | s32 (*led_on)(struct e1000_hw *); |
755 | s32 (*led_off)(struct e1000_hw *); | 755 | s32 (*led_off)(struct e1000_hw *); |
756 | void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32); | 756 | void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32); |
757 | s32 (*reset_hw)(struct e1000_hw *); | 757 | s32 (*reset_hw)(struct e1000_hw *); |
758 | s32 (*init_hw)(struct e1000_hw *); | 758 | s32 (*init_hw)(struct e1000_hw *); |
759 | s32 (*setup_link)(struct e1000_hw *); | 759 | s32 (*setup_link)(struct e1000_hw *); |
@@ -819,6 +819,10 @@ struct e1000_mac_info { | |||
819 | u16 ifs_ratio; | 819 | u16 ifs_ratio; |
820 | u16 ifs_step_size; | 820 | u16 ifs_step_size; |
821 | u16 mta_reg_count; | 821 | u16 mta_reg_count; |
822 | |||
823 | /* Maximum size of the MTA register table in all supported adapters */ | ||
824 | #define MAX_MTA_REG 128 | ||
825 | u32 mta_shadow[MAX_MTA_REG]; | ||
822 | u16 rar_entry_count; | 826 | u16 rar_entry_count; |
823 | 827 | ||
824 | u8 forced_speed_duplex; | 828 | u8 forced_speed_duplex; |