diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
| commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
| tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /net/ipv4/udp.c | |
| parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
| parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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) |