Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=56069c0fdd3a4db5769df30c9700cd3bc002fc48
Commit:     56069c0fdd3a4db5769df30c9700cd3bc002fc48
Parent:     b4ed372b29e458021293e1c791d92d90f1bf5fe3
Author:     Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Thu May 24 15:22:44 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Wed May 30 09:52:47 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index d9bc98b..7d94eab 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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to