From patchwork Fri May 7 04:18:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1475350 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=147.75.69.165; helo=sjc.edge.kernel.org; envelope-from=mptcp+bounces-590-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bUaYxInl; dkim-atps=neutral Received: from sjc.edge.kernel.org (sjc.edge.kernel.org [147.75.69.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fbxys3Z49z9sXS for ; Fri, 7 May 2021 14:18:44 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id C8FFC3E0235 for ; Fri, 7 May 2021 04:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 51F782F81; Fri, 7 May 2021 04:18:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74EA270 for ; Fri, 7 May 2021 04:18:39 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id gc22-20020a17090b3116b02901558435aec1so4674617pjb.4 for ; Thu, 06 May 2021 21:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GAsNNFF6id3sFTKwTltehaaVKBPByUiOLLz0EkI5NJ4=; b=bUaYxInlRqugdsSjc7LVOV2wURLoe+VgXjcJiQfNpNLPM+urq22WG+AsrMb4yBkV7p G47IsoZuyCgePwiDkjVPUuJ6psZ2XQJeROe/0CdxgupIzyfQZuSHuX2IvinZo+pH2duJ +w3sEeluqYmTbeQKhuPoVeKPEP8Hw4ytiBmWwkD8ySlf8xzj5pk94hhakNevGLTL/GZR kh8fSLpUycjsFdZdgHCxNmt+nSLBgf9Uohza1oVISJ3ynxm8asn/iOKj7vp0YGNP08ea QOgt9IYU0kOm83ymDcdVGFMP3uzWFx8463SY26PMuhsW1nVGSpOEoRJSYTY8avkrGDSu dBtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GAsNNFF6id3sFTKwTltehaaVKBPByUiOLLz0EkI5NJ4=; b=XQZNGUjyk1II5TfkRfkq8ZU2OTzVvu4oxzgWvck+6zOFWuO6ZTr/M8TXebEXvrnG1f QYWXJzhHGA1PU5qwCZ97eJvC6Qi+/EFSNLRFDZaFZJrkFX7IiGERYvCkvJE1c21gQY07 v9KoFHjpnqTPO2Y+kxt4HJAG2PeE5T1WnaUKlrgErEcUa8BFD6fSgUzDVaj3JA26Ha7c G6y7LDkwr1zP1+5wBP6fnCt36dC8UBThDXCveECLwWFzOq8Il7aWTNHIM3TR/Y/FtFBt 9loXdY/7TNiOt9jBCnoks/LFUodSD1tmhd/Ej8xBswQcUXQgroITICxQ4uyYepcHeIjR VuLw== X-Gm-Message-State: AOAM532as4HFruUSA/iG1d5CzhPFx8TfmAFnqvWndrTYDpFxM1wXRY8h bfbE80xSeschT5ELdf+ne3xjo24CAI4= X-Google-Smtp-Source: ABdhPJwjgU7Qfcn9rh1cBy/D1TYyk6frd0w8VHr3PG9pnEYvbPwrKOobiX6Hq2p+M6MznY+MpuOpoQ== X-Received: by 2002:a17:902:e88a:b029:ed:6bf3:2290 with SMTP id w10-20020a170902e88ab02900ed6bf32290mr7846695plg.20.1620361118898; Thu, 06 May 2021 21:18:38 -0700 (PDT) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id 66sm3399307pfg.181.2021.05.06.21.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 21:18:38 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [MPTCP][PATCH mptcp-next] Squash to "mptcp: generate the data checksum" Date: Fri, 7 May 2021 12:18:35 +0800 Message-Id: <694573465901ea0fc5318b379af75f5287a4f77f.1620360953.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.31.1 X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move the csum_replace2 trunk into the later patch "mptcp: receive checksum for MP_CAPABLE with data". Signed-off-by: Geliang Tang --- net/mptcp/options.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index beac01f58cba..99fc21406168 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -519,9 +519,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, */ ext->data_fin = 1; ext->data_len++; - - /* the pseudo header has changed, update the csum accordingly */ - csum_replace2(&ext->csum, htons(ext->data_len - 1), htons(ext->data_len)); } }