Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp233208pxb; Tue, 31 Aug 2021 20:08:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo8V8yoged44ea3bnSOOSGY12BCUjSq/jtqd/a3QI6iFTmnkUmHJ0NHcDfDliT5L0aBMXC X-Received: by 2002:a05:6e02:1be2:: with SMTP id y2mr21129739ilv.293.1630465715063; Tue, 31 Aug 2021 20:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630465715; cv=none; d=google.com; s=arc-20160816; b=nuuqU2O06hXx+bJvWZqGWFGrXE1vd+VfMDMiLdZjJnCYuN9erWta52MN9oJx8dw/GY B4y5EUxZEM17mGBNTT0feyYnoO3CXgL/8nkD7JijPeuqs2xljFhNxe7LEwqzlkAy/J3j 1MJ/fRRq8NZbZc+j+ZHQXoz3Pk7EbS0n+Yc78MCHGRWSWuqUO+WiqcYKIB7/cAH+Iddj sV4BMCiuhLMGd9naC9xxrqjvCGAigY+hEdj1xUAVMQrCKS/H9yVIvK1ZjFKRLJ1hHnuC k/ErTk+XtfpSUrHZ2ZEI/JpRkMYm1z+cbcKEayPz7L8VLXgOpbIrz0ryTCekJksF7vce EXVA== 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=wuazhPfrLKaoIW8Pplo8fpoh6eadL3IevDJ8tsjKazk=; b=iCy2Vj1ZHMuzuWDdKABobmxBYjPurn4aV40jRHiTyX1y9OUHQHCKI6G+Baz2UGxuZf Es/AzwV9pbn+1lTZPkSQmvWkf5Rs0HHsnhtB64aysLOSDJyzKfJGGo5nvZX6IyDQxIvG YXYTCH+5XK2M8o33e9iUtvjT1dNG92HMJS1YQ2BaCUcs5Hyc4SS87L7ncrisyx/AIw9I DR3WRTKEuclVirw1s0kruZhovyOo0QIjkAsdseaSMPD0Hg3nW2E1DE4eZZV4LiyE6vD2 OdkF9MPreRkBC7XAs/nZcGUSObVz1L3BhY3mfAmjifLoJq5zk4fP8lc7cJWznD5oYUms AXtQ== 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 y28si19129278iot.48.2021.08.31.20.08.23; Tue, 31 Aug 2021 20:08:35 -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 S241632AbhIADIX (ORCPT + 99 others); Tue, 31 Aug 2021 23:08:23 -0400 Received: from mail-m17644.qiye.163.com ([59.111.176.44]:25174 "EHLO mail-m17644.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231712AbhIADIW (ORCPT ); Tue, 31 Aug 2021 23:08:22 -0400 Received: from wanjb-virtual-machine.localdomain (unknown [58.213.83.158]) by mail-m17644.qiye.163.com (Hmail) with ESMTPA id AF8CD3200D6; Wed, 1 Sep 2021 11:07:24 +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] [v2] mptcp: Fix duplicated argument in protocol.h Date: Wed, 1 Sep 2021 11:06:56 +0800 Message-Id: <20210901030656.7383-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 kWDxoPAgseWUFZKDYvK1lXWShZQUhPN1dZLVlBSVdZDwkaFQgSH1lBWUNCSE1WT0tIQkMZHR9DTR hJVRMBExYaEhckFA4PWVdZFhoPEhUdFFlBWU9LSFVKSktISkNVS1kG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NyI6FDo6FT8BSEguCAFJSRYo OQ8aCQFVSlVKTUhLT01OTU9OSEhKVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlO Q1VJSkhVQ0hVSk5DWVdZCAFZQUlKSEw3Bg++ X-HM-Tid: 0a7b9f53595ed99akuwsaf8cd3200d6 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. --- 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