Commit d5d3ebe3 authored Nov 12, 2010 by Shan Wei Committed by David S. Miller Nov 17, 2010

r8169: fix checksum broken



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 <shanwei@cn.fujitsu.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 218854af

drivers/net/r8169.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -4440,8 +4440,7 @@ static inline void rtl8169_rx_csum(struct sk_buff *skb, u32 opts1)
		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_checksum_none_assert(skb);

Admin message