Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263937
b: refs/heads/master
c: e2faeec
h: refs/heads/master
i:
  263935: 2aeffdc
v: v3
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed Aug 31, 2011
1 parent a9081d2 commit 5b15c33
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31a0479546a7f91ec959560be01a0b1243a2b20c
refs/heads/master: e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2
6 changes: 6 additions & 0 deletions trunk/drivers/net/e1000/e1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 5b15c33

Please sign in to comment.