This is a note to let you know that I've just added the patch titled

    r8169: fix checksum broken

to the 2.6.36-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     r8169-fix-checksum-broken.patch
and it can be found in the queue-2.6.36 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From d5d3ebe3be5c5123f2d444e186717f45284151e2 Mon Sep 17 00:00:00 2001
From: Shan Wei <[email protected]>
Date: Fri, 12 Nov 2010 00:15:25 +0000
Subject: r8169: fix checksum broken

From: Shan Wei <[email protected]>

commit d5d3ebe3be5c5123f2d444e186717f45284151e2 upstream.

If r8196 received packets with invalid sctp/igmp(not tcp, udp) checksum, r8196 
set skb->ip_summed
wit CHECKSUM_UNNECESSARY. This cause that upper protocol don't check checksum 
field.

I am not family with r8196 driver. I try to guess the meaning of RxProtoIP and 
IPFail.
RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and 
udp.
!(opts1 & IPFail) is true means that driver correctly to check checksum in IPv4 
header.

If it's right, I think we should not set ip_summed wit CHECKSUM_UNNECESSARY for 
my sctp packets
with invalid checksum.

If it's not right, please tell me.

Signed-off-by: Shan Wei <[email protected]>
Acked-by: Francois Romieu <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/net/r8169.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4460,8 +4460,7 @@ static inline void rtl8169_rx_csum(struc
        u32 status = opts1 & RxProtoMask;
 
        if (((status == RxProtoTCP) && !(opts1 & TCPFail)) ||
-           ((status == RxProtoUDP) && !(opts1 & UDPFail)) ||
-           ((status == RxProtoIP) && !(opts1 & IPFail)))
+           ((status == RxProtoUDP) && !(opts1 & UDPFail)))
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        else
                skb->ip_summed = CHECKSUM_NONE;


Patches currently in stable-queue which might be from [email protected] are

queue-2.6.36/r8169-fix-checksum-broken.patch

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to