---

yaml --- r: 195153 b: refs/heads/master c: 812a9de h: refs/heads/master i: 195151: 646e84c v: v3
git-mirror · May 18, 2010 · 87b5183 · 87b5183
1 parent 496f10e
commit 87b5183
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad2864d88718714d8b347b6209b07abb2ecd3a49
+refs/heads/master: 812a9de71512e5da6f3177f7249a2448b6a4322e
diff --git a/trunk/drivers/net/bfin_mac.c b/trunk/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);