From 1440f62266cd056b1520e799c02406020e526c65 Mon Sep 17 00:00:00 2001
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 20 Sep 2020 21:32:52 +0000
Subject: [PATCH] Remove unused nhop_ref_any() function. Remove "opt_mpath.h"
 header where not needed.

No functional changes.
---
 sys/net/route/nhop_ctl.c   | 7 -------
 sys/net/route/nhop_utils.c | 1 -
 sys/net/route/route_var.h  | 1 -
 sys/netinet/in_proto.c     | 1 -
 sys/netinet6/in6_proto.c   | 1 -
 sys/netinet6/in6_src.c     | 2 --
 6 files changed, 13 deletions(-)

diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c
index ae1bc66dad47..b9ac4d63218d 100644
--- a/sys/net/route/nhop_ctl.c
+++ b/sys/net/route/nhop_ctl.c
@@ -691,13 +691,6 @@ nhop_free(struct nhop_object *nh)
 	    &nh_priv->nh_epoch_ctx);
 }
 
-int
-nhop_ref_any(struct nhop_object *nh)
-{
-
-	return (nhop_try_ref_object(nh));
-}
-
 void
 nhop_free_any(struct nhop_object *nh)
 {
diff --git a/sys/net/route/nhop_utils.c b/sys/net/route/nhop_utils.c
index c0d432ceaf65..df4fb4db66ca 100644
--- a/sys/net/route/nhop_utils.c
+++ b/sys/net/route/nhop_utils.c
@@ -29,7 +29,6 @@
 __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_route.h"
-#include "opt_mpath.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/route/route_var.h b/sys/net/route/route_var.h
index 7531646d1ad8..1ed4f5e95d61 100644
--- a/sys/net/route/route_var.h
+++ b/sys/net/route/route_var.h
@@ -244,7 +244,6 @@ int nhops_init_rib(struct rib_head *rh);
 void nhops_destroy_rib(struct rib_head *rh);
 void nhop_ref_object(struct nhop_object *nh);
 int nhop_try_ref_object(struct nhop_object *nh);
-int nhop_ref_any(struct nhop_object *nh);
 void nhop_free_any(struct nhop_object *nh);
 
 void nhop_set_type(struct nhop_object *nh, enum nhop_type nh_type);
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 4133ded92a82..11688e3cb1d2 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_sctp.h"
-#include "opt_mpath.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 9f9c9b9dbbf8..21b7d660676f 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipsec.h"
 #include "opt_ipstealth.h"
 #include "opt_sctp.h"
-#include "opt_mpath.h"
 #include "opt_route.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 4921f7027218..7a756030f01c 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -67,8 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_mpath.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>