From owner-svn-src-head@freebsd.org  Thu Sep  6 16:11:24 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3D4EFFF971;
 Thu,  6 Sep 2018 16:11:24 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7A94E7DEFF;
 Thu,  6 Sep 2018 16:11:24 +0000 (UTC) (envelope-from bz@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 7592F74E8;
 Thu,  6 Sep 2018 16:11:24 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w86GBOuQ062574;
 Thu, 6 Sep 2018 16:11:24 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w86GBOaD062573;
 Thu, 6 Sep 2018 16:11:24 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201809061611.w86GBOaD062573@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 6 Sep 2018 16:11:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338498 - head/sys/netinet
X-SVN-Group: head
X-SVN-Commit-Author: bz
X-SVN-Commit-Paths: head/sys/netinet
X-SVN-Commit-Revision: 338498
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.27
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, 06 Sep 2018 16:11:24 -0000

Author: bz
Date: Thu Sep  6 16:11:24 2018
New Revision: 338498
URL: https://svnweb.freebsd.org/changeset/base/338498

Log:
  Make tcp_hpts.c compile a LINT kernel with options RSS and PCBGROUPS added by
  adding the missing include files and changing a the type of cpuid which
  would otherwise cause a false comparison with NETISR_CPUID_NONE.
  
  Reviewed by:	rrs
  Approved by:	re (marius)
  Differential Revision:	https://reviews.freebsd.org/D16891

Modified:
  head/sys/netinet/tcp_hpts.c

Modified: head/sys/netinet/tcp_hpts.c
==============================================================================
--- head/sys/netinet/tcp_hpts.c	Thu Sep  6 14:55:54 2018	(r338497)
+++ head/sys/netinet/tcp_hpts.c	Thu Sep  6 16:11:24 2018	(r338498)
@@ -167,6 +167,8 @@ __FBSDID("$FreeBSD$");
 
 MALLOC_DEFINE(M_TCPHPTS, "tcp_hpts", "TCP hpts");
 #ifdef RSS
+#include <net/netisr.h>
+#include <net/rss_config.h>
 static int tcp_bind_threads = 1;
 #else
 static int tcp_bind_threads = 0;
@@ -1076,7 +1078,7 @@ hpts_random_cpu(struct inpcb *inp){
 
 static uint16_t
 hpts_cpuid(struct inpcb *inp){
-	uint16_t cpuid;
+	u_int cpuid;
 
 
 	/*