From owner-svn-src-all@freebsd.org Tue Dec 31 17:57:13 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A9791DA3A7; Tue, 31 Dec 2019 17:57:13 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47nMSn1H8Hz4XZL; Tue, 31 Dec 2019 17:57:13 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 272AB1DE8E; Tue, 31 Dec 2019 17:57:13 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBVHvD0L013705; Tue, 31 Dec 2019 17:57:13 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBVHvDKr013704; Tue, 31 Dec 2019 17:57:13 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201912311757.xBVHvDKr013704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 31 Dec 2019 17:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356237 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 356237 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2019 17:57:13 -0000 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);