From patchwork Tue Mar 4 15:16:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Chia-Yu Chang (Nokia)" X-Patchwork-Id: 14000904 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2047.outbound.protection.outlook.com [40.107.21.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00939284B31; Tue, 4 Mar 2025 15:16:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101380; cv=fail; b=abXyqW+OMTx8xVXN9qGLdtMFFTZA6uu8DMbLHxeONV0uQBNx+453VdRcqB94c9mfg1kHIa6HvKdf/v9dfdbcYUDVKnCRJxgsZpyUI+9UOdorXbKunD0gvGMcV0JXiMNwcchz7JqnmWdsGfZBXfj/XCUGq1pKRgNxwoYf3J6WE1g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101380; c=relaxed/simple; bh=yL7yQyw+fOPNNdHg98sMQDrvfwIn9YYy0na5JwuRmrI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=qNTrYostsVGy0McH9MLg5zo3FUrSsSvmTPrDqgsCiIflQ+cZ9PMDK1zqKa4g5x8oyzzWHQe+6yv3LTh5VlIIHwi7WH0KqUE8qYkFj9j9rb6szDebR2+OSV2a7jItwoxZdZHl6lpkr/4A+4s+5jDB7PUaNs2u45UqyUciAYpJ7GU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com; spf=fail smtp.mailfrom=nokia-bell-labs.com; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b=A1m4a1I2; arc=fail smtp.client-ip=40.107.21.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b="A1m4a1I2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Thvx6efPwyd8G4flLb4+LJB+RpiSVm5aDL1U2bWLhUNTAX3Gm4LdP6+BXL4XM9gtc6lCAfevRlI9h8PSE6SFgQE5zndcaO08lOTKe3sCpr9l2hVFypRjjp+GqFeiscKnPoSD3AfDJq/OMxGTSmjvdT90L0OOUIFuuBBfcsKXwrvqDoJw2X8k2V0IEGbuzO7WvkFNTHh0nv/65zyWECgBHF/xitk/Ix0n50MSDJElutkH+bwOWxtTAn4bFsoMxpkV07aKFy5jAdkDD4e9DOEusLVO5Y8CF2eKO82d13YDQKTDGfs/7ZJmOv2t/vRwiJJWbV8ayLW3nNONpUfRvCJouw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZQWybgqsQ7JT9ksdd06zY2pYwS4ceOtCbII1UUuweQ0=; b=eEh4FdRlNwmceyMBUdr7Em/vwDdB/HkNHNbluygFdi92JLu7EsADpTmvBrrSudRQNivz8EYhxCpHsIbOaV37fyz9f0brHaB3RHLig//jBA0vTrd2XDVPvq9ZN0QG96rsBe/9UYhsP1cJRrgOE1q+d4Bg9HSEOGBMrgtZrvHA8JIM6hJnrHFcOc4iv8Fy28tYATj7uYLyUESMuULnaUUEj90N4m1c2rewBihd7AnLi761jRL8RNYnIbkd4OVFqNW0aGp5QFUUDLZ73IEew72I+TPL8/z5d7muxd5QdN9YotTO+1Ree9kqZG8LbOQ27GejPsPZ78OP99boIq0bDd7ycw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) smtp.rcpttodomain=amazon.com smtp.mailfrom=nokia-bell-labs.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nokia-bell-labs.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia-bell-labs.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZQWybgqsQ7JT9ksdd06zY2pYwS4ceOtCbII1UUuweQ0=; b=A1m4a1I2LZqyN31I4IiZC5W7/kH7198WnwanR7Gsc0dmBlFTjvacubAQLf50tK4wARA0sP+l7zct5Di+aoZ2yukLSNJ6zy4hG/exm1S4fPCG/KKB2WLbcEvykd3jv+SeVD8j/1ohV/k5ZqtbEgQvs4PZSBJOpXCR6fy1GUoYvAykUUAJ8WJWu374kDyw/ySXJUqTj95QkB2FxzzlbTwsW2rdcC7TnjbLn97Hu3zgEevwQ4h5bQWktcMixb/L7fu5a8AJshsyCgSPUhPZ9GiSbxv2fKUHmsIFMUMP79264bRrom075eM9VEvfquXSvJEbqL8s6mwbK3F3PRKiwIzxTA== Received: from PA7P264CA0128.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:36e::11) by AM8PR07MB7506.eurprd07.prod.outlook.com (2603:10a6:20b:243::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.29; Tue, 4 Mar 2025 15:16:15 +0000 Received: from AM4PEPF00025F9C.EURPRD83.prod.outlook.com (2603:10a6:102:36e:cafe::29) by PA7P264CA0128.outlook.office365.com (2603:10a6:102:36e::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nokia-bell-labs.com; Received-SPF: Pass (protection.outlook.com: domain of nokia-bell-labs.com designates 131.228.2.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM4PEPF00025F9C.mail.protection.outlook.com (10.167.16.11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.4 via Frontend Transport; Tue, 4 Mar 2025 15:16:15 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0735.emea.nsn-net.net (Postfix) with ESMTP id DC8C324F98; Tue, 4 Mar 2025 17:16:13 +0200 (EET) From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dsahern@gmail.com, davem@davemloft.net, edumazet@google.com, dsahern@kernel.org, pabeni@redhat.com, joel.granados@kernel.org, kuba@kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, pablo@netfilter.org, kadlec@netfilter.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, kory.maincent@bootlin.com, bpf@vger.kernel.org, kuniyu@amazon.com, andrew@lunn.ch, ij@kernel.org, ncardwell@google.com, koen.de_schepper@nokia-bell-labs.com, g.white@CableLabs.com, ingemar.s.johansson@ericsson.com, mirja.kuehlewind@ericsson.com, cheshire@apple.com, rs.ietf@gmx.at, Jason_Livingood@comcast.com, vidhi_goel@apple.com Cc: Chia-Yu Chang Subject: [PATCH v7 net-next 03/12] tcp: use BIT() macro in include/net/tcp.h Date: Tue, 4 Mar 2025 16:16:01 +0100 Message-Id: <20250304151607.77950-4-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00025F9C:EE_|AM8PR07MB7506:EE_ X-MS-Office365-Filtering-Correlation-Id: 51ec70e2-779d-4f5f-edf7-08dd5b2f81ca X-LD-Processed: 5d471751-9675-428d-917b-70f44f9630b0,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MOetXRYHiRi3bDcj+v7vrywYqUiSdPO?= =?utf-8?q?G2tmBv4IzX7Bm7ehwCP9c8Ag28HG9DmU7kd/OP0hi/QxeNrl849K6JxrpkCB610Si?= =?utf-8?q?K/Kc2nDxo1A87w6ldlmyQdb211uab7FmPG5MaJlkU3TpU8GZNm1pfURgqfBzHNFka?= =?utf-8?q?R53Cr5ikCYWmD93IjcgyQZeRVABtfCZ8gGC9799vwazRr4LF+YVA8dBrczSzsKuva?= =?utf-8?q?3tfcb4YuggS4YTMuR28srwyfA52eTSAc8t0eQMHmIjhMI3dx/cwux1HXQTGLBw08c?= =?utf-8?q?qTliS4r0kguRUZfNPskrIv5xNNSiZCPGJi6lOjuGPZZPcKjdTzWvL4X/el1NCq1zx?= =?utf-8?q?PASbQHEtDo+IgwukUHiulCVZgQzA83ybtQr9w/W9wCdSiiSbWubeQefyP1y1kfE8u?= =?utf-8?q?+vL2Em/avIDlSRS74UiQUmdTC8PlYeOIZd4+1GaGNUkm1v6eFH10Qe/R+BCXrSiFB?= =?utf-8?q?q7DWpSPopZM/3ksrNTJEhGkk8Tq6O1ZSKBfUa+03Zv7HO30mxXaCTyHPZG/xZMQH0?= =?utf-8?q?JEkeyeLssDHAz8CUyFAtAEDZkVtdsOruGRHNF0HoF5bYBcreW6cBaExZKLUEZ4PyB?= =?utf-8?q?Qk0ZmWseStfj5i77ke6jIlugOrFgcNmLxfLK2jS5PR0Zy1G4id156yaAy57NLIUhy?= =?utf-8?q?Iod4rO95gthkqTsDY90TNPPkdXpwEAFE+OvqWKkaq9uyuZUeP7JnELrFhgmTrxzUc?= =?utf-8?q?UTF5Xt3mCOTfXRCByq42ezXhfPqBg208mT4M5TLmQe3JGtToJ/JFvA+z+H83mpIgY?= =?utf-8?q?nosuQmal2Jg+8MIfTzAcm7tu6CcFuNVeWLSJNjCCOzzyUz5flO3sa8jr5MkNiEbXd?= =?utf-8?q?Scz3U/ktXL+J6frcKHKHKYYcbPtIELO1UiSo02ZVM+DqDTQ/2Icj2dSZ1SuoxTs0f?= =?utf-8?q?OfuJSXnepN4jXZcI6+q9pafUcqkTqCQC+BtOH6GTCpcQ/tFnEulQjj7/DEPeCcjIq?= =?utf-8?q?chK2MJZ1vXUzpxknGh6oV7MZzhU4oci7Xj1q3eZuHSyI1SFniiBZzOcInlACGwnW/?= =?utf-8?q?YgYjrbZCvX1qF6vL/KNxIjmk53xWTgwK8/N9VMsC4diyLyh2HRJ/egoRVxM4K9cFy?= =?utf-8?q?FgP273SY8DwQ33EGCf0ekF2qE+QAwIazaDfUJxJvhgnRpLVon5Usik8BT6CA452HV?= =?utf-8?q?0TSWlVDukF3PeAKdhS3QC7eVmjIKYvHTkksBB3eK03pWLJCPeJJDqu5bBLvgwLlwm?= =?utf-8?q?iiiOliddOgDWIanoqyhrtgnMMdiOb2hUhDnOF24ERZZLWgfjWXrvjw1fzX3GdK5U0?= =?utf-8?q?u/6d3dHJyB4KWyBxHY1BsJ0db1uU9iWwPzMIWANOM9ONz3LrAYjup0nZbOipDSbCs?= =?utf-8?q?bcLseV0jQAlGzcZZ9FTuECDa0F14vBuv66tM99UPmVLZGXLJH/qX0n72fxtKUD93w?= =?utf-8?q?5CT16eqU6/ohb1SecBtYEJGjPM7bnqXUq4RFrKRAYIKnRsd76SnxUVNqGe8+81mL2?= =?utf-8?q?WZSYgx2iBQ?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:15.4691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51ec70e2-779d-4f5f-edf7-08dd5b2f81ca X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.2.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00025F9C.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR07MB7506 X-Patchwork-Delegate: kuba@kernel.org From: Chia-Yu Chang Use BIT() macro for TCP flags field and TCP congestion control flags that will be used by the congestion control algorithm. No functional changes. Signed-off-by: Chia-Yu Chang Reviewed-by: Ilpo Järvinen Reviewed-by: Eric Dumazet --- include/net/tcp.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index a9bc959fb102..71754d5916f3 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -934,14 +935,14 @@ static inline u32 tcp_rsk_tsval(const struct tcp_request_sock *treq) #define tcp_flag_byte(th) (((u_int8_t *)th)[13]) -#define TCPHDR_FIN 0x01 -#define TCPHDR_SYN 0x02 -#define TCPHDR_RST 0x04 -#define TCPHDR_PSH 0x08 -#define TCPHDR_ACK 0x10 -#define TCPHDR_URG 0x20 -#define TCPHDR_ECE 0x40 -#define TCPHDR_CWR 0x80 +#define TCPHDR_FIN BIT(0) +#define TCPHDR_SYN BIT(1) +#define TCPHDR_RST BIT(2) +#define TCPHDR_PSH BIT(3) +#define TCPHDR_ACK BIT(4) +#define TCPHDR_URG BIT(5) +#define TCPHDR_ECE BIT(6) +#define TCPHDR_CWR BIT(7) #define TCPHDR_SYN_ECN (TCPHDR_SYN | TCPHDR_ECE | TCPHDR_CWR) @@ -1132,9 +1133,9 @@ enum tcp_ca_ack_event_flags { #define TCP_CA_UNSPEC 0 /* Algorithm can be set on socket without CAP_NET_ADMIN privileges */ -#define TCP_CONG_NON_RESTRICTED 0x1 +#define TCP_CONG_NON_RESTRICTED BIT(0) /* Requires ECN/ECT set on all packets */ -#define TCP_CONG_NEEDS_ECN 0x2 +#define TCP_CONG_NEEDS_ECN BIT(1) #define TCP_CONG_MASK (TCP_CONG_NON_RESTRICTED | TCP_CONG_NEEDS_ECN) union tcp_cc_info;