From a323727eefc0e8c11375e1723e2ee1479043f833 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 24 May 2007 15:22:44 -0700
Subject: [PATCH] --- yaml --- r: 57100 b: refs/heads/master c:
 56069c0fdd3a4db5769df30c9700cd3bc002fc48 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef9515d62957..3069b2d3b7fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ed372b29e458021293e1c791d92d90f1bf5fe3
+refs/heads/master: 56069c0fdd3a4db5769df30c9700cd3bc002fc48
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index d9bc98bd8af7..7d94eabaff81 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1432,7 +1432,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 		tcpsum = offset << 16;		/* sum start */
 		tcpsum |= offset + skb->csum_offset;	/* sum write */
 
-		ctrl = CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
+		ctrl |= CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
 		if (ip_hdr(skb)->protocol == IPPROTO_UDP)
 			ctrl |= UDPTCP;