From patchwork Thu Aug 28 04:27:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 383785 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 C8B4A1400F0 for ; Thu, 28 Aug 2014 21:18:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965779AbaH1LSZ (ORCPT ); Thu, 28 Aug 2014 07:18:25 -0400 Received: from mail-qg0-f74.google.com ([209.85.192.74]:32890 "EHLO mail-qg0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965685AbaH1LSX (ORCPT ); Thu, 28 Aug 2014 07:18:23 -0400 X-Greylist: delayed 22958 seconds by postgrey-1.27 at vger.kernel.org; Thu, 28 Aug 2014 07:18:23 EDT Received: by mail-qg0-f74.google.com with SMTP id a108so176515qge.1 for ; Thu, 28 Aug 2014 04:18:22 -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=B3qUrBC25rjL2xYIw2xRjEW47iAcUyc1tteZvFJRjjs=; b=RRe7ftW6p3HMk+g5cf4CTuxY2qU6eaMvtqNrEeWiBx+EmTEx7wZMsVBSOfFAMaGG/y p7TC/BeU0BYtZC2J4OzY2Sg1BjM/AuZ0VlnqiBKw0YLRE9Oh/ILuNYHUWsFSgZOZVGoN 8VKTj+XBVRq5wFRymAPkEXoHtmmkszBafHoH7wRaep2e31JWlpHVXNPbSyqV8288b4Xo zizPCZpYmu/3mxcjQWBY+nuzaVfiHu4EHBdjTH9twgaVvt2/oCdiYMqwzbdSFW+zhBSq 06hXOsVMtWweNdJwmr4jk68Bw8lKUJMGzgKRTvdUzm2CzqfDDV1/S9qn7+MnhDBr9Y8O i8Tw== 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=B3qUrBC25rjL2xYIw2xRjEW47iAcUyc1tteZvFJRjjs=; b=CdBJ96Pc4KjVmOWR8uwOSiWN/ncrM8T4/hUI8o0/W1kQOKrFfonlTzuwqCWjspz9Lx T2IrvTb6R22rXXwJ+URR1fsn5mtjnJ9F7n/JxUN9wdB7gKjJjnCZWBGbxdqOZ1fd9Ml7 DuViBF1bVGIv+KyHdpFD8+GfnHdVCT1cO0pQfqdpQUfgmbLSzsOHQfCtrxVQIjuovOXO t8ukNxbq6cHfqvze29yRCwrCfIWJQQaLdjCB+yD7F8D0mOaAQzqSawwtbvLGUClU4Lrn 6GwuS9FDARQjqflOfxvipo6NSJc90VRcVuQeM8TsCrkupFt9p7M8PJxsdwwEHPQXS+H4 sg4A== X-Gm-Message-State: ALoCoQnBKkSJ4OeZt9QHhyWUe6zk4gr6fEnLDtAp4+53kpe4yWv8aSbKBg5IMVI91FlMClwKrog8 X-Received: by 10.224.21.129 with SMTP id j1mr1799937qab.7.1409224702293; Thu, 28 Aug 2014 04:18:22 -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 d7si198515yho.2.2014.08.28.04.18.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 04:18:22 -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 AB6F92F4849; Wed, 27 Aug 2014 21:27:32 -0700 (PDT) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 6CC28200B5D; Wed, 27 Aug 2014 21:27:32 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 6373920064B; Wed, 27 Aug 2014 21:27:32 -0700 (PDT) Date: Wed, 27 Aug 2014 21:27:32 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH v2 net-next 6/9] i40e: Set skb->csum_level for encapsulated checksum 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 Set skb->csum_level instead of skb->encapsulation when indicating CHECKSUM_UNNECESSARY for an encapsulated checksum. Signed-off-by: Tom Herbert --- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index a51aa37..4dec093 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -1213,7 +1213,6 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, ipv6_tunnel = (rx_ptype > I40E_RX_PTYPE_GRENAT6_MAC_PAY3) && (rx_ptype < I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4); - skb->encapsulation = ipv4_tunnel || ipv6_tunnel; skb->ip_summed = CHECKSUM_NONE; /* Rx csum enabled and ip headers found? */ @@ -1287,6 +1286,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, } skb->ip_summed = CHECKSUM_UNNECESSARY; + skb->csum_level = ipv4_tunnel || ipv6_tunnel; return;