Author: hselasky
Date: Tue Jul 31 11:23:44 2018
New Revision: 336964
URL: https://svnweb.freebsd.org/changeset/base/336964
Log:
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
Modified:
head/sys/ofed/include/rdma/ib_sa.h
Modified: head/sys/ofed/include/rdma/ib_sa.h
==============================================================================
--- head/sys/ofed/include/rdma/ib_sa.h Tue Jul 31 10:18:30 2018
(r336963)
+++ head/sys/ofed/include/rdma/ib_sa.h Tue Jul 31 11:23:44 2018
(r336964)
@@ -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)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
