diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
| commit | 49666145de54b5d6d256442bb1bec03ffae1ac76 (patch) | |
| tree | b79bcaabffa18847cab31efdf798dc5740e8d73b /net/ipv6/ip6_output.c | |
| parent | bcd68373877e74d8ca5039c10dc5d699ba5dc7d0 (diff) | |
| parent | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 69451af6abe7..4fb47a252913 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -1095,7 +1095,7 @@ alloc_new_skb: | |||
| 1095 | skb_prev->csum = csum_sub(skb_prev->csum, | 1095 | skb_prev->csum = csum_sub(skb_prev->csum, |
| 1096 | skb->csum); | 1096 | skb->csum); |
| 1097 | data += fraggap; | 1097 | data += fraggap; |
| 1098 | skb_trim(skb_prev, maxfraglen); | 1098 | pskb_trim_unique(skb_prev, maxfraglen); |
| 1099 | } | 1099 | } |
| 1100 | copy = datalen - transhdrlen - fraggap; | 1100 | copy = datalen - transhdrlen - fraggap; |
| 1101 | if (copy < 0) { | 1101 | if (copy < 0) { |