From 34bbd3ca1374c5389df0c335c88a951e5458b193 Mon Sep 17 00:00:00 2001
From: hselasky <hselasky@FreeBSD.org>
Date: Tue, 31 Jul 2018 11:23:44 +0000
Subject: [PATCH] Only NULL check the VNET pointer when VIMAGE is enabled in
 ibcore. Else a NULL VNET pointer should be ignored. This fixes address
 resolving when VIMAGE is disabled.

MFC after:		3 days
Sponsored by:		Mellanox Technologies
---
 sys/ofed/include/rdma/ib_sa.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/ofed/include/rdma/ib_sa.h b/sys/ofed/include/rdma/ib_sa.h
index 19638c517a69..28e9a7887cab 100644
--- a/sys/ofed/include/rdma/ib_sa.h
+++ b/sys/ofed/include/rdma/ib_sa.h
@@ -182,7 +182,11 @@ struct ib_sa_path_rec {
 
 static inline struct net_device *ib_get_ndev_from_path(struct ib_sa_path_rec *rec)
 {
-	return rec->net ? dev_get_by_index(rec->net, rec->ifindex) : NULL;
+#ifdef VIMAGE
+	if (rec->net == NULL)
+		return NULL;
+#endif
+	return dev_get_by_index(rec->net, rec->ifindex);
 }
 
 #define IB_SA_MCMEMBER_REC_MGID				IB_SA_COMP_MASK( 0)