From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 24 May 2007 22:22:44 +0000 (-0700)
Subject: sky2: checksum offload plus vlan bug
X-Git-Tag: v2.6.22-rc4~90^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56069c0fdd3a4db5769df30c9700cd3bc002fc48;p=linux-2.6

sky2: checksum offload plus vlan bug

Driver was not correctly setting up transmit descriptor when doing
VLAN tag insertion with checksum offload.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index d9bc98bd8a..7d94eabaff 100644
--- a/drivers/net/sky2.c
+++ b/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;