diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 23:16:33 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 23:16:33 +0200 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /net/ipv6/ip6_output.c | |
| parent | [CPUFREQ] Fix sparse warning in ondemand (diff) | |
| parent | Linux 2.6.18-rc6 (diff) | |
| download | linux-23e735bc7b0e1d614656881794257b4224efda3a.tar.xz linux-23e735bc7b0e1d614656881794257b4224efda3a.zip | |
Merge ../linus
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: skb_prev->csum = csum_sub(skb_prev->csum, skb->csum); data += fraggap; - skb_trim(skb_prev, maxfraglen); + pskb_trim_unique(skb_prev, maxfraglen); } copy = datalen - transhdrlen - fraggap; if (copy < 0) { |