rpms/kernel/F-8 linux-2.6-e1000-corrupt-eeprom-checksum.patch, NONE, 1.1 kernel.spec, 1.219, 1.220
Dave Jones (davej)
fedora-extras-commits at redhat.com
Mon Oct 15 18:39:07 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9370
Modified Files:
kernel.spec
Added Files:
linux-2.6-e1000-corrupt-eeprom-checksum.patch
Log Message:
* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
- Work around E1000 corrupt EEPROM problem.
linux-2.6-e1000-corrupt-eeprom-checksum.patch:
--- NEW FILE linux-2.6-e1000-corrupt-eeprom-checksum.patch ---
http://www.thinkwiki.org/wiki/Problem_with_e1000:_EEPROM_Checksum_Is_Not_Valid
--- linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c~ 2007-10-15 14:29:07.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c 2007-10-15 14:31:11.000000000 -0400
@@ -1003,14 +1003,18 @@ e1000_probe(struct pci_dev *pdev,
goto err_eeprom;
}
- /* before reading the EEPROM, reset the controller to
- * put the device in a known good starting state */
-
- e1000_reset_hw(&adapter->hw);
-
- /* make sure the EEPROM is good */
-
if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+ /* before reading the EEPROM, reset the controller to
+ * put the device in a known good starting state */
+ e1000_reset_hw(&adapter->hw);
+
+ /* make sure the EEPROM is good */
+
+ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+ DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
+ goto err_eeprom;
+ }
+
DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
goto err_eeprom;
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kernel.spec 12 Oct 2007 22:55:54 -0000 1.219
+++ kernel.spec 15 Oct 2007 18:38:34 -0000 1.220
@@ -686,6 +686,8 @@
Patch1801: nouveau-drm.patch
# Fix lockdep bug in firewire.
Patch1900: linux-2.6-firewire-lockdep.patch
+# Work around E1000 corrupt EEPROM problem.
+Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
%endif
@@ -1235,6 +1237,7 @@
ApplyPatch linux-2.6-lirc.patch
ApplyPatch linux-2.6-firewire-lockdep.patch
+ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
# ---------- below all scheduled for 2.6.24 -----------------
@@ -1829,6 +1832,9 @@
%changelog
+* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
+- Work around E1000 corrupt EEPROM problem.
+
* Fri Oct 12 2007 Dave Jones <davej at redhat.com>
- Disable debug, start doing -debug builds again.
More information about the scm-commits
mailing list