Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2019 17:57:13 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r356237 - head/sys/net
Message-ID:  <201912311757.xBVHvDKr013704@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: melifaro
Date: Tue Dec 31 17:57:12 2019
New Revision: 356237
URL: https://svnweb.freebsd.org/changeset/base/356237

Log:
  Fix NOINET6 build broken by r356236.
  
  MFC after:	2 weeks

Modified:
  head/sys/net/rtsock.c

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Tue Dec 31 17:26:53 2019	(r356236)
+++ head/sys/net/rtsock.c	Tue Dec 31 17:57:12 2019	(r356237)
@@ -841,9 +841,9 @@ route_output(struct mbuf *m, struct socket *so, ...)
 	struct rt_msghdr *rtm = NULL;
 	struct rtentry *rt = NULL;
 	struct rt_addrinfo info;
-	struct sockaddr_storage ss;
 	struct epoch_tracker et;
 #ifdef INET6
+	struct sockaddr_storage ss;
 	struct sockaddr_in6 *sin6;
 	int i, rti_need_deembed = 0;
 #endif
@@ -968,7 +968,9 @@ report:
 		 * writing updated rtm in rtsock_msg_buffer().
 		 * With that in mind, skip deembedding procedure below.
 		 */
+#ifdef INET6
 		rti_need_deembed = 0;
+#endif
 		RT_UNLOCK(rt);
 		if (error != 0)
 			senderr(error);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912311757.xBVHvDKr013704>