From patchwork Mon Oct 21 21:59:03 2024 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: 13844717 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2083.outbound.protection.outlook.com [40.107.105.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 C3F191E25F3; Mon, 21 Oct 2024 21:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.105.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547979; cv=fail; b=SNLEUOn76jIuBuFoOi27QWzgBIg4TPemYr3nM8/r8t/umoAr6ofqgvs609gyncj5CUd00+xljPQkFJ6f3J6y55RQrfmMtzQZGkqM4oT6SxNAUTQ1bVUTnO/orz+P4eLDnqbXVw8YziLfWly6uZixusP/rocOFqXd8Sol24INMvk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547979; c=relaxed/simple; bh=WztCfr7DU2uQkLa72YOgwPpB13/PQ87q2/XsS4qJoUM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=cjqay95QV85DZqBIl2lcj2qdK/Qi29/K/h5EAPF26yWoV3HEOvDpoq3W/Yu347wytjH46/EWckgyulN2+IcheFOoCt1owi0ul+r6+UT5zcTNZafWlGZO8/sA1o5CXeAvDufj/WxzMU9mzPnr2o/NJuOcSL/xQrJuQ3ODiFPzB5U= 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=G6T+L3na; arc=fail smtp.client-ip=40.107.105.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="G6T+L3na" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fFRl/BIGDxAdNHQ19D30Pll9OEg1jjUDmXsPFjUj9/+1MOvJ49XpdkdKAs1CLur1cTgjFM4xuMV4WTPGGL9gpH+fQ4nQXrl2fSp2RGKVn3x2TVamXbRpmkGuuQO0Wx+qFVqnItcyAh6aH9rtM6wHOYNtid5BZscgJOuTKhmPhKuisJvH4CSjhvgeRuJbQyB8bcy2RCYGBvreO73BOrI4Xvee67153mlHbd2ca4q1qFm3yioGoOe39Q9rSaw+q/hQqrp9DSo/OXRAdRT3GGRDVTKOENQaG0asMsfcuOhCgN+4V8JEFQCMyTLvCegtWuIJih5wuASmemwNTK8Rk6eeAA== 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=cMLJhFkpP+SH8QSt/9Ge4HrMPEmhzLTSJg317FeAfgM=; b=R6E/3ulO6N2Nqf+Wmj1xdNBJXj+uadoKRmIRWbQY0u8Z8A0mGPk4NfynH3vgF211/BKfwwRvhvKIIv7Z2QWqXQ5h69bAFPpJu3801gJ8fqQysVm+qHWP/pK4VSXTwG4qUaBBAaZaW4bolM3aWdo9lZJXQ3sk9P3I94IG3f/fmzzlqLAJZSl53upRBuRfDIsqr+QJ6Mo9jScVrb/5vBMzFvggxJFuBQKBDgI8/75323GNwJ1DXuki8lqu+Z+Xg0NcR75W1nil6rJDc/MTQp5OPOCtVOB7AikQ0MuFbwMDL7fHodL8ySzRboaN1o/+vHLaIRrzX+KLpwRRdjMSmtMSkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.101) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=bestguesspass 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=cMLJhFkpP+SH8QSt/9Ge4HrMPEmhzLTSJg317FeAfgM=; b=G6T+L3na0xTpru0G6ZWu2YTyuyIzNxUWpcmE/r7+xYqCaP/oFlZjaCOVSX0hav/0IT4cQ9Yh/A9EZr6+3abZd/mKkIMdtZ47zIUHf7Vtnb0auQ02LSw9Sc283xLSRpyYlE6Ip6jZPBN+SL/o9twnjqw/ZrKnbFRSex0lCvF8PMJDWbpg//WEFWDJvkV9vnHvamxXC+l3awuwYt7oWLxBoJGPOBWR14uXJhlnE0Uy03iY+FnyW4npK397nLsVrl0R/u/c5y+kplVOyHqHxIiPUGfWrKAhB/W4RTUscFdBUf1HgD9AQQKIGN4gX26o6og1a/K53W/YGt6pghagZitSJQ== Received: from DUZPR01CA0001.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c3::10) by DB9PR07MB8562.eurprd07.prod.outlook.com (2603:10a6:10:302::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.20; Mon, 21 Oct 2024 21:59:32 +0000 Received: from DB1PEPF000509F2.eurprd02.prod.outlook.com (2603:10a6:10:3c3:cafe::71) by DUZPR01CA0001.outlook.office365.com (2603:10a6:10:3c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend Transport; Mon, 21 Oct 2024 21:59:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.101) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=nokia-bell-labs.com; Received-SPF: Pass (protection.outlook.com: domain of nokia-bell-labs.com designates 131.228.6.101 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.101; helo=fr712usmtp1.zeu.alcatel-lucent.com; pr=C Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by DB1PEPF000509F2.mail.protection.outlook.com (10.167.242.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Mon, 21 Oct 2024 21:59:31 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr712usmtp1.zeu.alcatel-lucent.com (GMO) with ESMTP id 49LLxENO032273; Mon, 21 Oct 2024 21:59:29 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, netfilter-devel@vger.kernel.org, kadlec@netfilter.org, coreteam@netfilter.org, pablo@netfilter.org, bpf@vger.kernel.org, joel.granados@kernel.org, linux-fsdevel@vger.kernel.org, kees@kernel.org, mcgrof@kernel.org, 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 v4 net-next 07/14] tcp: helpers for ECN mode handling Date: Mon, 21 Oct 2024 23:59:03 +0200 Message-Id: <20241021215910.59767-8-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021215910.59767-1-chia-yu.chang@nokia-bell-labs.com> References: <20241021215910.59767-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: DB1PEPF000509F2:EE_|DB9PR07MB8562:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e3554d9-13e3-47ba-3acf-08dcf21ba461 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?AOmX85siH3vymTUD1tvNcisSYarlmZP?= =?utf-8?q?Dncm9pwQTNeRe7qVjgvMsQJznxHDT+yYTuvpk9bKphG2K32+sVriFsnWsMjB3rOo2?= =?utf-8?q?vaK/uUthB+ob2PETvyX1D26uMhLDlsfsiFp/1b1x4B5Cluy8Fczzaqe0v/0Rd8HMi?= =?utf-8?q?Sarh/YktEP67PMMa9Coyr+wERHi/3qW/IXkGzzeCokPPYNFoRFYPqMXcocPtgF6bW?= =?utf-8?q?HmPljxsBEf4oJByWZD+OpFzgIcg9Z5nau9+Omtuf4BNxbROFNHui6/ZEHTAmAeeNx?= =?utf-8?q?FwUYYN+IgxYtLz+kqw0j0SkpjAZpZYp8qFulm88bw6XfXWALXN3ve6WtUVi0OCNXt?= =?utf-8?q?0sCGuQ4UlTgHKcidzRIuZztfIJDZQc4JByBGZg5Y+nHSaTGKAbGKrNgXozUPzzlof?= =?utf-8?q?zEAIUx3v9n4NGA8uukYXhEhNAV0/2CgS/sJ49zJHTyUGrmoondG5NcswRXS2pIkqB?= =?utf-8?q?6RRr5Pz15MHHDL66QeFr1mGaMHvRGaZAi6AoXgxr2FHje7/V8FU/juC2tKUwCyKLw?= =?utf-8?q?oXr5h7gQeFTjpdDepwWZk2vJHGVrWKYUlFTKStQAfZMwpVkiSLMs8kXb85ewqOhOU?= =?utf-8?q?gdVTJJLhbWOBtX17V8DItFApdMw1tR5gf7gAaxi5ftDfQgT5E8S1KLiLCs5KaHFj9?= =?utf-8?q?mJbBDtvoa5p512gdROjbtr5Y+rYZ1Wg8kr9XKlGvIuUoBaDrr9W80Iuxbv2c3FiIe?= =?utf-8?q?D7twZZyKYc8mniFM1QCifH3uWnM2oUyV8PM5kFSF3Bt98js4rLe1fqNXmBisq6REO?= =?utf-8?q?MT6wf6SC+Vz3KbV2gYalvCOE862EAnHTJm1WFyfD7J9KKSOPGEaWMlbvNuqLdABBf?= =?utf-8?q?O9kQUdYnZPuoLnkG++eJo9O8IJ5ok30gLvgM/RQFB/gJsY4lSyz/SV0UxcPXHAjY9?= =?utf-8?q?+NtsBG98dRwk5eTsc8g5mdnogDJTU1bSdfv8unoxVoajTZkbunhxtlmnQlKoDzF6m?= =?utf-8?q?bCCiLbFC2v6WvBBrlOKFvh+Kes+F2KJ6ZYJWLjGVi33EOorXNaBIFLT+0gH4mm4eN?= =?utf-8?q?PdbUyvlqCdWd+/NU23oCXeXqoz5xwyrKmSSwEoZjlMgp/bW0IF7MtpaLS61Hjjyq2?= =?utf-8?q?BTerOcVbbNRL6K55dFQfUQu9HTeRopSBg8KZCEuLCAp9IRKs+WCi977uKVK/x2wTq?= =?utf-8?q?X8laLuzd7gAvRT5jJTFHW2faVqEXCIJ+KEBQHwK3fwQzrMEuCUtnvgO+vnSVXDSXg?= =?utf-8?q?IZ/WNVGtcueK+UeLXVRpAqCQBKNse6wFga+rikmuLCLMKBfOAA22pdNSzSlNn3EOe?= =?utf-8?q?YTYxADPVAQYU+vfhCDUiFCnyxrctw5VURUU6/y1TANA/iToc9ShFWMcEA434b35Bc?= =?utf-8?q?fJaU0Ry7Fkrbc257VhkRshhUyYr36I6ngFHi34TJoILqeGwf90Jpi0A=3D?= X-Forefront-Antispam-Report: CIP:131.228.6.101;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr712usmtp1.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(36860700013)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 21:59:31.3923 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e3554d9-13e3-47ba-3acf-08dcf21ba461 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.6.101];Helo=[fr712usmtp1.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF000509F2.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR07MB8562 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Create helpers for TCP ECN modes. No functional changes. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- include/net/tcp.h | 44 ++++++++++++++++++++++++++++++++++++---- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_dctcp.c | 2 +- net/ipv4/tcp_input.c | 14 ++++++------- net/ipv4/tcp_minisocks.c | 4 +++- net/ipv4/tcp_output.c | 6 +++--- 6 files changed, 55 insertions(+), 17 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 55a7f0a7ee59..b6a4e0124280 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -372,10 +372,46 @@ static inline void tcp_dec_quickack_mode(struct sock *sk) } } -#define TCP_ECN_OK 1 -#define TCP_ECN_QUEUE_CWR 2 -#define TCP_ECN_DEMAND_CWR 4 -#define TCP_ECN_SEEN 8 +#define TCP_ECN_MODE_RFC3168 BIT(0) +#define TCP_ECN_QUEUE_CWR BIT(1) +#define TCP_ECN_DEMAND_CWR BIT(2) +#define TCP_ECN_SEEN BIT(3) +#define TCP_ECN_MODE_ACCECN BIT(4) + +#define TCP_ECN_DISABLED 0 +#define TCP_ECN_MODE_PENDING (TCP_ECN_MODE_RFC3168 | TCP_ECN_MODE_ACCECN) +#define TCP_ECN_MODE_ANY (TCP_ECN_MODE_RFC3168 | TCP_ECN_MODE_ACCECN) + +static inline bool tcp_ecn_mode_any(const struct tcp_sock *tp) +{ + return tp->ecn_flags & TCP_ECN_MODE_ANY; +} + +static inline bool tcp_ecn_mode_rfc3168(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_ANY) == TCP_ECN_MODE_RFC3168; +} + +static inline bool tcp_ecn_mode_accecn(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_ANY) == TCP_ECN_MODE_ACCECN; +} + +static inline bool tcp_ecn_disabled(const struct tcp_sock *tp) +{ + return !tcp_ecn_mode_any(tp); +} + +static inline bool tcp_ecn_mode_pending(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_PENDING) == TCP_ECN_MODE_PENDING; +} + +static inline void tcp_ecn_mode_set(struct tcp_sock *tp, u8 mode) +{ + tp->ecn_flags &= ~TCP_ECN_MODE_ANY; + tp->ecn_flags |= mode; +} enum tcp_tw_status { TCP_TW_SUCCESS = 0, diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 82cc4a5633ce..94546f55385a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4107,7 +4107,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) info->tcpi_rcv_wscale = tp->rx_opt.rcv_wscale; } - if (tp->ecn_flags & TCP_ECN_OK) + if (tcp_ecn_mode_any(tp)) info->tcpi_options |= TCPI_OPT_ECN; if (tp->ecn_flags & TCP_ECN_SEEN) info->tcpi_options |= TCPI_OPT_ECN_SEEN; diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c index 8a45a4aea933..03abe0848420 100644 --- a/net/ipv4/tcp_dctcp.c +++ b/net/ipv4/tcp_dctcp.c @@ -90,7 +90,7 @@ __bpf_kfunc static void dctcp_init(struct sock *sk) { const struct tcp_sock *tp = tcp_sk(sk); - if ((tp->ecn_flags & TCP_ECN_OK) || + if (tcp_ecn_mode_any(tp) || (sk->sk_state == TCP_LISTEN || sk->sk_state == TCP_CLOSE)) { struct dctcp *ca = inet_csk_ca(sk); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 6d4abd452a36..0161660938d3 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -334,7 +334,7 @@ static bool tcp_in_quickack_mode(struct sock *sk) static void tcp_ecn_queue_cwr(struct tcp_sock *tp) { - if (tp->ecn_flags & TCP_ECN_OK) + if (tcp_ecn_mode_rfc3168(tp)) tp->ecn_flags |= TCP_ECN_QUEUE_CWR; } @@ -361,7 +361,7 @@ static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb) { struct tcp_sock *tp = tcp_sk(sk); - if (!(tcp_sk(sk)->ecn_flags & TCP_ECN_OK)) + if (tcp_ecn_disabled(tp)) return; switch (TCP_SKB_CB(skb)->ip_dsfield & INET_ECN_MASK) { @@ -394,19 +394,19 @@ static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb) static void tcp_ecn_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th) { - if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || th->cwr)) - tp->ecn_flags &= ~TCP_ECN_OK; + if (tcp_ecn_mode_rfc3168(tp) && (!th->ece || th->cwr)) + tcp_ecn_mode_set(tp, TCP_ECN_DISABLED); } static void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th) { - if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || !th->cwr)) - tp->ecn_flags &= ~TCP_ECN_OK; + if (tcp_ecn_mode_rfc3168(tp) && (!th->ece || !th->cwr)) + tcp_ecn_mode_set(tp, TCP_ECN_DISABLED); } static bool tcp_ecn_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr *th) { - if (th->ece && !th->syn && (tp->ecn_flags & TCP_ECN_OK)) + if (th->ece && !th->syn && tcp_ecn_mode_rfc3168(tp)) return true; return false; } diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index bb1fe1ba867a..bd6515ab660f 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -453,7 +453,9 @@ EXPORT_SYMBOL(tcp_openreq_init_rwin); static void tcp_ecn_openreq_child(struct tcp_sock *tp, const struct request_sock *req) { - tp->ecn_flags = inet_rsk(req)->ecn_ok ? TCP_ECN_OK : 0; + tcp_ecn_mode_set(tp, inet_rsk(req)->ecn_ok ? + TCP_ECN_MODE_RFC3168 : + TCP_ECN_DISABLED); } void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 64d47c18255f..bb83ad43a4e2 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -322,7 +322,7 @@ static void tcp_ecn_send_synack(struct sock *sk, struct sk_buff *skb) const struct tcp_sock *tp = tcp_sk(sk); TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_CWR; - if (!(tp->ecn_flags & TCP_ECN_OK)) + if (tcp_ecn_disabled(tp)) TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_ECE; else if (tcp_ca_needs_ecn(sk) || tcp_bpf_ca_needs_ecn(sk)) @@ -351,7 +351,7 @@ static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb) INET_ECN_xmit(sk); TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR; - tp->ecn_flags = TCP_ECN_OK; + tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168); } } @@ -379,7 +379,7 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb, { struct tcp_sock *tp = tcp_sk(sk); - if (tp->ecn_flags & TCP_ECN_OK) { + if (tcp_ecn_mode_rfc3168(tp)) { /* Not-retransmitted data segment: set ECT and inject CWR. */ if (skb->len != tcp_header_len && !before(TCP_SKB_CB(skb)->seq, tp->snd_nxt)) {