From a9bf6d57fde5aa07b4268b6ec1b752fbc5ea2c1d Mon Sep 17 00:00:00 2001 From: kn Date: Sat, 12 Nov 2022 16:36:07 +0000 Subject: [PATCH] Remove unused fields from struct in6_ifextra This is all under _KERNEL: - rs_lhcookie was added in 2014 110585f259f4974284e531f0a1e121b001a580dc "Move sending of router solicitations to the kernel; [...]" but never used - nprefixes and ndefrouters became obsolete with 2017 4a2f474d14c160dc7829cce0149ead09d473ece9 "Remove sending of router solicitations and processing of router advertisements from the kernel. [...]" OK mpi --- sys/netinet6/in6.c | 4 +--- sys/netinet6/in6_var.h | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 900456fff1a..3805c070fe8 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.249 2022/09/08 10:22:06 kn Exp $ */ +/* $OpenBSD: in6.c,v 1.250 2022/11/12 16:36:07 kn Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -1602,8 +1602,6 @@ in6_domifattach(struct ifnet *ifp) ext = malloc(sizeof(*ext), M_IFADDR, M_WAITOK | M_ZERO); ext->nd_ifinfo = nd6_ifattach(ifp); - ext->nprefixes = 0; - ext->ndefrouters = 0; return ext; } diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 704cd09369f..c2ce99e08ec 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.74 2022/01/02 22:36:04 jsg Exp $ */ +/* $OpenBSD: in6_var.h,v 1.75 2022/11/12 16:36:07 kn Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -90,9 +90,6 @@ struct in6_addrlifetime { struct nd_ifinfo; struct in6_ifextra { struct nd_ifinfo *nd_ifinfo; - void *rs_lhcookie; - int nprefixes; - int ndefrouters; }; struct in6_ifaddr { -- 2.20.1