From owner-svn-src-head@freebsd.org  Thu Apr 23 06:55:33 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C817A2A9082;
 Thu, 23 Apr 2020 06:55:33 +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 4977Nj4xfGz4YJv;
 Thu, 23 Apr 2020 06:55:33 +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 A4B4C304;
 Thu, 23 Apr 2020 06:55:33 +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 03N6tX5e033189;
 Thu, 23 Apr 2020 06:55:33 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03N6tXbk033188;
 Thu, 23 Apr 2020 06:55:33 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <202004230655.03N6tXbk033188@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 23 Apr 2020 06:55:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360217 - head/sys/netinet
X-SVN-Group: head
X-SVN-Commit-Author: melifaro
X-SVN-Commit-Paths: head/sys/netinet
X-SVN-Commit-Revision: 360217
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2020 06:55:33 -0000

Author: melifaro
Date: Thu Apr 23 06:55:33 2020
New Revision: 360217
URL: https://svnweb.freebsd.org/changeset/base/360217

Log:
  Unbreak LINT-NOINET[6] builds broken in r360191.
  
  Reported by:	np

Modified:
  head/sys/netinet/tcp_offload.c

Modified: head/sys/netinet/tcp_offload.c
==============================================================================
--- head/sys/netinet/tcp_offload.c	Thu Apr 23 04:59:07 2020	(r360216)
+++ head/sys/netinet/tcp_offload.c	Thu Apr 23 06:55:33 2020	(r360217)
@@ -30,6 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
+#include "opt_inet6.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,12 +77,19 @@ tcp_offload_connect(struct socket *so, struct sockaddr
 
 	NET_EPOCH_ENTER(et);
 	nh = NULL;
+#ifdef INET
 	if (nam->sa_family == AF_INET)
 		nh = fib4_lookup(0, ((struct sockaddr_in *)nam)->sin_addr,
 		    NHR_NONE, 0, 0);
-	else if (nam->sa_family == AF_INET6)
+#endif
+#if defined(INET) && defined(INET6)
+	else
+#endif
+#ifdef INET6
+	if (nam->sa_family == AF_INET6)
 		nh = fib6_lookup(0, &((struct sockaddr_in6 *)nam)->sin6_addr,
 		    NHR_NONE, 0, 0);
+#endif
 	if (nh == NULL) {
 		NET_EPOCH_EXIT(et);
 		return (EHOSTUNREACH);