From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 8 Sep 2005 19:32:21 +0000 (-0700)
Subject: [IPV4] udp: trim forgets about CHECKSUM_HW
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e308e25c97f06cf704e65eeb773412f5460a3b93;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[IPV4] udp: trim forgets about CHECKSUM_HW

A UDP packet may contain extra data that needs to be trimmed off.
But when doing so, UDP forgets to fixup the skb checksum if CHECKSUM_HW
is being used.

I think this explains the case of a NFS receive using skge driver
causing 'udp hw checksum failures' when interacting with a crufty
settop box.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index e5beca7de86c..e0bd1013cb0d 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1141,7 +1141,7 @@ int udp_rcv(struct sk_buff *skb)
 	if (ulen > len || ulen < sizeof(*uh))
 		goto short_packet;
 
-	if (pskb_trim(skb, ulen))
+	if (pskb_trim_rcsum(skb, ulen))
 		goto short_packet;
 
 	if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0)