From patchwork Fri Feb 15 03:31:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 220618 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 E690A2C0082 for ; Fri, 15 Feb 2013 14:31:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932701Ab3BODbv (ORCPT ); Thu, 14 Feb 2013 22:31:51 -0500 Received: from mail-ia0-f177.google.com ([209.85.210.177]:40316 "EHLO mail-ia0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932322Ab3BODbu (ORCPT ); Thu, 14 Feb 2013 22:31:50 -0500 Received: by mail-ia0-f177.google.com with SMTP id k38so2957186iah.36 for ; Thu, 14 Feb 2013 19:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=cLmxLH8wgOJIEhnySJA3NMPAUsQzwrxm1DqnnbLGyKg=; b=g6xW/US55287IQQipleVg6P9HzOr8+FJpXM6Jz4gO/8MRBLpN8Gi8qplXRuxFisPtN LJRUQ61frasEvLPKp5mYGJpUGvT9yj7vvIuWf5wjTkXUNm7qz1vllFwq6dKmsrRQCg69 HB5gdu8fIls++TR6N0fiEhnV4t1EOJ6kzQzcwfJ+jPCav72wu6+Dk1krPFqUOHte/EDv BzPXwX7NlNwoEEpkGrTvqXjp4chyYTZyUFd2Psgh6XaXnvbYC8DijlUkk9c1xsGxtWKK gkL3I9AlDxLgQeGISbFj7oEZlu0FVE6vfAdIn1GxmoJ6+UbZvmzYGh6+AVdJmXuFadFt pDqg== X-Received: by 10.50.108.145 with SMTP id hk17mr743309igb.51.1360899110296; Thu, 14 Feb 2013 19:31:50 -0800 (PST) Received: from ?IPv6:2620:0:1000:3304:d93c:33cf:67df:4588? ([2620:0:1000:3304:d93c:33cf:67df:4588]) by mx.google.com with ESMTPS id as6sm2379144igc.8.2013.02.14.19.31.48 (version=SSLv3 cipher=RC4-SHA bits=128/128); Thu, 14 Feb 2013 19:31:49 -0800 (PST) Message-ID: <1360899108.6884.77.camel@edumazet-glaptop> Subject: [PATCH net-next] net: use skb_reset_mac_len() in dev_gro_receive() From: Eric Dumazet To: David Miller Cc: netdev Date: Thu, 14 Feb 2013 19:31:48 -0800 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet We no longer need to use mac_len, lets cleanup things. Signed-off-by: Eric Dumazet --- net/core/dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 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/dev.c b/net/core/dev.c index f444736..09df22d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3784,7 +3784,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff __be16 type = skb->protocol; struct list_head *head = &offload_base; int same_flow; - int mac_len; enum gro_result ret; if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb)) @@ -3801,8 +3800,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff continue; skb_set_network_header(skb, skb_gro_offset(skb)); - mac_len = skb->network_header - skb->mac_header; - skb->mac_len = mac_len; + skb_reset_mac_len(skb); NAPI_GRO_CB(skb)->same_flow = 0; NAPI_GRO_CB(skb)->flush = 0; NAPI_GRO_CB(skb)->free = 0;