From: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon, 10 May 2010 05:39:10 +0000 (+0000)
Subject: netdev: bfin_mac: clear RXCKS if hardware generated checksum is not enabled
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=812a9de71512e5da6f3177f7249a2448b6a4322e;p=linux-beck.git

netdev: bfin_mac: clear RXCKS if hardware generated checksum is not enabled

Otherwise we might be get a setting mismatch from a previous module or
bootloader and what the driver currently expects.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 9e010d69f34a..5d962b86ee22 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -515,10 +515,11 @@ void setup_system_regs(struct net_device *dev)
 	 * Configure checksum support and rcve frame word alignment
 	 */
 	sysctl = bfin_read_EMAC_SYSCTL();
+	sysctl |= RXDWA;
 #if defined(BFIN_MAC_CSUM_OFFLOAD)
-	sysctl |= RXDWA | RXCKS;
+	sysctl |= RXCKS;
 #else
-	sysctl |= RXDWA;
+	sysctl &= ~RXCKS;
 #endif
 	bfin_write_EMAC_SYSCTL(sysctl);