From 7b345d399985b8d7d9edce5a7849f88fece38efa Mon Sep 17 00:00:00 2001
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Mon, 8 Dec 2014 07:25:59 +0000
Subject: [PATCH] Use CURVNET macros inside inet_get_local_port_range()
 function. Without this fix, a kernel with VIMAGE + Infiniband will panic on
 bootup.

Certain necessary #include statements require LIST_HEAD.
Add these includes to ofed/include/linux/list.h, because
LIST_HEAD is specifically overridden in this file.

PR: 191468
Differential Revision: D1279
Reviewed by: hselasky
---
 sys/ofed/include/linux/list.h | 2 ++
 sys/ofed/include/net/ip.h     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys/ofed/include/linux/list.h b/sys/ofed/include/linux/list.h
index 2c3628239ab..60a3f8ea908 100644
--- a/sys/ofed/include/linux/list.h
+++ b/sys/ofed/include/linux/list.h
@@ -40,6 +40,7 @@
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/cpuset.h>
+#include <sys/jail.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
@@ -53,6 +54,7 @@
 #include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
diff --git a/sys/ofed/include/net/ip.h b/sys/ofed/include/net/ip.h
index 9d81ba6d65a..32cc18646c0 100644
--- a/sys/ofed/include/net/ip.h
+++ b/sys/ofed/include/net/ip.h
@@ -45,8 +45,10 @@
 #ifdef INET
 static inline void inet_get_local_port_range(int *low, int *high)
 {
+	CURVNET_SET_QUIET(TD_TO_VNET(curthread));
 	*low = V_ipport_firstauto;
 	*high = V_ipport_lastauto;
+	CURVNET_RESTORE();
 }
 
 static inline void