diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /net/ipv4/udp.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
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.c | 2 |
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) | |||
| 1141 | if (ulen > len || ulen < sizeof(*uh)) | 1141 | if (ulen > len || ulen < sizeof(*uh)) |
| 1142 | goto short_packet; | 1142 | goto short_packet; |
| 1143 | 1143 | ||
| 1144 | if (pskb_trim(skb, ulen)) | 1144 | if (pskb_trim_rcsum(skb, ulen)) |
| 1145 | goto short_packet; | 1145 | goto short_packet; |
| 1146 | 1146 | ||
| 1147 | if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0) | 1147 | if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0) |