[PATCH 2.6.34 4/4] r8169: fix broken checksum for invalid sctp/igmp packets

Stanislaw Gruszka sgruszka at redhat.com
Fri Nov 26 13:03:36 UTC 2010


From: Shan Wei <shanwei at cn.fujitsu.com>

Commit d5d3ebe3be5c5123f2d444e186717f45284151e2 upstream.

Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
 drivers/net/r8169.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 7ca9d39..3ec0d63 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4425,8 +4425,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->ip_summed = CHECKSUM_NONE;
-- 
1.7.3.2



More information about the kernel mailing list