3 files changed, 26 insertions, 2 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 0f38aaff0a92..2161b8b407af 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -160,6 +160,7 @@ SUBDIR=	\
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
+	iscsi \
 	iscsi_initiator \
 	isp \
 	${_ispfw} \
diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile
index 5744b7d08ccd..39a61f612efc 100644
--- a/sys/modules/ctl/Makefile
+++ b/sys/modules/ctl/Makefile
@@ -12,6 +12,7 @@ SRCS+=	ctl_cmd_table.c
 SRCS+=	ctl_frontend.c
 SRCS+=	ctl_frontend_cam_sim.c
 SRCS+=	ctl_frontend_internal.c
+SRCS+=	ctl_frontend_iscsi.c
 SRCS+=	ctl_mem_pool.c
 SRCS+=	ctl_scsi_all.c
 SRCS+=	ctl_error.c
@@ -23,4 +24,6 @@ SRCS+=	vnode_if.h
 SRCS+=	opt_cam.h
 SRCS+=	opt_kdtrace.h
 
+#CFLAGS+=-DICL_KERNEL_PROXY
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile
index 625e3be97837..d072cfb39269 100644
--- a/sys/modules/iscsi/Makefile
+++ b/sys/modules/iscsi/Makefile
@@ -1,5 +1,25 @@
 # $FreeBSD$
 
-SUBDIR= initiator
+.PATH:	${.CURDIR}/../../dev/iscsi/
+KMOD=	iscsi
 
-.include <bsd.subdir.mk>
+SRCS=	iscsi.c
+.if defined(ICL_RDMA)
+SRCS+=	icl_rdma.c
+.else
+SRCS+=	icl.c
+.endif
+SRCS+=	icl_proxy.c
+SRCS+=	opt_cam.h
+SRCS+=	bus_if.h
+SRCS+=	device_if.h
+
+# Those below are required for RDMA.
+SRCS+=	vnode_if.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+
+CFLAGS+= -I${.CURDIR}/../../ofed/include
+#CFLAGS+=-DICL_KERNEL_PROXY
+
+.include <bsd.kmod.mk>