From 0783a7b08e769de05efc467a131467eeb6d94c22 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Wed, 5 Apr 2023 18:14:51 +0200 Subject: [PATCH] MINOR: listener: remove unneeded local accept flag Remove the receiver RX_F_LOCAL_ACCEPT flag. This was used by QUIC protocol before thread rebinding was supported by the quic_conn layer. This should be backported up to 2.7 after the previous patch has also been taken. --- include/haproxy/receiver-t.h | 1 - src/listener.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/include/haproxy/receiver-t.h b/include/haproxy/receiver-t.h index 4372d46..0dfca42 100644 --- a/include/haproxy/receiver-t.h +++ b/include/haproxy/receiver-t.h @@ -33,7 +33,6 @@ #define RX_F_BOUND 0x00000001 /* receiver already bound */ #define RX_F_INHERITED 0x00000002 /* inherited FD from the parent process (fd@) */ #define RX_F_MWORKER 0x00000004 /* keep the FD open in the master but close it in the children */ -#define RX_F_LOCAL_ACCEPT 0x00000008 /* do not use a tasklet for accept, connections will be accepted on the current thread */ /* Bit values for rx_settings->options */ #define RX_O_FOREIGN 0x00000001 /* receives on foreign addresses */ diff --git a/src/listener.c b/src/listener.c index 07c7f92..ad72c8e 100644 --- a/src/listener.c +++ b/src/listener.c @@ -1096,9 +1096,6 @@ void listener_accept(struct listener *l) #if defined(USE_THREAD) - if (l->rx.flags & RX_F_LOCAL_ACCEPT) - goto local_accept; - mask = l->rx.bind_thread & _HA_ATOMIC_LOAD(&tg->threads_enabled); if (atleast2(mask) && (global.tune.options & GTUNE_LISTENER_MQ) && !stopping) { struct accept_queue_ring *ring; -- 1.7.10.4