From patchwork Mon Feb 18 13:15:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@broadcom.com X-Patchwork-Id: 221377 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 CC4122C3352 for ; Tue, 19 Feb 2013 00:15:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754329Ab3BRNP1 (ORCPT ); Mon, 18 Feb 2013 08:15:27 -0500 Received: from mms3.broadcom.com ([216.31.210.19]:2940 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754248Ab3BRNP0 (ORCPT ); Mon, 18 Feb 2013 08:15:26 -0500 Received: from [10.9.208.57] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Mon, 18 Feb 2013 05:09:27 -0800 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Mon, 18 Feb 2013 05:15:13 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Mon, 18 Feb 2013 05:15:13 -0800 Received: from lb-tlvb-dmitry.broadcom.com ( lb-tlvb-dmitry.il.broadcom.com [10.185.7.55]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 7CCA640FE3; Mon, 18 Feb 2013 05:15:12 -0800 (PST) From: y@broadcom.com To: davem@davemloft.net, netdev@vger.kernel.org cc: "Dmitry Kravkov" Subject: [PATCH net-next 1/2] ip_gre: allow CSUM capable devices to handle packets Date: Mon, 18 Feb 2013 15:15:19 +0200 Message-ID: <1361193320-11181-1-git-send-email-y> X-Mailer: git-send-email 1.7.7.2 In-Reply-To: References: MIME-Version: 1.0 X-WSS-ID: 7D3CF78D3QG2841927-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Kravkov If device is not able to handle checksumming it will be handled in dev_xmit Signed-off-by: Dmitry Kravkov --- net/ipv4/ip_gre.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index a56f118..cdc31ac 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -745,12 +745,9 @@ static struct sk_buff *handle_offloads(struct sk_buff *skb) goto error; skb_shinfo(skb)->gso_type |= SKB_GSO_GRE; return skb; - } else if (skb->ip_summed == CHECKSUM_PARTIAL) { - err = skb_checksum_help(skb); - if (unlikely(err)) - goto error; } - skb->ip_summed = CHECKSUM_NONE; + if (skb->ip_summed != CHECKSUM_PARTIAL) + skb->ip_summed = CHECKSUM_NONE; return skb;