Index: contrib/ofed/librdmacm/ib.h
===================================================================
--- contrib/ofed/librdmacm/ib.h
+++ contrib/ofed/librdmacm/ib.h
@@ -38,7 +38,7 @@
 #include <string.h>
 
 #ifndef AF_IB
-#define AF_IB 41
+#define AF_IB 44
 #endif
 #ifndef PF_IB
 #define PF_IB AF_IB
Index: sys/ofed/include/rdma/ib.h
===================================================================
--- sys/ofed/include/rdma/ib.h
+++ sys/ofed/include/rdma/ib.h
@@ -41,11 +41,7 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 
-/*
- * Define a native infiniband address as in Linux upstream
- * 8d36eb01da5d371feffa280e501377b5c450f5a5
- */
-#define	AF_IB	41
+#include <sys/socket.h>
 
 struct ib_addr {
 	union {
Index: sys/sys/socket.h
===================================================================
--- sys/sys/socket.h
+++ sys/sys/socket.h
@@ -262,9 +262,10 @@
 #define	AF_ARP		35
 #define	AF_BLUETOOTH	36		/* Bluetooth sockets */
 #define	AF_IEEE80211	37		/* IEEE 802.11 protocol */
-#define	AF_INET_SDP	40		/* OFED Socket Direct Protocol ipv4 */
-#define	AF_INET6_SDP	42		/* OFED Socket Direct Protocol ipv6 */
-#define	AF_MAX		42
+#define	AF_INET_SDP	40		/* OFED Socket Direct Protocol, IPv4 */
+#define	AF_INET6_SDP	42		/* OFED Socket Direct Protocol, IPv6 */
+#define	AF_IB		44		/* OFED native infiniband address */
+#define	AF_MAX		44
 /*
  * When allocating a new AF_ constant, please only allocate
  * even numbered constants for FreeBSD until 134 as odd numbered AF_