diff mbox

r8169: fix checksum broken

Message ID 4CE0A994.4080606@cn.fujitsu.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Shan Wei Nov. 15, 2010, 3:31 a.m. UTC 
Francois Romieu wrote, at 11/13/2010 07:13 AM:
> Francois Romieu <romieu@fr.zoreil.com> :
> [...]
>> Which kind of device do you use : PCI-E 8168 / 810x or PCI 8169 ?
> 
> Wrong page. Forget it.
> 
> Acked-by: Francois Romieu <romieu@fr.zoreil.com>

While grepping IPFail variable, maybe cp_rx_csum_ok() in 8139cp driver also has same bug.
There is no NIC on hand using RealTek RTL-8139C+ series 10/100 PCI Ethernet driver, 
So don't confirm it.

Comments

Francois Romieu Nov. 15, 2010, 9:01 p.m. UTC | #1 
Shan Wei <shanwei@cn.fujitsu.com> :
[...]
> 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. 

The documentation of these bits is identical for the 8139c+ and the 8169.
David Miller Nov. 17, 2010, 7:55 p.m. UTC | #2 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Mon, 15 Nov 2010 22:01:23 +0100

> Shan Wei <shanwei@cn.fujitsu.com> :
> [...]
>> 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. 
> 
> The documentation of these bits is identical for the 8139c+ and the 8169.

Also applied, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

===
[PATCH] 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: Shan Wei <shanwei@cn.fujitsu.com>
---
 drivers/net/8139cp.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index ac422cd..dd16e83 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -490,13 +490,11 @@  static inline unsigned int cp_rx_csum_ok (u32 status)
 {
 	unsigned int protocol = (status >> 16) & 0x3;
 
-	if (likely((protocol == RxProtoTCP) && (!(status & TCPFail))))
+	if (((protocol == RxProtoTCP) && !(status & TCPFail)) ||
+	    ((protocol == RxProtoUDP) && !(status & UDPFail)))
 		return 1;
-	else if ((protocol == RxProtoUDP) && (!(status & UDPFail)))
-		return 1;
-	else if ((protocol == RxProtoIP) && (!(status & IPFail)))
-		return 1;
-	return 0;
+	else
+		return 0;
 }
 
 static int cp_rx_poll(struct napi_struct *napi, int budget)