From patchwork Fri Nov 3 13:18:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 833852 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Bu19Qn37"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yT2bZ136Nz9sNV for ; Sat, 4 Nov 2017 00:19:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932390AbdKCNTD (ORCPT ); Fri, 3 Nov 2017 09:19:03 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44703 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755984AbdKCNTB (ORCPT ); Fri, 3 Nov 2017 09:19:01 -0400 Received: by mail-pg0-f66.google.com with SMTP id j3so2468181pga.1 for ; Fri, 03 Nov 2017 06:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=/xGjXcQ+1tJx8OBrrj3lJTqNqxucNbY+w7PLQHZgLpg=; b=Bu19Qn37WnCgM3Ala7l2GpXtnGrnI5giPSTEr/onbUvAWIl5sz+TOy+zRGT5u4qUf4 tYyJ2hspMjIdR7rmcu2HazaXHfH5ghjwlco7IoFvUFTPRUaUIXoZBADPW6nOYjeNCrA/ W2MYEPlhBGuxvGZUI0WvFgSg8t1BmIj+fA0VyziRiB+YSFDJfd4yCORKdQAE+R9AHw1O vL4VxWLtF/eMcGSjl37LEx9jsHnBKwe+EfVMoRALJpunp/M7O11G4JmXNt8bb7SGhZUM CDL8UTGAxSxW2UTuGW+O3rNIn5wY0cEjsCSvr3VkGuWa9SQ6R2O98WtrG7/98uKBmw64 fZKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=/xGjXcQ+1tJx8OBrrj3lJTqNqxucNbY+w7PLQHZgLpg=; b=ffJBW7Dml1YkTrufkp2zD0vW0+f36Sr18rcWNqSdfRT6Fw0nv5Jj8J5VcgUgI8quIs tbUFsC6L5AYtVH36IABZLKd9xATj1UtCRW5CtKblnf8U0EIW996OeveFxcjaSSXYGZ/H guBPW/eYA68fa8FEAXAD6CFTMt1GwD9xwsCSEDngaMyx+m8ACrXjA/IQZHyu+lwFxyVO m5X/MUsBPjGNOLRj/KyJ7K+eMEN718vSLSf3qcKQBY+wAQg4LcrvBdvGtadfg0Tnq6Lm sGpvJt5Cq1o6CzvVNi02dwiwIhzFZtaVdnrTw84KOEXXZheMv3ZriV0o7wlfzU7cy/h6 FZhQ== X-Gm-Message-State: AMCzsaUZxLApHRxdVDftgphSfZ3iHykIHggXRa9wT8yJkz7G2TEojJV0 YkQzEFP/wbSNp2HLXLYVRNE= X-Google-Smtp-Source: ABhQp+TMGfR28ZAKku2ghWxTeA5wE/RnEWLRvOQYxcdeQHMHdluBbXezcC4jSadFk2+uAbsHdumoVA== X-Received: by 10.84.128.70 with SMTP id 64mr6924314pla.329.1509715141035; Fri, 03 Nov 2017 06:19:01 -0700 (PDT) Received: from [192.168.86.171] (c-67-180-167-114.hsd1.ca.comcast.net. [67.180.167.114]) by smtp.googlemail.com with ESMTPSA id f1sm10898771pfe.150.2017.11.03.06.18.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Nov 2017 06:19:00 -0700 (PDT) Message-ID: <1509715139.2849.53.camel@edumazet-glaptop3.roam.corp.google.com> Subject: [PATCH net-next] tcp: do not clear again skb->csum in tcp_init_nondata_skb() From: Eric Dumazet To: David Miller Cc: netdev , Neal Cardwell Date: Fri, 03 Nov 2017 06:18:59 -0700 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet tcp_init_nondata_skb() is fed with freshly allocated skbs. They already have a cleared csum field, no need to clear it again. This is based on Neal review on commit 3b11775033dc ("tcp: do not mangle skb->cb[] in tcp_make_synack()"), noticing I did not clear skb->csum. Signed-off-by: Eric Dumazet Reported-by: Neal Cardwell --- net/ipv4/tcp_output.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 822962ece2840824db3d89993f6889780cd2ab99..0b8062274ed2bf1c2781fe7e88f0de97f6ab6e55 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -381,7 +381,6 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb, static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u8 flags) { skb->ip_summed = CHECKSUM_PARTIAL; - skb->csum = 0; TCP_SKB_CB(skb)->tcp_flags = flags; TCP_SKB_CB(skb)->sacked = 0;