2.6.36-stable review patch.  If anyone has any objections, please let us know.

------------------

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;


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

Reply via email to