From owner-svn-src-head@FreeBSD.ORG Fri Feb 11 17:18:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8422106566C; Fri, 11 Feb 2011 17:18:42 +0000 (UTC) (envelope-from jfv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BC41D8FC18; Fri, 11 Feb 2011 17:18:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BHIgGQ068176; Fri, 11 Feb 2011 17:18:42 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BHIg8t068172; Fri, 11 Feb 2011 17:18:42 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <201102111718.p1BHIg8t068172@svn.freebsd.org> From: Jack F Vogel Date: Fri, 11 Feb 2011 17:18:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218581 - head/sys/dev/e1000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 17:18:43 -0000 Author: jfv Date: Fri Feb 11 17:18:42 2011 New Revision: 218581 URL: http://svn.freebsd.org/changeset/base/218581 Log: Inconsistencies in the updated igb shared code and the older em/lem, breaking the build, correcting that. Modified: head/sys/dev/e1000/e1000_82542.c head/sys/dev/e1000/e1000_mac.c head/sys/dev/e1000/e1000_mac.h Modified: head/sys/dev/e1000/e1000_82542.c ============================================================================== --- head/sys/dev/e1000/e1000_82542.c Fri Feb 11 16:14:16 2011 (r218580) +++ head/sys/dev/e1000/e1000_82542.c Fri Feb 11 17:18:42 2011 (r218581) @@ -51,7 +51,6 @@ static void e1000_rar_set_82542(struct e 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 e { 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 e 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) Modified: head/sys/dev/e1000/e1000_mac.c ============================================================================== --- head/sys/dev/e1000/e1000_mac.c Fri Feb 11 16:14:16 2011 (r218580) +++ head/sys/dev/e1000/e1000_mac.c Fri Feb 11 17:18:42 2011 (r218581) @@ -399,7 +399,10 @@ s32 e1000_check_alt_mac_addr_generic(str 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, Modified: head/sys/dev/e1000/e1000_mac.h ============================================================================== --- head/sys/dev/e1000/e1000_mac.h Fri Feb 11 16:14:16 2011 (r218580) +++ head/sys/dev/e1000/e1000_mac.h Fri Feb 11 17:18:42 2011 (r218581) @@ -70,6 +70,7 @@ s32 e1000_led_on_generic(struct e1000_h 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);