tcp_splice: Eliminate SPLICE_V6 flag

Since we're now constructing socket addresses based on information in the
flowside, we no longer need an explicit flag to tell if we're dealing with
an IPv4 or IPv6 connection.  Hence, drop the now unused SPLICE_V6 flag.

As well as just simplifying the code, this allows for possible future
extensions where we could splice an IPv4 connection to an IPv6 connection
or vice versa.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/tcp_conn.h b/tcp_conn.h
index 4e7c57a..6ae0511 100644
--- a/tcp_conn.h
+++ b/tcp_conn.h
@@ -125,10 +125,9 @@ struct tcp_splice_conn {
 #define FIN_SENT(sidei_)		((sidei_) ? BIT(7) : BIT(6))
 
 	uint8_t flags;
-#define SPLICE_V6			BIT(0)
-#define RCVLOWAT_SET(sidei_)		((sidei_) ? BIT(2) : BIT(1))
-#define RCVLOWAT_ACT(sidei_)		((sidei_) ? BIT(4) : BIT(3))
-#define CLOSING				BIT(5)
+#define RCVLOWAT_SET(sidei_)		((sidei_) ? BIT(1) : BIT(0))
+#define RCVLOWAT_ACT(sidei_)		((sidei_) ? BIT(3) : BIT(2))
+#define CLOSING				BIT(4)
 
 	bool in_epoll	:1;
 };