rpms/kernel/F-8 linux-2.6-e1000-bad-csum-allow.patch, NONE, 1.1 kernel.spec, 1.238, 1.239

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31326

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-e1000-bad-csum-allow.patch 
Log Message:
* Mon Oct 22 2007 Adam Jackson <ajax at redhat.com>
- Add e1000.eeprom_bad_csum_allow


linux-2.6-e1000-bad-csum-allow.patch:

--- NEW FILE linux-2.6-e1000-bad-csum-allow.patch ---
diff -up linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c.jx vanilla/drivers/net/e1000/e1000_main.c
--- linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c.jx	2007-10-09 16:31:38.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c	2007-10-22 16:33:01.000000000 -0400
@@ -255,6 +255,10 @@ static int debug = NETIF_MSG_DRV | NETIF
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
+static int eeprom_bad_csum_allow = 0;
+module_param(eeprom_bad_csum_allow, int, 0);
+MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
+
 /**
  * e1000_init_module - Driver Registration Routine
  *
@@ -1012,7 +1016,8 @@ e1000_probe(struct pci_dev *pdev,
 
 	if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
 		DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
-		goto err_eeprom;
+		if (!eeprom_bad_csum_allow)
+			goto err_eeprom;
 	}
 
 	/* copy the MAC address out of the EEPROM */
@@ -1024,7 +1029,8 @@ e1000_probe(struct pci_dev *pdev,
 
 	if (!is_valid_ether_addr(netdev->perm_addr)) {
 		DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
-		goto err_eeprom;
+		if (!eeprom_bad_csum_allow)
+			goto err_eeprom;
 	}
 
 	e1000_get_bus_info(&adapter->hw);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- kernel.spec	22 Oct 2007 03:04:28 -0000	1.238
+++ kernel.spec	22 Oct 2007 20:49:43 -0000	1.239
@@ -653,6 +653,7 @@
 Patch717: linux-2.6-netdev-e1000e-08.patch
 Patch718: linux-2.6-netdev-e1000e-09.patch
 Patch719: linux-2.6-netdev-e1000e-10.patch
+Patch720: linux-2.6-e1000-bad-csum-allow.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
 Patch770: linux-2.6-pmtrace-time-fix.patch
@@ -1198,6 +1199,9 @@
 ApplyPatch linux-2.6-netdev-e1000e-09.patch
 ApplyPatch linux-2.6-netdev-e1000e-10.patch
 
+# Workaround for flaky e1000 EEPROMs
+ApplyPatch linux-2.6-e1000-bad-csum-allow.patch
+
 # ACPI/PM patches
 # fix EC init
 ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
@@ -1862,6 +1866,9 @@
 
 
 %changelog
+* Mon Oct 22 2007 Adam Jackson <ajax at redhat.com>
+- Add e1000.eeprom_bad_csum_allow
+
 * Sun Oct 21 2007 Jarod Wilson <jwilson at redhat.com>
 - Log warning about unimplemented isochronous I/O on
   firewire ohci 1.0 controllers (bz #344851)