From patchwork Wed Mar 5 22:38:43 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: 14003544 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2083.outbound.protection.outlook.com [40.107.249.83]) (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 1CAEA265618; Wed, 5 Mar 2025 22:39:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.249.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214345; cv=fail; b=rQFykOv5vWmqkHbs5df8ZUdTGrISRvQwxyhueSGVUIlRQU9VbJVHwTlZF6Ec8wZdadR/Oej0wKOwsNYeThrckqXYUXS46q99CxTDoTmWvYOLpS82oB4PU5Evx1TIq+7RJ3IqembQ3od/nSazk5CRoDuwWXoxjhUF+26piMd6A0A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214345; c=relaxed/simple; bh=yL7yQyw+fOPNNdHg98sMQDrvfwIn9YYy0na5JwuRmrI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ALm7cvynHcTTrMhSzlVv8ryoFKA6lWd7rqWOY61i1HKG1tV2jqVxhdj+0mqa+jsK47TBRbbRFXtGKnkOZdEowwH35ee1Csov9L0ZbecepM1uOwbT23XjUgrDbidyaSx4/gId6qbKUpmqLq131m35/bgW6jvaxceUt6sNzx+ZYO0= 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=s4xTi8wQ; arc=fail smtp.client-ip=40.107.249.83 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="s4xTi8wQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dio+0ETIqcHdBMs9FrMLYu9dOrEyp8Tcdh8ZrhNj4o8d5NMq2Csb2A6MFEDxVWKVSocWtAi2G1MsK5ETPgCeEJIbp/VDjDsFCf+GR4vR4gagjJxSSP1Y9cW5Q9Ln8w6bRHMfsO/5dVyYyHB8hB8tKUmoIOEEQmWxeqz+egZ/UEEGhcsFNS1kUpjMuFjwnYiKmOsrBUM4kJcljxV35LEHPGpXDnH7MERgsrRY8/IjKty/je0YoP5Mp5GoMctre/PtHLipFD9VcIf6d7ryDwsISHy/7UYgUb9X08DSX7nE9UCI0Z0zof7UVvTRbjpF/94TFgz7yM0ghF3krcXIgclYqQ== 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=MdxMG2KVp7GpxsxTd7OKREOedLnkryzfsOtcR6r8e/GAaMWfEUd/gQntf0C1U9KxbiQd2SBMOb2T7I/92p6NWVLoYX83RuInJZfoglqwBQe8bYa0YQGz4PTjhSe3lW8fewAts4ePi9P0e5Ow8zwE1hEC1qvcLQ1DqeHvCo2+hcv2c45TUtlqxbbWlLaa78HDANNBpLVndvBxmkrAiP6GQdN6Hx83tl4SU2FwPi26FtDFV4wJuSSmqgNCCfVWL4WQrfogqKNVmf7RyVIjUksye7p8YCLNtctQYrOk8jP068ZOFx2c0ZZpYeYQpYn8+D0HOtzuHMOrNqcaoc9oGFkckg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.20) 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=s4xTi8wQ+mKpgn5Av+MiFmvfHK+ry0B0rKiwQwrewK8rMP2vOr/ngzCb/dw/mvqj1IRusqQ6NyqrZOq+ke/xhZZcv0+4mpaUOO+0rGJm15V+kXhLQ4fzk+2wzwSAZRabgmcWWVxgXb1nxCs5ZG3kxTCS+5D/IQGrmYufWOiujwheEkLpKLYSQGM0OFF+o+SCt/v83olqZ02z2jonIuA+NqBYZkQQXXuaD/tcRDjk3LKFaXKer/eUUhf03kG+WNx5VYbuPxqzBuYpADN3owGQiV4++yauQsNra/DoDx89BxK7hp4CEflDGAWYJdfK2gyk9GeJT3w31G8mB84zSPdOaw== Received: from DB6PR0301CA0077.eurprd03.prod.outlook.com (2603:10a6:6:30::24) by GV1PR07MB8349.eurprd07.prod.outlook.com (2603:10a6:150:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Wed, 5 Mar 2025 22:38:59 +0000 Received: from DB5PEPF00014B94.eurprd02.prod.outlook.com (2603:10a6:6:30:cafe::56) by DB6PR0301CA0077.outlook.office365.com (2603:10a6:6:30::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Wed, 5 Mar 2025 22:38:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.20) 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.20 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.20; helo=fihe3nok0734.emea.nsn-net.net; pr=C Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.20) by DB5PEPF00014B94.mail.protection.outlook.com (10.167.8.232) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 22:38:59 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0734.emea.nsn-net.net (Postfix) with ESMTP id C310A251E0; Thu, 6 Mar 2025 00:38:57 +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: Wed, 5 Mar 2025 23:38:43 +0100 Message-Id: <20250305223852.85839-4-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305223852.85839-1-chia-yu.chang@nokia-bell-labs.com> References: <20250305223852.85839-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: DB5PEPF00014B94:EE_|GV1PR07MB8349:EE_ X-MS-Office365-Filtering-Correlation-Id: fac582a7-7bc1-4f51-fcfc-08dd5c368597 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|36860700013|7416014|376014|1800799024|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MFostOY4KIJumkIp3TSjdr0zjy6UW2C?= =?utf-8?q?uzcDcQy+rbbJazkzlq7G5Fd4KYxnv5HyJMWgCY4mINY71TkjF+DLF+jqBiF6SVo7G?= =?utf-8?q?jd2Z3D5286xuRVhWDS7h7QX7l8BTGWLvZuOFSFRH8jk0S+sCFtUfLJxOFcSm4J6dI?= =?utf-8?q?4/lEpFpUjr1nu3C1ThiYDzDgUaiQRoy8d/Nbzmx8WROlSpqQMdBbAzoehvqmN+VCO?= =?utf-8?q?vbx0W5SpvYNqUaX7Z5zt2XAidTxcJ12uu053W9g1syZXYvBRlDVp3iAy2DB08fRYt?= =?utf-8?q?k/450NueaNZY0aZkym93+C1gyjF5EuSpsrroqaUHJuUP9n9c24XGPgL3q3CPTRgkJ?= =?utf-8?q?YuLyi9MZ+tWVIx/LxMJvCtXtX+I1oy6RHtOy82xYcTS9oqVhc+Z5SCyrFpzFru/HN?= =?utf-8?q?Fz0acY4CkT24MHaBZEc0if1qiJkwmBKmRCAc2ni2Ee5q9Rhx+FbcLs/uRYPvvnnaa?= =?utf-8?q?fG4AgpG94hif/nA6OBaVu8wj9rx4xiNwHiF9DUuHTZsGgxpkufUv+oQqjSnpkV9/8?= =?utf-8?q?lNBwYWILaiguiXFJUaqONGPjtNaulbx3rAC56Tb4JIy7i1aVIg7agOub9EqRCU/M1?= =?utf-8?q?gzSh7yNkTOcieNoGUXa604l5Foa7bV/mFqAd3m9UIWe3x/WKMvLk3mFrVS8QLPRjo?= =?utf-8?q?Ee9ybgxXmx+TpXVV+2ROwdwgkpLsDOxEV0EMaQrJ7wtVyWhY4+xEJV6nsbrT0I4go?= =?utf-8?q?+x7lE3ssJK9BKDXgODihWFNjp3CxriRBhDIu7+NJvOaPDsDgOW+ojXACoMXWi7slo?= =?utf-8?q?1fui1PiaFG/o3e0+dv8oL6rpnUuiIOdHemMNKwF2fRoNUgk6wpQX0uwqQg5eoYhaf?= =?utf-8?q?knJyWsUzxTzeAJM8j1N+ZD5s/EhuqJnjFq13ESDxA1lsNXZjkGf4nUdvtc7NQiIPo?= =?utf-8?q?hAOSbfJh3bONLeTT2j6eM0+zWNSDPkbVpGESRGBBsXGJjvvG0m0lnn5WlgHUNG/4u?= =?utf-8?q?KfZVBOTwOj5rYSk4f4OAHCzmr9PnhXWsnWhEwGxO8zY5t8ytbSBZN0nRzqErNwbPi?= =?utf-8?q?x3+Pcuulfsg/4wYtWWUDrrBCtGBUDjXTPVW3D3MjbWqC5ompq7E/SVA2LSlaa2Rng?= =?utf-8?q?i68v0l4xxKRz81veTBVTdX0nJpp5oRWnx6Q9k0jn6FWvRN+iUt7Bqyi6trHdXgoPf?= =?utf-8?q?nxKKbqgWyHowKP+ndnXezZH2d6YaOcIexQAmO0OkE+CeHwSuQPla8E/qqD+yoIRl7?= =?utf-8?q?55XgErWTLCzWz6okWLrPsXqLULRH3na3W8b/RytQfHxQd0+eDhEHdpqgS1uLUHm0M?= =?utf-8?q?Go1INrppQ1arGplMc/wBLjh6fwoUBBI7srv+viYbKSUX/cBdzfs8DoJqPe1vgJOWr?= =?utf-8?q?+W6xehOv3QSlQgJiehlbek0u3kQr4dtAs0atFyBRd3CRRwWxcgDxJ32hsfA5p/RtG?= =?utf-8?q?YRU3njY6wXdLadEvCKN7QKq5ay2R+4Jm7GK9Dt8zc3sbkLiB20JG6wXhJBoyytE2k?= =?utf-8?q?eZaRLJg5it?= X-Forefront-Antispam-Report: CIP:131.228.2.20;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0734.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(376014)(1800799024)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 22:38:59.4704 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fac582a7-7bc1-4f51-fcfc-08dd5c368597 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.20];Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B94.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR07MB8349 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;