svn commit: r315714 - in head/sys: compat/linuxkpi/common/include/net ofed/drivers/infiniband/core

[Hans Petter Selasky]

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: