6 files changed, 49 insertions, 26 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 3e4e79aad5cde..0b21ca6e02836 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -198,6 +198,7 @@ SUBDIR=	\
 	${_linprocfs} \
 	${_linsysfs} \
 	${_linux} \
+	${_linuxapi} \
 	lmc \
 	lpt \
 	mac_biba \
@@ -501,6 +502,7 @@ _ipoib=         ipoib
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
+_linuxapi=	linuxapi
 _ndis=		ndis
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile
index 730aa0a8839dc..fea77b969637b 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -2,19 +2,19 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/core
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-KMOD    = ibcore
-SRCS    = addr.c cm_msgs.h iwcm.c mad_rmpp.h sa_query.c ucma.c uverbs_cmd.c
-SRCS+= agent.c    local_sa.c iwcm.h multicast.c smi.c ud_header.c uverbs_main.c
-SRCS+= agent.h core_priv.h mad.c notice.c smi.h umem.c uverbs_marshall.c
-SRCS+= cache.c device.c mad_priv.h packer.c sysfs.c user_mad.c verbs.c
-SRCS+= cm.c fmr_pool.c mad_rmpp.c sa.h ucm.c uverbs.h cma.c
-SRCS+= linux_compat.c linux_radix.c linux_idr.c
-SRCS+= vnode_if.h device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
+KMOD=	ibcore
+SRCS=	addr.c iwcm.c sa_query.c ucma.c uverbs_cmd.c \
+	agent.c local_sa.c multicast.c smi.c ud_header.c uverbs_main.c \
+	mad.c notice.c umem.c uverbs_marshall.c \
+	cache.c device.c packer.c sysfs.c user_mad.c verbs.c \
+	cm.c fmr_pool.c mad_rmpp.c ucm.c cma.c \
+	vnode_if.h device_if.h bus_if.h pci_if.h \
+	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/core
 CFLAGS+= -I${.CURDIR}/../mlx4ib
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
-CFLAGS+= -DINET6 -DINET -DOFED
+CFLAGS+= -DINET6 -DINET
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile
index 70a3f6f7cec59..d634e375899ae 100644
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -2,15 +2,16 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-KMOD    = ipoib
-SRCS    = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h
-SRCS    += ipoib_cm.c ipoib_ib.c ipoib_main.c ipoib_multicast.c ipoib_verbs.c ipoib.h
-SRCS+=  linux_compat.c linux_radix.c linux_idr.c
+KMOD=	ipoib
+SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h \
+	opt_inet.h opt_inet6.h opt_ofed.h \
+	ipoib_cm.c ipoib_ib.c ipoib_main.c \
+	ipoib_multicast.c ipoib_verbs.c
 
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib
 CFLAGS+= -I${.CURDIR}/../ibcore
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
-CFLAGS+= -DINET6 -DINET -DOFED
+CFLAGS+= -DINET6 -DINET
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/linuxapi/Makefile b/sys/modules/linuxapi/Makefile
new file mode 100644
index 0000000000000..b10d125f4f046
--- /dev/null
+++ b/sys/modules/linuxapi/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+.PATH:	${.CURDIR}/../../ofed/include/linux
+
+KMOD=	linuxapi
+SRCS=	linux_kmod.c \
+	linux_compat.c \
+	linux_pci.c \
+	linux_radix.c \
+	linux_idr.c
+
+SRCS+=	bus_if.h \
+	device_if.h \
+	pci_if.h \
+	vnode_if.h
+
+CFLAGS+= -I${.CURDIR}/../../ofed/include/
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 969a806883c52..d989ff05ae78f 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -1,10 +1,14 @@
 # $FreeBSD$
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
 .PATH:  ${.CURDIR}/../../ofed/include/linux
-KMOD    = mlx4
-SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h opt_inet.h opt_inet6.h
-SRCS+= alloc.c catas.c cmd.c cq.c eq.c fw.c icm.c intf.c main.c mcg.c mr.c linux_compat.c linux_radix.c	linux_idr.c
-SRCS+=	pd.c port.c profile.c qp.c reset.c sense.c srq.c resource_tracker.c sys_tune.c
+
+KMOD=	mlx4
+SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h \
+	opt_inet.h opt_inet6.h \
+	alloc.c catas.c cmd.c cq.c eq.c \
+	fw.c icm.c intf.c main.c mcg.c mr.c \
+	pd.c port.c profile.c qp.c reset.c sense.c \
+	srq.c resource_tracker.c sys_tune.c
 
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index 007eeece09d1f..57592bc995cf1 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -2,18 +2,16 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-KMOD    = mlx4ib
-SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS+= linux_compat.c linux_radix.c linux_idr.c 
-SRCS+=	alias_GUID.c mcg.c sysfs.c ah.c cq.c doorbell.c mad.c main.c mr.c qp.c srq.c wc.c cm.c
-SRCS+=	opt_inet.h opt_inet6.h
+KMOD=	mlx4ib
+SRCS=	device_if.h bus_if.h vnode_if.h pci_if.h \
+	opt_inet.h opt_inet6.h \
+	alias_GUID.c mcg.c sysfs.c ah.c cq.c \
+	doorbell.c mad.c main.c mr.c qp.c srq.c wc.c cm.c
 
-#CFLAGS+= -I${.CURDIR}/../../ofed/include/
-#CFLAGS+= -I${.CURDIR}/../../../../include
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
 CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
-CFLAGS+= -DINET6 -DINET -DOFED
+CFLAGS+= -DINET6 -DINET
 CFLAGS+= -fms-extensions
 
 .include <bsd.kmod.mk>