diff options
author | jfv <jfv@FreeBSD.org> | 2011-02-11 17:18:42 +0000 |
---|---|---|
committer | jfv <jfv@FreeBSD.org> | 2011-02-11 17:18:42 +0000 |
commit | a4f4d263c141c44a933af0e4d6965ae1c53499c1 (patch) | |
tree | d49d6adaa592fdbe24300130843e4c5715a963b4 /sys/dev/e1000 | |
parent | 3d28f79783c723bd8275feadeaa7468621348e2e (diff) | |
download | FreeBSD-src-a4f4d263c141c44a933af0e4d6965ae1c53499c1.zip FreeBSD-src-a4f4d263c141c44a933af0e4d6965ae1c53499c1.tar.gz |
Inconsistencies in the updated igb shared code and the older
em/lem, breaking the build, correcting that.
Diffstat (limited to 'sys/dev/e1000')
-rw-r--r-- | sys/dev/e1000/e1000_82542.c | 5 | ||||
-rw-r--r-- | sys/dev/e1000/e1000_mac.c | 5 | ||||
-rw-r--r-- | sys/dev/e1000/e1000_mac.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/e1000/e1000_82542.c b/sys/dev/e1000/e1000_82542.c index 282814b..c0b4e88 100644 --- a/sys/dev/e1000/e1000_82542.c +++ b/sys/dev/e1000/e1000_82542.c @@ -51,7 +51,6 @@ static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index); static void e1000_clear_hw_cntrs_82542(struct e1000_hw *hw); static s32 e1000_read_mac_addr_82542(struct e1000_hw *hw); - /** * e1000_init_phy_params_82542 - Init PHY func ptrs. * @hw: pointer to the HW structure @@ -192,7 +191,7 @@ static s32 e1000_reset_hw_82542(struct e1000_hw *hw) { struct e1000_bus_info *bus = &hw->bus; s32 ret_val = E1000_SUCCESS; - u32 ctrl, icr; + u32 ctrl; DEBUGFUNC("e1000_reset_hw_82542"); @@ -223,7 +222,7 @@ static s32 e1000_reset_hw_82542(struct e1000_hw *hw) msec_delay(2); E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); - icr = E1000_READ_REG(hw, E1000_ICR); + E1000_READ_REG(hw, E1000_ICR); if (hw->revision_id == E1000_REVISION_2) { if (bus->pci_cmd_word & CMD_MEM_WRT_INVALIDATE) diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c index bb35816..b29a38a 100644 --- a/sys/dev/e1000/e1000_mac.c +++ b/sys/dev/e1000/e1000_mac.c @@ -399,7 +399,10 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) if (ret_val) goto out; - if (!(nvm_data & NVM_COMPAT_LOM)) + /* Check for LOM (vs. NIC) or one of two valid mezzanine cards */ + if (!((nvm_data & NVM_COMPAT_LOM) || + (hw->device_id == E1000_DEV_ID_82571EB_SERDES_DUAL) || + (hw->device_id == E1000_DEV_ID_82571EB_SERDES_QUAD))) goto out; ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1, diff --git a/sys/dev/e1000/e1000_mac.h b/sys/dev/e1000/e1000_mac.h index 9af30b5..eca25d0 100644 --- a/sys/dev/e1000/e1000_mac.h +++ b/sys/dev/e1000/e1000_mac.h @@ -70,6 +70,7 @@ s32 e1000_led_on_generic(struct e1000_hw *hw); s32 e1000_led_off_generic(struct e1000_hw *hw); void e1000_update_mc_addr_list_generic(struct e1000_hw *hw, u8 *mc_addr_list, u32 mc_addr_count); +s32 e1000_set_default_fc_generic(struct e1000_hw *hw); s32 e1000_set_fc_watermarks_generic(struct e1000_hw *hw); s32 e1000_setup_fiber_serdes_link_generic(struct e1000_hw *hw); s32 e1000_setup_led_generic(struct e1000_hw *hw); |