git: 6c3f613b6e65 - stable/13 - Fix NOINET6 build broken by 2fe5a79425c7.

Alexander V. Chernikov melifaro at FreeBSD.org
Wed Mar 10 22:27:55 UTC 2021


The branch stable/13 has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=6c3f613b6e65d78ee7a836895f5569ee1ac604e2

commit 6c3f613b6e65d78ee7a836895f5569ee1ac604e2
Author:     Alexander V. Chernikov <melifaro at FreeBSD.org>
AuthorDate: 2021-02-16 21:49:48 +0000
Commit:     Alexander V. Chernikov <melifaro at FreeBSD.org>
CommitDate: 2021-03-10 21:48:14 +0000

    Fix NOINET6 build broken by 2fe5a79425c7.
    
    Reported by:    mjg
    
    (cherry picked from commit a4513bace0e0c38d38b0c49c1daea60f2741d781)
---
 sys/net/rtsock.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 5181ef273385..011f07803bfa 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1235,6 +1235,7 @@ rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo)
 	return (0);
 }
 
+#ifdef INET
 static inline void
 fill_sockaddr_inet(struct sockaddr_in *sin, struct in_addr addr)
 {
@@ -1246,7 +1247,9 @@ fill_sockaddr_inet(struct sockaddr_in *sin, struct in_addr addr)
 	};
 	*sin = nsin;
 }
+#endif
 
+#ifdef INET6
 static inline void
 fill_sockaddr_inet6(struct sockaddr_in6 *sin6, const struct in6_addr *addr6,
     uint32_t scopeid)
@@ -1260,6 +1263,7 @@ fill_sockaddr_inet6(struct sockaddr_in6 *sin6, const struct in6_addr *addr6,
 	};
 	*sin6 = nsin6;
 }
+#endif
 
 static int
 cleanup_xaddrs_gateway(struct rt_addrinfo *info)
@@ -1314,6 +1318,7 @@ cleanup_xaddrs_gateway(struct rt_addrinfo *info)
 	return (0);
 }
 
+#ifdef INET
 static int
 cleanup_xaddrs_inet(struct rt_addrinfo *info)
 {
@@ -1354,7 +1359,9 @@ cleanup_xaddrs_inet(struct rt_addrinfo *info)
 
 	return (0);
 }
+#endif
 
+#ifdef INET6
 static int
 cleanup_xaddrs_inet6(struct rt_addrinfo *info)
 {
@@ -1392,6 +1399,7 @@ cleanup_xaddrs_inet6(struct rt_addrinfo *info)
 
 	return (0);
 }
+#endif
 
 static int
 cleanup_xaddrs(struct rt_addrinfo *info)


More information about the dev-commits-src-all mailing list