From patchwork Tue Dec 11 18:38:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 205290 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 9EC332C007D for ; Wed, 12 Dec 2012 05:38:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753552Ab2LKSid (ORCPT ); Tue, 11 Dec 2012 13:38:33 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:65245 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab2LKSic (ORCPT ); Tue, 11 Dec 2012 13:38:32 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so3081439pad.19 for ; Tue, 11 Dec 2012 10:38:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=qpgeimNMDE0mjO+AnivbdJQ6GEKlSnc+8hmHsLgVJNg=; b=H9kWT3/1+OT5ohUhGDOAkeFonlmb81J7fajQ2zw8UtLXtKbjXVdBIjAsEI8smrGcXk peNuBcsymxbHIK6En2gJ993OXPMsrDejnh0KnPw24N4vkQfVOmUgZIWLx54do2YKE/ld JaOq+aW0vkVS3v/1zmM0zNtxyfV7XZ0Z+NHFgL4PCcKU6yNXqGgwZDB8Fv9iTLpzeXru HBa8aJKc6j/mbyIrDH1LjJ/HAVbqH4HJpJvJArSvx7Bfb6/YlmzRksUd9RcR7ztO1cGY P2jDnJAhb43athLtVjZ+p1KeDTTgsR6UrcULFenG4gYZPVXttQTUSw52liiNdpFHSpHa gb9Q== Received: by 10.66.82.162 with SMTP id j2mr36155461pay.13.1355251111929; Tue, 11 Dec 2012 10:38:31 -0800 (PST) Received: from ?IPv6:2620:0:1000:3304:224:d7ff:fee3:2a94? ([2620:0:1000:3304:224:d7ff:fee3:2a94]) by mx.google.com with ESMTPS id ue7sm14147221pbc.53.2012.12.11.10.38.30 (version=SSLv3 cipher=OTHER); Tue, 11 Dec 2012 10:38:31 -0800 (PST) Subject: [PATCH net-next] net: gro: avoid double copy in skb_gro_receive() From: Eric Dumazet To: David Miller Cc: netdev Date: Tue, 11 Dec 2012 10:38:29 -0800 Message-ID: <1355251109.27891.114.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet __copy_skb_header(nskb, p) already copied p->cb[], no need to copy it again. Signed-off-by: Eric Dumazet --- net/core/skbuff.c | 1 - 1 file changed, 1 deletion(-) -- 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 diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ccbabf5..ac9e44a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3028,7 +3028,6 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) memcpy(skb_mac_header(nskb), skb_mac_header(p), p->data - skb_mac_header(p)); - *NAPI_GRO_CB(nskb) = *NAPI_GRO_CB(p); skb_shinfo(nskb)->frag_list = p; skb_shinfo(nskb)->gso_size = pinfo->gso_size; pinfo->gso_size = 0;