svn commit: r360026 - in head/sys/net: . route

[Adrian Chadd]

Author: adrian
Date: Thu Apr 16 23:28:47 2020
New Revision: 360026
URL: https://svnweb.freebsd.org/changeset/base/360026

Log:
  Remove an duplicate definition of nhops_dump_sysctl()
  
  One of the source files included both nhop.h and shared.h, leading to this
  clashing.
  
  Tested with: mips-gcc cross toolchain

Modified:
  head/sys/net/route/nhop.h
  head/sys/net/rtsock.c

Modified: head/sys/net/route/nhop.h
==============================================================================
--- head/sys/net/route/nhop.h	Thu Apr 16 21:56:52 2020	(r360025)
+++ head/sys/net/route/nhop.h	Thu Apr 16 23:28:47 2020	(r360026)
@@ -177,8 +177,6 @@ uint32_t nhop_get_idx(const struct nhop_object *nh);
 enum nhop_type nhop_get_type(const struct nhop_object *nh);
 int nhop_get_rtflags(const struct nhop_object *nh);
 
-int nhops_dump_sysctl(struct rib_head *rh, struct sysctl_req *w);
-
 #endif /* _KERNEL */
 
 /* Kernel <> userland structures */

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Thu Apr 16 21:56:52 2020	(r360025)
+++ head/sys/net/rtsock.c	Thu Apr 16 23:28:47 2020	(r360026)
@@ -78,6 +78,7 @@
 #include <netinet6/scope6_var.h>
 #endif
 #include <net/route/nhop.h>
+#include <net/route/shared.h>
 
 #ifdef COMPAT_FREEBSD32
 #include <sys/mount.h>