From owner-svn-src-head@freebsd.org  Wed Mar 22 15:46:32 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89922D18B3F;
 Wed, 22 Mar 2017 15:46:32 +0000 (UTC)
 (envelope-from hselasky@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 mx1.freebsd.org (Postfix) with ESMTPS id 528711F41;
 Wed, 22 Mar 2017 15:46:32 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MFkVCv079472;
 Wed, 22 Mar 2017 15:46:31 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MFkVt6079470;
 Wed, 22 Mar 2017 15:46:31 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201703221546.v2MFkVt6079470@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 22 Mar 2017 15:46:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315714 - in head/sys: compat/linuxkpi/common/include/net
 ofed/drivers/infiniband/core
X-SVN-Group: head
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.23
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: Wed, 22 Mar 2017 15:46:32 -0000

Author: hselasky
Date: Wed Mar 22 15:46:31 2017
New Revision: 315714
URL: https://svnweb.freebsd.org/changeset/base/315714

Log:
  Add full VNET support to the inet_get_local_port_range() function in
  the LinuxKPI.
  
  MFC after:		1 week
  Sponsored by:		Mellanox Technologies

Modified:
  head/sys/compat/linuxkpi/common/include/net/ip.h
  head/sys/ofed/drivers/infiniband/core/cma.c

Modified: head/sys/compat/linuxkpi/common/include/net/ip.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/net/ip.h	Wed Mar 22 15:44:00 2017	(r315713)
+++ head/sys/compat/linuxkpi/common/include/net/ip.h	Wed Mar 22 15:46:31 2017	(r315714)
@@ -43,10 +43,11 @@
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 
-static inline void inet_get_local_port_range(int *low, int *high)
+static inline void
+inet_get_local_port_range(struct vnet *vnet, int *low, int *high)
 {
 #ifdef INET
-	CURVNET_SET_QUIET(TD_TO_VNET(curthread));
+	CURVNET_SET_QUIET(vnet);
 	*low = V_ipport_firstauto;
 	*high = V_ipport_lastauto;
 	CURVNET_RESTORE();

Modified: head/sys/ofed/drivers/infiniband/core/cma.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/cma.c	Wed Mar 22 15:44:00 2017	(r315713)
+++ head/sys/ofed/drivers/infiniband/core/cma.c	Wed Mar 22 15:46:31 2017	(r315714)
@@ -2503,7 +2503,7 @@ static int cma_alloc_any_port(struct idr
 	int low, high, remaining;
 	unsigned int rover;
 
-	inet_get_local_port_range(&low, &high);
+	inet_get_local_port_range(&init_net, &low, &high);
 	remaining = (high - low) + 1;
 	rover = random() % remaining + low;
 retry: