rpms/kernel/devel linux-2.6-e1000-ich9.patch, 1.2, 1.3 kernel.spec, 1.451, 1.452

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32592

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-e1000-ich9.patch 
Log Message:
* Tue Feb 26 2008 Dave Jones <davej at redhat.com>
- kludge to make ich9 e1000 work
- Drop older unnecessary e1000 workarounds.


linux-2.6-e1000-ich9.patch:

Index: linux-2.6-e1000-ich9.patch
===================================================================
RCS file: linux-2.6-e1000-ich9.patch
diff -N linux-2.6-e1000-ich9.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-e1000-ich9.patch	26 Feb 2008 20:24:16 -0000	1.3
@@ -0,0 +1,29 @@
+diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
+index 8f8139d..22c49ec 100644
+--- a/drivers/net/e1000e/ich8lan.c
++++ b/drivers/net/e1000e/ich8lan.c
+@@ -209,6 +209,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
+ 
+ 	/* Verify phy id */
+ 	switch (phy->id) {
++	case 0x0:
++		if (hw->adapter->pdev->device == 0x10be)
++			hw_dbg(hw, "got 0 phy id, trying anyway");
++			/* Fall through to IGP03E1000 case below */
++		else
++			return -E1000_ERR_PHY;
+ 	case IGP03E1000_E_PHY_ID:
+ 		phy->type = e1000_phy_igp_3;
+ 		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
+index 3031d6d..932b4d8 100644
+--- a/drivers/net/e1000e/netdev.c
++++ b/drivers/net/e1000e/netdev.c
+@@ -4095,6 +4095,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
++	{ PCI_VDEVICE(INTEL, 0x10be), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+ 
+ 	{ }	/* terminate list */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- kernel.spec	25 Feb 2008 22:32:56 -0000	1.451
+++ kernel.spec	26 Feb 2008 20:24:16 -0000	1.452
@@ -619,9 +619,8 @@
 Patch1802: nouveau-drm.patch
 Patch1803: linux-2.6-ppc32-ucmpdi2.patch
 
-# Work around E1000 corrupt EEPROM problem.
-Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
-Patch2001: linux-2.6-netdev-e1000-disable-alpm.patch
+# kludge to make ich9 e1000 work
+Patch2000: linux-2.6-e1000-ich9.patch
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
@@ -1127,8 +1126,7 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
-ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
-ApplyPatch linux-2.6-netdev-e1000-disable-alpm.patch
+ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 # Nouveau DRM + drm fixes
@@ -1737,6 +1735,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Tue Feb 26 2008 Dave Jones <davej at redhat.com>
+- kludge to make ich9 e1000 work
+- Drop older unnecessary e1000 workarounds.
+
 * Mon Feb 25 2008 Jarod Wilson <jwilson at redhat.com>
 - firewire: fix crashes in workqueue jobs
 - firewire: endian fixes