From patchwork Sun Oct 24 02:28:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
X-Patchwork-Id: 265242
X-Patchwork-Delegate: deller@gmx.de
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9O2T1om022010
	for <patchwork-parisc@patchwork.kernel.org>;
	Sun, 24 Oct 2010 02:29:01 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754325Ab0JXC3B (ORCPT
	<rfc822;patchwork-parisc@patchwork.kernel.org>);
	Sat, 23 Oct 2010 22:29:01 -0400
Received: from artax.karlin.mff.cuni.cz ([195.113.26.195]:46675 "EHLO
	artax.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753443Ab0JXC3B (ORCPT
	<rfc822;linux-parisc@vger.kernel.org>);
	Sat, 23 Oct 2010 22:29:01 -0400
Received: by artax.karlin.mff.cuni.cz (Postfix, from userid 17421)
	id 3851498064; Sun, 24 Oct 2010 04:29:00 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by artax.karlin.mff.cuni.cz (Postfix) with ESMTP id DD43698062;
	Sun, 24 Oct 2010 04:28:59 +0200 (CEST)
Date: Sun, 24 Oct 2010 04:28:59 +0200 (CEST)
From: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
To: e1000-devel@lists.sourceforge.net, linux-parisc@vger.kernel.org
cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [PATCH] e1000: Allow the driver to be used on PA RISC C8000
	workstation
Message-ID: <alpine.DEB.1.10.1010240417160.30241@artax.karlin.mff.cuni.cz>
User-Agent: Alpine 1.10 (DEB 962 2008-03-14)
X-Personality-Disorder: Schizoid
MIME-Version: 1.0
Sender: linux-parisc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Sun, 24 Oct 2010 02:29:01 +0000 (UTC)


Index: linux-2.6.36-rc8/drivers/net/e1000/e1000_hw.c
===================================================================
--- linux-2.6.36-rc8.orig/drivers/net/e1000/e1000_hw.c	2010-10-24 04:01:03.000000000 +0200
+++ linux-2.6.36-rc8/drivers/net/e1000/e1000_hw.c	2010-10-24 04:25:22.000000000 +0200
@@ -3840,6 +3840,12 @@ s32 e1000_validate_eeprom_checksum(struc
 		checksum += eeprom_data;
 	}
 
+#ifdef __hppa__
+	/* This seems to be a signature and not a checksum on HP c8000 */
+	if (eeprom_data == 0x16d6)
+		return E1000_SUCCESS;
+#endif
+
 	if (checksum == (u16) EEPROM_SUM)
 		return E1000_SUCCESS;
 	else {