From patchwork Wed May 7 23:51:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 346851 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 5FECF1400A3 for ; Thu, 8 May 2014 09:52:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752743AbaEGXv7 (ORCPT ); Wed, 7 May 2014 19:51:59 -0400 Received: from mail-pd0-f201.google.com ([209.85.192.201]:59005 "EHLO mail-pd0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752300AbaEGXv6 (ORCPT ); Wed, 7 May 2014 19:51:58 -0400 Received: by mail-pd0-f201.google.com with SMTP id r10so297424pdi.4 for ; Wed, 07 May 2014 16:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:subject:message-id:user-agent:mime-version :content-type; bh=DG5z1MZBYSzRrQctySG1UoMlijkfH76FGFyUsqehw+E=; b=eV2sAWQwwiGh1wM1+4bivUmaK6dN3Ip/nReWS+F1FDJwJURqbWSf9brgGsXs5xxe0L otlO4aufbAqAiZtmgmBrduoPpAwQP0ad6jG2BwMDx3Gg3GzxxgIj9C5HEcUNXLpPesLk 4dGXyqeZ8eGzD9e/EeNHqn6H/zwg93VegMPgSkHkPngR5wgUTPTrUQoAOHtq90LMk5h6 u1kE8fvWQjE8AlutVV5pUqsyDMfA4qTx+TrarAxfgxidqvQyhOl16COEhWmNnFcQw5Re pItFQ8EyExHTqseUy0aWRKEuVrWNeZgQ0yFtsJMmwcx0K01cYtNBZYRwxZvwIZ8BHzjT 6+pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-type; bh=DG5z1MZBYSzRrQctySG1UoMlijkfH76FGFyUsqehw+E=; b=N16V9IetOG0q9HXuPFueq3MvUZnVUwqHERkfxAUpyqSenAi3pHannsbHcQ6nTNehov 151pCpgeaReLAePZdGNhUhRkwpfjeR7FjYUn/7mOuKCF7vVdou4Xq3WAsE35IK0N7A2Z ThqPsj3ydhpIdma1S5fYm0nEFMQI7awlLtuVHw9E7hcticPAczlVJZTKx69dgPCO7A4R g3CBrtU4qBcFwJp/vhpEELx3ezNQYdYWfqzQ6VRHBYSbE1n8YHNBkr/tjNFFBeM2QEh0 RevdFxccNXDw1Nw/NneJTzfImmI1RfkgzP3eWUJPsq128+EWdANzglWXbaPMOI+XFZmi /j+Q== X-Gm-Message-State: ALoCoQmtrEOO0ggCUWaQ4VXdWmmwiM14d/aHwnb2bjg2KfIaJNCrrfKC7lsnDTY5TOPlJY7ggPTF X-Received: by 10.66.66.35 with SMTP id c3mr6017534pat.7.1399506718055; Wed, 07 May 2014 16:51:58 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id a44si765292yhb.6.2014.05.07.16.51.58 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 May 2014 16:51:58 -0700 (PDT) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.18.117.126]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id D62C95A41A5; Wed, 7 May 2014 16:51:57 -0700 (PDT) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 9940620095C; Wed, 7 May 2014 16:51:57 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 8DD5920042C; Wed, 7 May 2014 16:51:57 -0700 (PDT) Date: Wed, 7 May 2014 16:51:57 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 2/7] gre6: Call skb_checksum_simple_validate Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use skb_checksum_simple_validate to verify checksum. Signed-off-by: Tom Herbert --- net/ipv6/ip6_gre.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 75277b7..3873181 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -468,17 +468,7 @@ static int ip6gre_rcv(struct sk_buff *skb) goto drop; if (flags&GRE_CSUM) { - switch (skb->ip_summed) { - case CHECKSUM_COMPLETE: - csum = csum_fold(skb->csum); - if (!csum) - break; - /* fall through */ - case CHECKSUM_NONE: - skb->csum = 0; - csum = __skb_checksum_complete(skb); - skb->ip_summed = CHECKSUM_COMPLETE; - } + csum = skb_checksum_simple_validate(skb); offset += 4; } if (flags&GRE_KEY) {