From patchwork Fri Jan 9 07:27:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 17474 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id CF0F0DE5A8 for ; Fri, 9 Jan 2009 18:27:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbZAIH1M (ORCPT ); Fri, 9 Jan 2009 02:27:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752081AbZAIH1M (ORCPT ); Fri, 9 Jan 2009 02:27:12 -0500 Received: from rhun.apana.org.au ([64.62.148.172]:43865 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751570AbZAIH1L (ORCPT ); Fri, 9 Jan 2009 02:27:11 -0500 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1LLBlt-00080F-8p; Fri, 09 Jan 2009 18:27:09 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1LLBlr-0002aI-9x; Fri, 09 Jan 2009 18:27:07 +1100 Date: Fri, 9 Jan 2009 18:27:06 +1100 From: Herbert Xu To: "David S. Miller" , netdev@vger.kernel.org Subject: ipcomp: Remove spurious truesize increase Message-ID: <20090109072706.GA7599@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cheers, 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;