Patchwork ipcomp: Remove spurious truesize increase

login
register
mail settings
Submitter Herbert Xu
Date Jan. 9, 2009, 7:27 a.m.
Message ID <20090109072706.GA7599@gondor.apana.org.au>
Download mbox | patch
Permalink /patch/17474/
State Accepted
Delegated to: David Miller
Headers show

Comments

Herbert Xu - Jan. 9, 2009, 7:27 a.m.
Hi Dave:

ipcomp: Remove spurious truesize increase

When I made ipcomp use frags, I forgot to take out the original
truesize update that was added for pskb_expand_head.  As we no
longer expand the head of skb, that update should have been removed.

This bug is not related to the truesize warnings since we only
made it bigger than what it should've been.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>


Cheers,
David Miller - Jan. 10, 2009, 7:07 a.m.
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 9 Jan 2009 18:27:06 +1100

> ipcomp: Remove spurious truesize increase
> 
> When I made ipcomp use frags, I forgot to take out the original
> truesize update that was added for pskb_expand_head.  As we no
> longer expand the head of skb, that update should have been removed.
> 
> This bug is not related to the truesize warnings since we only
> made it bigger than what it should've been.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index c609a4b..42cd183 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -63,7 +63,6 @@  static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
 	if (len > skb_tailroom(skb))
 		len = skb_tailroom(skb);
 
-	skb->truesize += len;
 	__skb_put(skb, len);
 
 	len += plen;