summaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-05-25 00:22:44 +0200
committerJeff Garzik <jeff@garzik.org>2007-05-30 15:52:47 +0200
commit56069c0fdd3a4db5769df30c9700cd3bc002fc48 (patch)
treebfcf7c70991d6ec4c9a94e51f04ade9e97d7a43d /drivers/net/sky2.c
parentsky2: dont set bogus bit in PHY register (diff)
downloadlinux-56069c0fdd3a4db5769df30c9700cd3bc002fc48.tar.xz
linux-56069c0fdd3a4db5769df30c9700cd3bc002fc48.zip
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>
Diffstat (limited to '')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index d9bc98bd8af7..7d94eabaff81 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;