From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 30 Mar 2022 14:31:41 +0000 (+0200)
Subject: CLEANUP: stream-int: Remove unused SI_FL_CLEAN_ABRT flag
X-Git-Tag: v2.6-dev6~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78ed7f247bba982dc9f28c7980539ff95328f348;p=thirdparty%2Fhaproxy.git

CLEANUP: stream-int: Remove unused SI_FL_CLEAN_ABRT flag

This flag is unused. So remove it to be able to remove the stream-interface.
---

diff --git a/dev/flags/flags.c b/dev/flags/flags.c
index 367c55868b..0138f4f08b 100644
--- a/dev/flags/flags.c
+++ b/dev/flags/flags.c
@@ -270,7 +270,6 @@ void show_si_flags(unsigned int f)
 	SHOW_FLAG(f, SI_FL_WAIT_DATA);
 	SHOW_FLAG(f, SI_FL_ISBACK);
 	SHOW_FLAG(f, SI_FL_WANT_GET);
-	SHOW_FLAG(f, SI_FL_CLEAN_ABRT);
 	SHOW_FLAG(f, SI_FL_RXBLK_CHAN);
 	SHOW_FLAG(f, SI_FL_RXBLK_BUFF);
 	SHOW_FLAG(f, SI_FL_RXBLK_ROOM);
diff --git a/include/haproxy/stream_interface-t.h b/include/haproxy/stream_interface-t.h
index fa1062e5a0..bb2fdbdc44 100644
--- a/include/haproxy/stream_interface-t.h
+++ b/include/haproxy/stream_interface-t.h
@@ -88,7 +88,6 @@ enum {
 	SI_FL_ISBACK     = 0x00000010,  /* 0 for front-side SI, 1 for back-side */
 	/* unused: 0x00000200 */
 	SI_FL_WANT_GET   = 0x00004000,  /* a stream-int would like to get some data from the buffer */
-	SI_FL_CLEAN_ABRT = 0x00008000,  /* SI_FL_ERR is used to report aborts, and not SHUTR */
 
 	SI_FL_RXBLK_CHAN = 0x00010000,  /* the channel doesn't want the stream-int to introduce data */
 	SI_FL_RXBLK_BUFF = 0x00020000,  /* stream-int waits for a buffer allocation to complete */
diff --git a/src/stream.c b/src/stream.c
index 7a4dfef7f3..61e66601c4 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -470,12 +470,8 @@ struct stream *stream_new(struct session *sess, struct conn_stream *cs, struct b
 	if (cs_conn(cs)) {
 		const struct mux_ops *mux = cs_conn_mux(cs);
 
-		if (mux) {
-			if (mux->flags & MX_FL_CLEAN_ABRT)
-				cs_si(s->csf)->flags |= SI_FL_CLEAN_ABRT;
-			if (mux->flags & MX_FL_HTX)
-				s->flags |= SF_HTX;
-		}
+		if (mux && mux->flags & MX_FL_HTX)
+			s->flags |= SF_HTX;
 	}
 
 	stream_init_srv_conn(s);