Message ID | 1314751777-13772-1-git-send-email-jeffrey.t.kirsher@intel.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Tue, 30 Aug 2011 17:49:37 -0700 > The checksum field in the EEPROM on HPPA is really not a > checksum but a signature (0x16d6). So allow 0x16d6 as the > matching checksum on HPPA systems. > > This issue is present on longterm/stable kernels, I have > verified that this patch is applicable back to at least > 2.6.32.y kernels. > > v2- changed ifdef to use CONFIG_PARISC instead of __hppa__ > > CC: Guy Martin <gmsoft@tuxicoman.be> > CC: Rolf Eike Beer <eike-kernel@sf-tec.de> > CC: Matt Turner <mattst88@gmail.com> > Reported-by: Mikulas Patocka <mikulas@artax.kerlin.mff.cuni.cz> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Applied, thanks Jeff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Aug 30, 2011 at 05:49:37PM -0700, Jeff Kirsher wrote: > The checksum field in the EEPROM on HPPA is really not a > checksum but a signature (0x16d6). So allow 0x16d6 as the > matching checksum on HPPA systems. > > This issue is present on longterm/stable kernels, I have > verified that this patch is applicable back to at least > 2.6.32.y kernels. > > v2- changed ifdef to use CONFIG_PARISC instead of __hppa__ > > CC: Guy Martin <gmsoft@tuxicoman.be> > CC: Rolf Eike Beer <eike-kernel@sf-tec.de> > CC: Matt Turner <mattst88@gmail.com> > Reported-by: Mikulas Patocka <mikulas@artax.kerlin.mff.cuni.cz> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > --- <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly. </formletter> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 8545c7a..a5a89ec 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -4026,6 +4026,12 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw) checksum += eeprom_data; } +#ifdef CONFIG_PARISC + /* This is a signature and not a checksum on HP c8000 */ + if ((hw->subsystem_vendor_id == 0x103C) && (eeprom_data == 0x16d6)) + return E1000_SUCCESS; + +#endif if (checksum == (u16) EEPROM_SUM) return E1000_SUCCESS; else {