From 65b7de8d2cc15e14b84872f72f2111ac45fa31c2 Mon Sep 17 00:00:00 2001
From: mvs <mvs@openbsd.org>
Date: Tue, 23 Jan 2024 16:57:52 +0000
Subject: [PATCH] Remove `pipex_rd_head6' and `ps6_rn[2]'. They are not used.

ok yasuoka
---
 sys/net/pipex.c       | 8 +-------
 sys/net/pipex_local.h | 4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 299d1902a68..c6a4e27bff7 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.151 2023/12/01 20:30:22 mvs Exp $ */
+/*	$OpenBSD: pipex.c,v 1.152 2024/01/23 16:57:52 mvs Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -98,7 +98,6 @@ struct pipex_hash_head
     pipex_id_hashtable[PIPEX_HASH_SIZE];	/* [L] peer id hash */
 
 struct radix_node_head	*pipex_rd_head4 = NULL;	/* [L] */
-struct radix_node_head	*pipex_rd_head6 = NULL;	/* [L] */
 struct timeout pipex_timer_ch;		/* callout timer context */
 int pipex_prune = 1;			/* [I] walk list every seconds */
 
@@ -437,11 +436,6 @@ pipex_link_session(struct pipex_session *session, struct ifnet *ifp,
 		    offsetof(struct sockaddr_in, sin_addr)))
 			panic("rn_inithead() failed on pipex_link_session()");
 	}
-	if (pipex_rd_head6 == NULL) {
-		if (!rn_inithead((void **)&pipex_rd_head6,
-		    offsetof(struct sockaddr_in6, sin6_addr)))
-			panic("rn_inithead() failed on pipex_link_session()");
-	}
 	if (pipex_lookup_by_session_id_locked(session->protocol,
 	    session->session_id)) {
 		error = EEXIST;
diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h
index 5a6264d82c4..8274bdcbf2f 100644
--- a/sys/net/pipex_local.h
+++ b/sys/net/pipex_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex_local.h,v 1.49 2022/07/15 22:56:13 mvs Exp $	*/
+/*	$OpenBSD: pipex_local.h,v 1.50 2024/01/23 16:57:53 mvs Exp $	*/
 
 /*
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -160,8 +160,6 @@ struct cpumem;
 struct pipex_session {
 	struct radix_node	ps4_rn[2];
 					/* [L] tree glue, and other values */
-	struct radix_node	ps6_rn[2];
-					/* [L] tree glue, and other values */
 
 	struct refcnt pxs_refcnt;
 	struct mutex pxs_mtx;
-- 
2.20.1