svn commit: r365930 - in head/sys: net/route netinet netinet6

[Alexander V. Chernikov]

Author: melifaro
Date: Sun Sep 20 21:32:52 2020
New Revision: 365930
URL: https://svnweb.freebsd.org/changeset/base/365930

Log:
  Remove unused nhop_ref_any() function.
  Remove "opt_mpath.h" header where not needed.
  
  No functional changes.

Modified:
  head/sys/net/route/nhop_ctl.c
  head/sys/net/route/nhop_utils.c
  head/sys/net/route/route_var.h
  head/sys/netinet/in_proto.c
  head/sys/netinet6/in6_proto.c
  head/sys/netinet6/in6_src.c

Modified: head/sys/net/route/nhop_ctl.c
==============================================================================
--- head/sys/net/route/nhop_ctl.c	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/net/route/nhop_ctl.c	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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)
 {

Modified: head/sys/net/route/nhop_utils.c
==============================================================================
--- head/sys/net/route/nhop_utils.c	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/net/route/nhop_utils.c	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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>

Modified: head/sys/net/route/route_var.h
==============================================================================
--- head/sys/net/route/route_var.h	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/net/route/route_var.h	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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);

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/netinet/in_proto.c	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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>

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/netinet6/in6_proto.c	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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>

Modified: head/sys/netinet6/in6_src.c
==============================================================================
--- head/sys/netinet6/in6_src.c	Sun Sep 20 17:28:24 2020	(r365929)
+++ head/sys/netinet6/in6_src.c	Sun Sep 20 21:32:52 2020	(r365930)
@@ -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>