Commit 24b7ea9f authored by Shan Wei's avatar Shan Wei Committed by David S. Miller

8139cp: fix checksum broken

I am not family with RealTek RTL-8139C+ series 10/100 PCI Ethernet 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.
!(status & IPFail) is true means that driver correctly to check checksum in IPv4 header.

If these are right, driver will set ip_summed with CHECKSUM_UNNECESSARY for other
upper protocol, e.g. sctp, igmp protocol. This will cause protocol stack ignores
checksum check for packets with invalid checksum.

This patch is only compile-test.
Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5d3ebe3
...@@ -490,12 +490,10 @@ static inline unsigned int cp_rx_csum_ok (u32 status) ...@@ -490,12 +490,10 @@ static inline unsigned int cp_rx_csum_ok (u32 status)
{ {
unsigned int protocol = (status >> 16) & 0x3; unsigned int protocol = (status >> 16) & 0x3;
if (likely((protocol == RxProtoTCP) && (!(status & TCPFail)))) if (((protocol == RxProtoTCP) && !(status & TCPFail)) ||
return 1; ((protocol == RxProtoUDP) && !(status & UDPFail)))
else if ((protocol == RxProtoUDP) && (!(status & UDPFail)))
return 1;
else if ((protocol == RxProtoIP) && (!(status & IPFail)))
return 1; return 1;
else
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment