From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Wed, 15 Jul 2009 17:11:00 +0000 (+0100)
Subject: Rebase on xenserver dom0 kernel.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=19df9167706f6f6250c800b9c0a14de575e60609;p=xenclient%2Flinux-2.6.27-pq.git

Rebase on xenserver dom0 kernel.

changeset:   588:d36923ca57ba
tag:         tip
user:        Ian Campbell <ian.campbell@citrix.com>
date:        Wed Jul 15 16:43:21 2009 +0100
summary:     Re-add intel-net-driver-conflicting-names.patch to allow both e1000 and e1000e
---

diff --git a/master/intel-net-driver-conflicting-names.patch b/master/intel-net-driver-conflicting-names.patch
index 9383ec2..6be2b13 100644
--- a/master/intel-net-driver-conflicting-names.patch
+++ b/master/intel-net-driver-conflicting-names.patch
@@ -1,7 +1,7 @@
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
---- a/drivers/net/e1000e/e1000_80003es2lan.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_80003es2lan.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -71,7 +71,7 @@
+diff --git a/drivers/net/e1000e/e1000_80003es2lan.c b/drivers/net/e1000e/e1000_80003es2lan.c
+--- a/drivers/net/e1000e/e1000_80003es2lan.c
++++ b/drivers/net/e1000e/e1000_80003es2lan.c
+@@ -69,7 +69,7 @@
  static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
  static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
  static s32  e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw);
@@ -10,7 +10,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  
  /*
   * A table for the GG82563 cable length where the range is defined
-@@ -97,8 +97,8 @@
+@@ -95,8 +95,8 @@
  		phy->type        = e1000_phy_none;
  		goto out;
  	} else {
@@ -21,7 +21,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  	}
  
  	phy->addr                = 1;
-@@ -107,7 +107,7 @@
+@@ -105,7 +105,7 @@
  	phy->type                = e1000_phy_gg82563;
  
  	phy->ops.acquire            = e1000_acquire_phy_80003es2lan;
@@ -30,7 +30,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  	phy->ops.check_reset_block  = e1000e_check_reset_block_generic;
  	phy->ops.commit             = e1000e_phy_sw_reset;
  	phy->ops.get_cfg_done       = e1000_get_cfg_done_80003es2lan;
-@@ -253,7 +253,7 @@
+@@ -251,7 +251,7 @@
  		break;
  	}
  	/* check management mode */
@@ -39,7 +39,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  	/* multicast address update */
  	mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
  	/* writing VFTA */
-@@ -261,13 +261,13 @@
+@@ -259,7 +259,7 @@
  	/* clearing VFTA */
  	mac->ops.clear_vfta = e1000e_clear_vfta_generic;
  	/* setting MTA */
@@ -47,6 +47,8 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
 +	mac->ops.mta_set = e1000e_mta_set_generic;
  	/* read mac address */
  	mac->ops.read_mac_addr = e1000_read_mac_addr_80003es2lan;
+ 	/* ID LED init */
+@@ -267,7 +267,7 @@
  	/* blink LED */
  	mac->ops.blink_led = e1000e_blink_led;
  	/* setup LED */
@@ -66,7 +68,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  	hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan;
  	hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan;
  	hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan;
-@@ -848,7 +848,7 @@
+@@ -847,7 +847,7 @@
  	ew32(IMC, 0xffffffff);
  	icr = er32(ICR);
  
@@ -75,7 +77,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  
  out:
  	return ret_val;
-@@ -1398,25 +1398,25 @@
+@@ -1395,25 +1395,25 @@
  {
  	s32 ret_val = E1000_SUCCESS;
  
@@ -105,10 +107,10 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_80003es2lan.c
  
  	return;
  }
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
---- a/drivers/net/e1000e/e1000_82571.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_82571.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -77,7 +77,7 @@
+diff --git a/drivers/net/e1000e/e1000_82571.c b/drivers/net/e1000e/e1000_82571.c
+--- a/drivers/net/e1000e/e1000_82571.c
++++ b/drivers/net/e1000e/e1000_82571.c
+@@ -80,7 +80,7 @@
  static s32  e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
                                         u16 words, u16 *data);
  static s32  e1000_read_mac_addr_82571(struct e1000_hw *hw);
@@ -117,7 +119,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  
  /**
   *  e1000_init_phy_params_82571 - Init PHY func ptrs.
-@@ -98,14 +98,14 @@
+@@ -101,14 +101,14 @@
  	phy->reset_delay_us              = 100;
  
  	phy->ops.acquire                 = e1000_get_hw_semaphore_82571;
@@ -135,7 +137,16 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  
  	switch (hw->mac.type) {
  	case e1000_82571:
-@@ -322,7 +322,7 @@
+@@ -299,7 +299,7 @@
+ 	case e1000_82573:
+ 	case e1000_82574:
+ 	case e1000_82583:
+-		mac->ops.set_lan_id = e1000_set_lan_id_single_port;
++		mac->ops.set_lan_id = e1000e_set_lan_id_single_port;
+ 		break;
+ 	default:
+ 		break;
+@@ -338,7 +338,7 @@
  		mac->ops.check_mng_mode = e1000_check_mng_mode_82574;
  		break;
  	default:
@@ -144,7 +155,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  		break;
  	}
  	/* multicast address update */
-@@ -332,13 +332,13 @@
+@@ -348,7 +348,7 @@
  	/* clearing VFTA */
  	mac->ops.clear_vfta = e1000_clear_vfta_82571;
  	/* setting MTA */
@@ -152,6 +163,8 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
 +	mac->ops.mta_set = e1000e_mta_set_generic;
  	/* read mac address */
  	mac->ops.read_mac_addr = e1000_read_mac_addr_82571;
+ 	/* ID LED init */
+@@ -356,7 +356,7 @@
  	/* blink LED */
  	mac->ops.blink_led = e1000e_blink_led;
  	/* setup LED */
@@ -160,7 +173,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  	/* cleanup LED */
  	mac->ops.cleanup_led = e1000e_cleanup_led_generic;
  	/* turn on/off LED */
-@@ -371,8 +371,8 @@
+@@ -390,8 +390,8 @@
   **/
  void e1000_init_function_pointers_82571(struct e1000_hw *hw)
  {
@@ -171,7 +184,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  	hw->mac.ops.init_params = e1000_init_mac_params_82571;
  	hw->nvm.ops.init_params = e1000_init_nvm_params_82571;
  	hw->phy.ops.init_params = e1000_init_phy_params_82571;
-@@ -876,7 +876,7 @@
+@@ -918,7 +918,7 @@
  	ew32(IMC, 0xffffffff);
  	icr = er32(ICR);
  
@@ -179,8 +192,8 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
 +	if (!(e1000e_check_alt_mac_addr_generic(hw)))
  		e1000e_set_laa_state_82571(hw, true);
  
- out:
-@@ -1369,20 +1369,20 @@
+ 	/* Reinitialize the 82571 serdes link state machine */
+@@ -1617,20 +1617,20 @@
  {
  	s32 ret_val = E1000_SUCCESS;
  
@@ -204,7 +217,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  {
  	struct e1000_phy_info *phy = &hw->phy;
  	struct e1000_mac_info *mac = &hw->mac;
-@@ -1392,7 +1392,7 @@
+@@ -1640,7 +1640,7 @@
  
  	/* If the management interface is not enabled, then power down */
  	if (!(mac->ops.check_mng_mode(hw) || e1000_check_reset_block(hw)))
@@ -213,33 +226,31 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_82571.c
  
  	return;
  }
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_hw.h
---- a/drivers/net/e1000e/e1000_hw.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_hw.h	Mon Mar 16 17:03:46 2009 +0000
-@@ -664,8 +664,8 @@
+diff --git a/drivers/net/e1000e/e1000_hw.h b/drivers/net/e1000e/e1000_hw.h
+--- a/drivers/net/e1000e/e1000_hw.h
++++ b/drivers/net/e1000e/e1000_hw.h
+@@ -664,7 +664,7 @@
  
  /* These functions must be implemented by drivers */
  s32  e1000_alloc_zeroed_dev_spec_struct(struct e1000_hw *hw, u32 size);
 -s32  e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
 +s32  e1000e_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
  void e1000_free_dev_spec_struct(struct e1000_hw *hw);
--void e1000_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
-+void e1000e_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
+ void e1000_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
  
- #endif
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_ich8lan.c
---- a/drivers/net/e1000e/e1000_ich8lan.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_ich8lan.c	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_ich8lan.c b/drivers/net/e1000e/e1000_ich8lan.c
+--- a/drivers/net/e1000e/e1000_ich8lan.c
++++ b/drivers/net/e1000e/e1000_ich8lan.c
 @@ -105,7 +105,7 @@
  static s32  e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                                             u8 size, u16 data);
  static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);
 -static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
 +static void e1000e_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
- 
- /* ICH GbE Flash Hardware Sequencing Flash Status Register bit breakdown */
- /* Offset 04h HSFSTS */
-@@ -176,8 +176,8 @@
+ static void e1000_rar_set_ich8lan(struct e1000_hw *hw, u8 *mac_addr, u32 index);
+ static void e1000_mta_set_ich8lan(struct e1000_hw *hw, u32 hash_value);
+ static void e1000_update_mc_addr_list_ich8lan(struct e1000_hw *hw,
+@@ -183,8 +183,8 @@
  	phy->ops.set_d0_lplu_state    = e1000_set_d0_lplu_state_ich8lan;
  	phy->ops.set_d3_lplu_state    = e1000_set_d3_lplu_state_ich8lan;
  	phy->ops.write_reg            = e1000e_write_phy_reg_igp;
@@ -250,21 +261,25 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_ich8lan.c
  
  	/*
  	 * We may need to do this twice - once for IGP and if that fails,
-@@ -345,11 +345,11 @@
- 	/* multicast address update */
- 	mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
- 	/* setting MTA */
--	mac->ops.mta_set = e1000_mta_set_generic;
-+	mac->ops.mta_set = e1000e_mta_set_generic;
- 	/* blink LED */
- 	mac->ops.blink_led = e1000e_blink_led;
- 	/* setup LED */
--	mac->ops.setup_led = e1000_setup_led_generic;
-+	mac->ops.setup_led = e1000e_setup_led_generic;
- 	/* cleanup LED */
- 	mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
- 	/* turn on/off LED */
-@@ -374,8 +374,8 @@
+@@ -336,7 +336,7 @@
+ 	/* bus type/speed/width */
+ 	mac->ops.get_bus_info = e1000_get_bus_info_ich8lan;
+ 	/* function id */
+-	mac->ops.set_lan_id = e1000_set_lan_id_single_port;
++	mac->ops.set_lan_id = e1000e_set_lan_id_single_port;
+ 	/* reset */
+ 	mac->ops.reset_hw = e1000_reset_hw_ich8lan;
+ 	/* hw initialization */
+@@ -370,7 +370,7 @@
+ 		/* blink LED */
+ 		mac->ops.blink_led = e1000e_blink_led;
+ 		/* setup LED */
+-		mac->ops.setup_led = e1000_setup_led_generic;
++		mac->ops.setup_led = e1000e_setup_led_generic;
+ 		/* cleanup LED */
+ 		mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
+ 		/* turn on/off LED */
+@@ -397,8 +397,8 @@
   **/
  void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw)
  {
@@ -275,7 +290,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_ich8lan.c
  	hw->mac.ops.init_params = e1000_init_mac_params_ich8lan;
  	hw->nvm.ops.init_params = e1000_init_nvm_params_ich8lan;
  	hw->phy.ops.init_params = e1000_init_phy_params_ich8lan;
-@@ -2484,7 +2484,7 @@
+@@ -2559,7 +2559,7 @@
  	if (hw->mac.type != e1000_ich10lan) {
  		if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
  		    (hw->phy.type == e1000_phy_igp_3)) {
@@ -284,7 +299,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_ich8lan.c
  		}
  	} else {
  		if (e1000_valid_nvm_bank_detect_ich8lan(hw, &bank)) {
-@@ -2498,18 +2498,18 @@
+@@ -2573,18 +2573,18 @@
  }
  
  /**
@@ -306,11 +321,28 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_ich8lan.c
  
  	return;
  }
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
---- a/drivers/net/e1000e/e1000_mac.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_mac.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -35,23 +35,23 @@
- static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw);
+@@ -2625,14 +2625,14 @@
+  *  @hw: pointer to the HW structure
+  *  @hash_value: determines the MTA register and bit to set
+  *
+- *  Set the MAC MTA register via e1000_mta_set_generic() and copy to
++ *  Set the MAC MTA register via e1000e_mta_set_generic() and copy to
+  *  the appropriate PHY MTA register.
+  **/
+ static void e1000_mta_set_ich8lan(struct e1000_hw *hw, u32 hash_value)
+ {
+ 	u32 hash_bit, hash_reg, mta;
+ 
+-	e1000_mta_set_generic(hw, hash_value);
++	e1000e_mta_set_generic(hw, hash_value);
+ 
+ 	if ((hw->phy.type == e1000_phy_ife) ||
+ 	    (hw->phy.type == e1000_phy_igp_3))
+diff --git a/drivers/net/e1000e/e1000_mac.c b/drivers/net/e1000e/e1000_mac.c
+--- a/drivers/net/e1000e/e1000_mac.c
++++ b/drivers/net/e1000e/e1000_mac.c
+@@ -36,12 +36,12 @@
+ static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
  
  /**
 - *  e1000_init_mac_ops_generic - Initialize MAC function pointers
@@ -324,6 +356,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  {
  	struct e1000_mac_info *mac = &hw->mac;
  	/* General Setup */
+@@ -49,11 +49,11 @@
  	mac->ops.read_mac_addr = e1000e_read_mac_addr_generic;
  	mac->ops.config_collision_dist = e1000e_config_collision_dist;
  	/* LINK */
@@ -339,7 +372,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  	/* VLAN, MC, etc. */
  	mac->ops.rar_set = e1000e_rar_set;
  	mac->ops.validate_mdi_setting = e1000_validate_mdi_setting_generic;
-@@ -75,7 +75,7 @@
+@@ -78,7 +78,7 @@
  	bus->type = e1000_bus_type_pci_express;
  	bus->speed = e1000_bus_speed_2500;
  
@@ -348,16 +381,22 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  	                                  PCIE_LINK_STATUS,
  	                                  &pcie_link_status);
  	if (ret_val)
-@@ -85,7 +85,7 @@
- 		                                PCIE_LINK_WIDTH_MASK) >>
- 		                               PCIE_LINK_WIDTH_SHIFT);
- 
--	e1000_read_pci_cfg(hw, PCI_HEADER_TYPE_REGISTER, &pci_header_type);
-+	e1000e_read_pci_cfg(hw, PCI_HEADER_TYPE_REGISTER, &pci_header_type);
- 	if (pci_header_type & PCI_HEADER_TYPE_MULTIFUNC) {
- 		status = er32(STATUS);
- 		bus->func = (status & E1000_STATUS_FUNC_MASK)
-@@ -158,7 +158,7 @@
+@@ -115,12 +115,12 @@
+ }
+ 
+ /**
+- *  e1000_set_lan_id_single_port - Set LAN id for a single port device
++ *  e1000e_set_lan_id_single_port - Set LAN id for a single port device
+  *  @hw: pointer to the HW structure
+  *
+  *  Sets the LAN function id to zero for a single port device.
+  **/
+-void e1000_set_lan_id_single_port(struct e1000_hw *hw)
++void e1000e_set_lan_id_single_port(struct e1000_hw *hw)
+ {
+ 	struct e1000_bus_info *bus = &hw->bus;
+ 
+@@ -185,7 +185,7 @@
  }
  
  /**
@@ -366,7 +405,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
   *  @hw: pointer to the HW structure
   *
   *  Checks the nvm for an alternate MAC address.  An alternate MAC address
-@@ -168,7 +168,7 @@
+@@ -195,7 +195,7 @@
   *  programmed into RAR0 and the function returns success, otherwise the
   *  function returns an error.
   **/
@@ -375,7 +414,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  {
  	u32 i;
  	s32 ret_val = E1000_SUCCESS;
-@@ -249,7 +249,7 @@
+@@ -282,7 +282,7 @@
  }
  
  /**
@@ -384,7 +423,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
   *  @hw: pointer to the HW structure
   *  @hash_value: determines the MTA register and bit to set
   *
-@@ -258,7 +258,7 @@
+@@ -291,7 +291,7 @@
   *  current value is read, the new bit is OR'd in and the new value is
   *  written back into the register.
   **/
@@ -393,7 +432,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  {
  	u32 hash_bit, hash_reg, mta;
  
-@@ -344,7 +344,7 @@
+@@ -375,7 +375,7 @@
   *
   *  Generates a multicast address hash value which is used to determine
   *  the multicast filter table array address and new table value.  See
@@ -402,7 +441,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
   **/
  static u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr)
  {
-@@ -1548,18 +1548,18 @@
+@@ -1579,18 +1579,18 @@
  }
  
  /**
@@ -424,9 +463,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.c
  		ret_val = -E1000_ERR_CONFIG;
  		goto out;
  	}
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.h
---- a/drivers/net/e1000e/e1000_mac.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_mac.h	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_mac.h b/drivers/net/e1000e/e1000_mac.h
+--- a/drivers/net/e1000e/e1000_mac.h
++++ b/drivers/net/e1000e/e1000_mac.h
 @@ -33,7 +33,7 @@
   * Functions that should not be called directly from drivers but can be used
   * by other files in this 'shared code'
@@ -436,7 +475,16 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.h
  s32  e1000e_blink_led(struct e1000_hw *hw);
  s32  e1000e_check_for_copper_link(struct e1000_hw *hw);
  s32  e1000e_check_for_fiber_link(struct e1000_hw *hw);
-@@ -57,18 +57,18 @@
+@@ -44,7 +44,7 @@
+ s32  e1000e_force_mac_fc(struct e1000_hw *hw);
+ s32  e1000e_get_auto_rd_done(struct e1000_hw *hw);
+ s32  e1000e_get_bus_info_pcie(struct e1000_hw *hw);
+-void e1000_set_lan_id_single_port(struct e1000_hw *hw);
++void e1000e_set_lan_id_single_port(struct e1000_hw *hw);
+ s32  e1000e_get_hw_semaphore(struct e1000_hw *hw);
+ s32  e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
+                                                u16 *duplex);
+@@ -58,18 +58,18 @@
  	                               u32 rar_used_count, u32 rar_count);
  s32  e1000e_set_fc_watermarks(struct e1000_hw *hw);
  s32  e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);
@@ -458,9 +506,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_mac.h
  void e1000e_reset_adaptive(struct e1000_hw *hw);
  void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
  void e1000e_update_adaptive(struct e1000_hw *hw);
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_manage.c
---- a/drivers/net/e1000e/e1000_manage.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_manage.c	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_manage.c b/drivers/net/e1000e/e1000_manage.c
+--- a/drivers/net/e1000e/e1000_manage.c
++++ b/drivers/net/e1000e/e1000_manage.c
 @@ -52,7 +52,7 @@
  }
  
@@ -529,9 +577,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_manage.c
                                      u16 length, u16 offset, u8 *sum)
  {
  	u8 *tmp;
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_manage.h
---- a/drivers/net/e1000e/e1000_manage.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_manage.h	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_manage.h b/drivers/net/e1000e/e1000_manage.h
+--- a/drivers/net/e1000e/e1000_manage.h
++++ b/drivers/net/e1000e/e1000_manage.h
 @@ -29,12 +29,12 @@
  #ifndef _E1000_MANAGE_H_
  #define _E1000_MANAGE_H_
@@ -549,9 +597,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_manage.h
                                      struct e1000_host_mng_command_header *hdr);
  s32  e1000e_mng_write_dhcp_info(struct e1000_hw *hw,
                                         u8 *buffer, u16 length);
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_nvm.c
---- a/drivers/net/e1000e/e1000_nvm.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_nvm.c	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_nvm.c b/drivers/net/e1000e/e1000_nvm.c
+--- a/drivers/net/e1000e/e1000_nvm.c
++++ b/drivers/net/e1000e/e1000_nvm.c
 @@ -32,12 +32,12 @@
  static void e1000e_reload_nvm(struct e1000_hw *hw);
  
@@ -567,9 +615,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_nvm.c
  {
  	struct e1000_nvm_info *nvm = &hw->nvm;
  	/* Initialize function pointers */
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_nvm.h
---- a/drivers/net/e1000e/e1000_nvm.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_nvm.h	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/e1000_nvm.h b/drivers/net/e1000e/e1000_nvm.h
+--- a/drivers/net/e1000e/e1000_nvm.h
++++ b/drivers/net/e1000e/e1000_nvm.h
 @@ -29,7 +29,7 @@
  #ifndef _E1000_NVM_H_
  #define _E1000_NVM_H_
@@ -579,37 +627,10 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_nvm.h
  s32  e1000e_acquire_nvm(struct e1000_hw *hw);
  
  s32  e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
---- a/drivers/net/e1000e/e1000_phy.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_phy.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -707,7 +707,7 @@
- }
- 
- /**
-- *  e1000_copper_link_autoneg - Setup/Enable autoneg for copper link
-+ *  e1000e_copper_link_autoneg - Setup/Enable autoneg for copper link
-  *  @hw: pointer to the HW structure
-  *
-  *  Performs initial bounds checking on autoneg advertisement parameter, then
-@@ -715,7 +715,7 @@
-  *  and restart the negotiation process between the link partner.  If
-  *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
-  **/
--s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-+s32 e1000e_copper_link_autoneg(struct e1000_hw *hw)
- {
- 	struct e1000_phy_info *phy = &hw->phy;
- 	s32 ret_val;
-@@ -957,7 +957,7 @@
- 		 * Setup autoneg and flow control advertisement and perform
- 		 * autonegotiation.
- 		 */
--		ret_val = e1000_copper_link_autoneg(hw);
-+		ret_val = e1000e_copper_link_autoneg(hw);
- 		if (ret_val)
- 			goto out;
- 	} else {
-@@ -1366,14 +1366,14 @@
+diff --git a/drivers/net/e1000e/e1000_phy.c b/drivers/net/e1000e/e1000_phy.c
+--- a/drivers/net/e1000e/e1000_phy.c
++++ b/drivers/net/e1000e/e1000_phy.c
+@@ -1367,14 +1367,14 @@
  }
  
  /**
@@ -626,7 +647,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	struct e1000_phy_info *phy = &hw->phy;
  	s32 ret_val;
-@@ -1390,7 +1390,7 @@
+@@ -1391,7 +1391,7 @@
  }
  
  /**
@@ -635,7 +656,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
   *  @hw: pointer to the HW structure
   *
   *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
-@@ -1398,7 +1398,7 @@
+@@ -1399,7 +1399,7 @@
   *  Polarity is determined based on the PHY port status register, and the
   *  current speed (since there is no polarity at 100Mbps).
   **/
@@ -644,7 +665,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	struct e1000_phy_info *phy = &hw->phy;
  	s32 ret_val;
-@@ -1437,13 +1437,13 @@
+@@ -1438,13 +1438,13 @@
  }
  
  /**
@@ -660,7 +681,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	s32 ret_val = E1000_SUCCESS;
  	u16 i, phy_status;
-@@ -1667,7 +1667,7 @@
+@@ -1668,7 +1668,7 @@
  	phy->polarity_correction = (phy_data & M88E1000_PSCR_POLARITY_REVERSAL)
  	                           ? true : false;
  
@@ -669,7 +690,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  	if (ret_val)
  		goto out;
  
-@@ -1732,7 +1732,7 @@
+@@ -1733,7 +1733,7 @@
  
  	phy->polarity_correction = true;
  
@@ -678,7 +699,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  	if (ret_val)
  		goto out;
  
-@@ -1858,12 +1858,12 @@
+@@ -1859,12 +1859,12 @@
  }
  
  /**
@@ -693,7 +714,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	e_dbg("Running IGP 3 PHY init script\n");
  
-@@ -2366,14 +2366,14 @@
+@@ -2369,14 +2369,14 @@
  }
  
  /**
@@ -710,7 +731,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	u16 mii_reg = 0;
  
-@@ -2384,14 +2384,14 @@
+@@ -2387,14 +2387,14 @@
  }
  
  /**
@@ -727,10 +748,10 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.c
  {
  	u16 mii_reg = 0;
  
-diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.h
---- a/drivers/net/e1000e/e1000_phy.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/e1000_phy.h	Mon Mar 16 17:03:46 2009 +0000
-@@ -31,10 +31,10 @@
+diff --git a/drivers/net/e1000e/e1000_phy.h b/drivers/net/e1000e/e1000_phy.h
+--- a/drivers/net/e1000e/e1000_phy.h
++++ b/drivers/net/e1000e/e1000_phy.h
+@@ -31,8 +31,8 @@
  
  void e1000_init_phy_ops_generic(struct e1000_hw *hw);
  s32  e1000e_check_downshift(struct e1000_hw *hw);
@@ -739,12 +760,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.h
 +s32  e1000e_check_polarity_m88(struct e1000_hw *hw);
 +s32  e1000e_check_polarity_igp(struct e1000_hw *hw);
  s32  e1000e_check_reset_block_generic(struct e1000_hw *hw);
--s32  e1000_copper_link_autoneg(struct e1000_hw *hw);
-+s32  e1000e_copper_link_autoneg(struct e1000_hw *hw);
  s32  e1000e_copper_link_setup_igp(struct e1000_hw *hw);
  s32  e1000e_copper_link_setup_m88(struct e1000_hw *hw);
- s32  e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-@@ -54,22 +54,22 @@
+@@ -53,22 +53,22 @@
  s32  e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
  s32  e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);
  s32  e1000e_setup_copper_link(struct e1000_hw *hw);
@@ -771,23 +789,21 @@ diff -r 7250bb466c38 drivers/net/e1000e/e1000_phy.h
  s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
  s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
  
-diff -r 7250bb466c38 drivers/net/e1000e/hw.h
---- a/drivers/net/e1000e/hw.h	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/hw.h	Mon Mar 16 17:03:46 2009 +0000
-@@ -668,7 +668,7 @@
+diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
+--- a/drivers/net/e1000e/hw.h
++++ b/drivers/net/e1000e/hw.h
+@@ -683,6 +683,6 @@
  #include "e1000_ich8lan.h"
  
  /* These functions must be implemented by drivers */
 -s32  e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
--void e1000_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
 +s32  e1000e_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-+void e1000e_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
  
  #endif
-diff -r 7250bb466c38 drivers/net/e1000e/ich8lan.c
---- a/drivers/net/e1000e/ich8lan.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/ich8lan.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -2503,12 +2503,12 @@
+diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
+--- a/drivers/net/e1000e/ich8lan.c
++++ b/drivers/net/e1000e/ich8lan.c
+@@ -2487,12 +2487,12 @@
  }
  
  /**
@@ -802,7 +818,7 @@ diff -r 7250bb466c38 drivers/net/e1000e/ich8lan.c
  {
  	/* PHY init IGP 3 */
  	/* Enable rise/fall, 10-mode work in class-A */
-@@ -2603,7 +2603,7 @@
+@@ -2587,7 +2587,7 @@
  	/* If EEPROM is not marked present, init the IGP 3 PHY manually */
  	if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
  	    (hw->phy.type == e1000_phy_igp_3)) {
@@ -811,9 +827,9 @@ diff -r 7250bb466c38 drivers/net/e1000e/ich8lan.c
  	}
  
  	return 0;
-diff -r 7250bb466c38 drivers/net/e1000e/lib.c
---- a/drivers/net/e1000e/lib.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/lib.c	Mon Mar 16 17:03:46 2009 +0000
+diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
+--- a/drivers/net/e1000e/lib.c
++++ b/drivers/net/e1000e/lib.c
 @@ -200,7 +200,7 @@
   *
   *  Generates a multicast address hash value which is used to determine
@@ -823,27 +839,21 @@ diff -r 7250bb466c38 drivers/net/e1000e/lib.c
   **/
  static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
  {
-diff -r 7250bb466c38 drivers/net/e1000e/netdev.c
---- a/drivers/net/e1000e/netdev.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/netdev.c	Mon Mar 16 17:03:46 2009 +0000
-@@ -5209,12 +5209,12 @@
+diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
+--- a/drivers/net/e1000e/netdev.c
++++ b/drivers/net/e1000e/netdev.c
+@@ -5228,7 +5228,7 @@
  	}
  }
  
--void e1000_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value)
-+void e1000e_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value)
- {
- 	pci_read_config_word(hw->adapter->pdev, reg, value);
- }
- 
 -s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
 +s32 e1000e_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
  {
  	u16 cap_offset;
  
-diff -r 7250bb466c38 drivers/net/e1000e/phy.c
---- a/drivers/net/e1000e/phy.c	Tue Mar 10 15:29:17 2009 +0000
-+++ b/drivers/net/e1000e/phy.c	Mon Mar 16 17:03:47 2009 +0000
+diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
+--- a/drivers/net/e1000e/phy.c
++++ b/drivers/net/e1000e/phy.c
 @@ -33,7 +33,7 @@
  static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
  static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
@@ -853,24 +863,6 @@ diff -r 7250bb466c38 drivers/net/e1000e/phy.c
  static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg);
  static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
  					  u16 *data, bool read);
-@@ -800,7 +800,7 @@
- }
- 
- /**
-- *  e1000_copper_link_autoneg - Setup/Enable autoneg for copper link
-+ *  e1000e_copper_link_autoneg - Setup/Enable autoneg for copper link
-  *  @hw: pointer to the HW structure
-  *
-  *  Performs initial bounds checking on autoneg advertisement parameter, then
-@@ -808,7 +808,7 @@
-  *  and restart the negotiation process between the link partner.  If
-  *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
-  **/
--static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-+static s32 e1000e_copper_link_autoneg(struct e1000_hw *hw)
- {
- 	struct e1000_phy_info *phy = &hw->phy;
- 	s32 ret_val;
 @@ -853,7 +853,7 @@
  	 * check at a later time (for example, callback routine).
  	 */
@@ -880,15 +872,6 @@ diff -r 7250bb466c38 drivers/net/e1000e/phy.c
  		if (ret_val) {
  			hw_dbg(hw, "Error while waiting for "
  				 "autoneg to complete\n");
-@@ -885,7 +885,7 @@
- 		 * Setup autoneg and flow control advertisement and perform
- 		 * autonegotiation.
- 		 */
--		ret_val = e1000_copper_link_autoneg(hw);
-+		ret_val = e1000e_copper_link_autoneg(hw);
- 		if (ret_val)
- 			return ret_val;
- 	} else {
 @@ -1274,14 +1274,14 @@
  }
  
diff --git a/master/series b/master/series
index a8e3cb8..cd6e6cb 100644
--- a/master/series
+++ b/master/series
@@ -128,6 +128,7 @@ igb-1.3.19.3.patch
 ixgb-1.0.135.patch
 ixgbe-2.0.34.3.patch
 intel-net-driver-kcompat.patch
+intel-net-driver-conflicting-names.patch
 tg3-3.99d
 tg3-tune-interrupt-load
 tg3-build-without-vlan-support.patch