svn commit: r218581 - head/sys/dev/e1000

[Jack F Vogel]

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);