From patchwork Tue Apr 10 14:26:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 151599 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 354DCB700C for ; Wed, 11 Apr 2012 00:33:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758890Ab2DJOdC (ORCPT ); Tue, 10 Apr 2012 10:33:02 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:56112 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758789Ab2DJOck (ORCPT ); Tue, 10 Apr 2012 10:32:40 -0400 X-IronPort-AV: E=Sophos;i="4.75,399,1330923600"; d="scan'208";a="189657716" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 10 Apr 2012 10:31:40 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Tue, 10 Apr 2012 10:31:40 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] ident=ianc) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SHc1Z-0001r9-0D; Tue, 10 Apr 2012 15:26:25 +0100 From: Ian Campbell To: netdev@vger.kernel.org CC: David Miller , Eric Dumazet , "Michael S. Tsirkin" , Wei Liu , xen-devel@lists.xen.org, Ian Campbell Subject: [PATCH 02/10] net: Use SKB_WITH_OVERHEAD in build_skb Date: Tue, 10 Apr 2012 15:26:16 +0100 Message-ID: <1334067984-7706-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1334067965.5394.22.camel@zakaz.uk.xensource.com> References: <1334067965.5394.22.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ian Campbell Acked-by: Eric Dumazet --- net/core/skbuff.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 59a1ecb..d4e139e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -264,7 +264,7 @@ struct sk_buff *build_skb(void *data) if (!skb) return NULL; - size = ksize(data) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + size = SKB_WITH_OVERHEAD(ksize(data)); memset(skb, 0, offsetof(struct sk_buff, tail)); skb->truesize = SKB_TRUESIZE(size);