Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp241129pxb; Tue, 31 Aug 2021 20:24:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwc1E7KX62ZgBzEomJY1pRnEpfkzBHx4fXKEYQf/LOges7B0sGZUTT7iC2c+CRCjsxQVnnn X-Received: by 2002:a05:6638:38aa:: with SMTP id b42mr5915492jav.6.1630466654977; Tue, 31 Aug 2021 20:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630466654; cv=none; d=google.com; s=arc-20160816; b=XJ6vRfQRIGAMomWr4MgDdhLL1YjHu50hEnm66gfXxhIiaXa/Jkga/tGeGcEligcFT5 6nPUr9wMKfUjhaP6HmyJ0xMQ0SKKGrk3kwfgsIUhU76z0MP/Qk9q6CuKvPxS7fawYvMj 9t7LhrzHdYTH/+2MmseiRR+MK4VYq+lcDM1e9q0c+/a9VGedNDPu+CoJUES7mb7dJMo8 jQIO3UYQst9gAzmAmNROhTREpfOEs8CrOfzmjoDGgeHfXKxfCO4DmXqA3r2pB54ntiDG EVhlKbFzsnyiTPkIX44i3kIXfKXsZEV64j5HxLR4UpimgQED029y5Dcxl0A4RzhCLOsp QHxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=XDlnuUE/DCC4iYfaNUm1wdd0bdkYUkrh68Pzzyi8KGA=; b=PRR4fqZXR6GTxSsLTfMXavC2ZZsU1lSc9e9ikv58B+/fzuqCP468H1Yo/jZoXUARp5 Kl/Q3U3vBLFItWF2Yl3bQnSVW/rqMOrdYT1+oa5ZhuP1gPw1q+sAR2Nwoz5Ufs9fLoct 2WsxWIkh+TRFkv+wB0eTcXeDf/8+rD5iizq/z58+j1Ck+w7kzyHoXdI5+vgXDB5SIFng bwx0dxr3xCsYFc5MrfuTBQ1PBHuNODUH2aXtQTlLfuONbxkspb2gKLOK9PpmDUdUxkM/ gc+soCsO49N+poL73O80EO72SaQqu1LRc1CbFtgpjPe+cykUTs0Ne+FU7AFGYe/qHY3c TSFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b9si22887444ilo.64.2021.08.31.20.23.58; Tue, 31 Aug 2021 20:24:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241457AbhIADUi (ORCPT + 99 others); Tue, 31 Aug 2021 23:20:38 -0400 Received: from mail-m17644.qiye.163.com ([59.111.176.44]:9478 "EHLO mail-m17644.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbhIADUh (ORCPT ); Tue, 31 Aug 2021 23:20:37 -0400 Received: from wanjb-virtual-machine.localdomain (unknown [58.213.83.158]) by mail-m17644.qiye.163.com (Hmail) with ESMTPA id 74E483201D0; Wed, 1 Sep 2021 11:19:38 +0800 (CST) From: Wan Jiabing To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Cc: kael_w@yeah.net, Wan Jiabing Subject: [PATCH] [v3] mptcp: Fix duplicated argument in protocol.h Date: Wed, 1 Sep 2021 11:19:32 +0800 Message-Id: <20210901031932.7734-1-wanjiabing@vivo.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZCBgUCR5ZQVlLVUtZV1 kWDxoPAgseWUFZKDYvK1lXWShZQUhPN1dZLVlBSVdZDwkaFQgSH1lBWUIdGU5WQ0MaSkkaSRgaHU JLVRMBExYaEhckFA4PWVdZFhoPEhUdFFlBWU9LSFVKSktISkNVS1kG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Kzo6OCo5Pj8BKUgjTQIeQxQu FhIwCyJVSlVKTUhLT01NSExCS0tNVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlO Q1VJSkhVQ0hVSk5DWVdZCAFZQUlKQ0s3Bg++ X-HM-Tid: 0a7b9f5e8b96d99akuws74e483201d0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following coccicheck warning: ./net/mptcp/protocol.h:36:50-73: duplicated argument to & or | The OPTION_MPTCP_MPJ_SYNACK here is duplicate. Here should be OPTION_MPTCP_MPJ_ACK. Fixes: 74c7dfbee3e18 ("mptcp: consolidate in_opt sub-options fields in a bitmask") Signed-off-by: Wan Jiabing --- Changelog: v2: - Add a Fixes-tag. v3: - Make Fixes-tag to be a single line. --- net/mptcp/protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d7aba1c4dc48..64c9a30e0871 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -34,7 +34,7 @@ #define OPTIONS_MPTCP_MPC (OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | \ OPTION_MPTCP_MPC_ACK) #define OPTIONS_MPTCP_MPJ (OPTION_MPTCP_MPJ_SYN | OPTION_MPTCP_MPJ_SYNACK | \ - OPTION_MPTCP_MPJ_SYNACK) + OPTION_MPTCP_MPJ_ACK) /* MPTCP option subtypes */ #define MPTCPOPT_MP_CAPABLE 0 -- 2.25.1