summaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 17:19:10 +0200
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 17:19:10 +0200
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /net/ipv4/udp.c
parentMerge branch 'master' of /usr/src/linux-2.6 (diff)
parentMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff)
downloadlinux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.xz
linux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c2
1 files changed, 1 insertions, 1 deletions
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)