From: aoyama <aoyama@openbsd.org>
Date: Mon, 5 Feb 2024 12:52:11 +0000 (+0000)
Subject: Move route_cache() declaration from net/route.h to netinet/in.h.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=56ac69207b36fb9062b0f326722f1259ed2d77bd;p=openbsd

Move route_cache() declaration from net/route.h to netinet/in.h.

This prevents gcc3's 'parameter has incomplete type' warning that
causes kernel build failure.

Suggested by claudio@, ok bluhm@
---

diff --git a/sys/net/route.h b/sys/net/route.h
index 2d2a31d2ece..9871d820c5e 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.204 2024/01/31 14:56:42 bluhm Exp $	*/
+/*	$OpenBSD: route.h,v 1.205 2024/02/05 12:52:11 aoyama Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -444,13 +444,11 @@ extern u_long rtgeneration;
 struct mbuf;
 struct socket;
 struct ifnet;
-struct in_addr;
 struct sockaddr_in6;
 struct if_ieee80211_data;
 struct bfd_config;
 
 void	 route_init(void);
-void	 route_cache(struct route *, struct in_addr, u_int);
 void	 rtm_ifchg(struct ifnet *);
 void	 rtm_ifannounce(struct ifnet *, int);
 void	 rtm_bfd(struct bfd_config *);
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 9e7b473fd3d..65110f27e98 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.h,v 1.145 2023/11/10 20:05:22 bluhm Exp $	*/
+/*	$OpenBSD: in.h,v 1.146 2024/02/05 12:52:11 aoyama Exp $	*/
 /*	$NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $	*/
 
 /*
@@ -770,6 +770,7 @@ struct sockaddr;
 struct sockaddr_in;
 struct ifaddr;
 struct in_ifaddr;
+struct route;
 
 void	   ipv4_input(struct ifnet *, struct mbuf *);
 struct mbuf *
@@ -788,6 +789,8 @@ void	   in_len2mask(struct in_addr *, int);
 int	   in_nam2sin(const struct mbuf *, struct sockaddr_in **);
 int	   in_sa2sin(struct sockaddr *, struct sockaddr_in **);
 
+void	   route_cache(struct route *, struct in_addr, u_int);
+
 char	  *inet_ntoa(struct in_addr);
 int	   inet_nat64(int, const void *, void *, const void *, u_int8_t);
 int	   inet_nat46(int, const void *, void *, const void *, u_int8_t);