From patchwork Wed Nov 19 13:04:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 412377 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 C6E93140170 for ; Thu, 20 Nov 2014 00:05:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754963AbaKSNFO (ORCPT ); Wed, 19 Nov 2014 08:05:14 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:59485 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754888AbaKSNFI (ORCPT ); Wed, 19 Nov 2014 08:05:08 -0500 Received: by mail-wg0-f44.google.com with SMTP id b13so792961wgh.3 for ; Wed, 19 Nov 2014 05:05:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BZLg3bfhvSSreRjcx3R9/aRI2cMYFaRCYf4k/Yfusv8=; b=mgx0Dimnz5nZnu7wOXDALNtVmsPz3KrUw+uslJQ+PXYZ2Hkxv4L5/eGVyb8n7j0vi6 2TKHwNkriRn3a0q5Rh0+iSnQeFrSHF11wR1BRtkPjnV3TQc9xOsvGYnKpyAKFjIOrPoF eR5iTJ0vpc5syC7qiPjRTMF35xpR6tPWeDGG6ufSKkw9V88j59hffMthvUXk1v81o5pZ A/8/nSC4qpkhLdXeACHCnzQAT29PAvETflX29ME4LePoEeFXJBrMSFwf70nD91xOgOEw 9CSo+IAV0RhgvDzxTH70+Lh2k1ZZlPTY25NlHKhvNd0hr/7ItCvNcif029vzeJ5D9FIJ +t6w== X-Gm-Message-State: ALoCoQl8cIurWKnq4/mSvXTnrTdhsFj9JUtTQ8ujKoBKYPY++EuOUz+3cw4rs8bVpVsGNv6SBm+E X-Received: by 10.180.102.135 with SMTP id fo7mr5497418wib.79.1416402306111; Wed, 19 Nov 2014 05:05:06 -0800 (PST) Received: from localhost (ip-94-113-123-0.net.upcbroadband.cz. [94.113.123.0]) by mx.google.com with ESMTPSA id nc11sm2193679wic.0.2014.11.19.05.05.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2014 05:05:05 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, pshelar@nicira.com, therbert@google.com, edumazet@google.com, willemb@google.com, dborkman@redhat.com, mst@redhat.com, fw@strlen.de, Paul.Durrant@citrix.com, tgraf@suug.ch, cwang@twopensource.com Subject: [patch net-next v4 1/9] openvswitch: actions: use skb_postpull_rcsum when possible Date: Wed, 19 Nov 2014 14:04:55 +0100 Message-Id: <1416402303-25341-2-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1416402303-25341-1-git-send-email-jiri@resnulli.us> References: <1416402303-25341-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace duplicated code by calling skb_postpull_rcsum Suggested-by: Eric Dumazet Signed-off-by: Jiri Pirko Acked-by: Pravin B Shelar Acked-by: Simon Horman --- net/openvswitch/actions.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 394efa6..749a301 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -175,10 +175,7 @@ static int pop_mpls(struct sk_buff *skb, struct sw_flow_key *key, if (unlikely(err)) return err; - if (skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_sub(skb->csum, - csum_partial(skb_mpls_header(skb), - MPLS_HLEN, 0)); + skb_postpull_rcsum(skb, skb_mpls_header(skb), MPLS_HLEN); memmove(skb_mac_header(skb) + MPLS_HLEN, skb_mac_header(skb), skb->mac_len); @@ -230,9 +227,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) if (unlikely(err)) return err; - if (skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_sub(skb->csum, csum_partial(skb->data - + (2 * ETH_ALEN), VLAN_HLEN, 0)); + skb_postpull_rcsum(skb, skb->data + (2 * ETH_ALEN), VLAN_HLEN); vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN); *current_tci = vhdr->h_vlan_TCI;