aboutsummaryrefslogtreecommitdiff
path: root/sys/cam/ctl/ctl_frontend_iscsi.c
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2015-01-31 07:49:50 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2015-01-31 07:49:50 +0000
commit321b17ec15bd4e76414b0442d3a027e3434855e6 (patch)
tree8168f8612a56907b2e775c2008a267c1c793e8f4 /sys/cam/ctl/ctl_frontend_iscsi.c
parent5bfb054e01ba052ff93dc386ba77c055f473cd6d (diff)
downloadsrc-321b17ec15bd4e76414b0442d3a027e3434855e6.tar.gz
src-321b17ec15bd4e76414b0442d3a027e3434855e6.zip
Add kobj interface between ICL and the rest of the iSCSI stack.
Review note - icl.c was moved to icl_soft.c. MFC after: 1 month Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=277963
Diffstat (limited to 'sys/cam/ctl/ctl_frontend_iscsi.c')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 0114b57b8247..99d698b245a3 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
#include <cam/ctl/ctl_private.h>
#include <dev/iscsi/icl.h>
+#include <dev/iscsi/icl_wrappers.h>
#include <dev/iscsi/iscsi_proto.h>
#include <cam/ctl/ctl_frontend_iscsi.h>
@@ -1241,7 +1242,7 @@ cfiscsi_session_new(struct cfiscsi_softc *softc)
cv_init(&cs->cs_login_cv, "cfiscsi_login");
#endif
- cs->cs_conn = icl_conn_new("cfiscsi", &cs->cs_lock);
+ cs->cs_conn = icl_new_conn(NULL, "cfiscsi", &cs->cs_lock);
cs->cs_conn->ic_receive = cfiscsi_receive_callback;
cs->cs_conn->ic_error = cfiscsi_error_callback;
cs->cs_conn->ic_prv0 = cs;
@@ -2013,6 +2014,7 @@ cfiscsi_ioctl_port_create(struct ctl_req *req)
return;
}
port = &ct->ct_port;
+ // WAT
if (ct->ct_state == CFISCSI_TARGET_STATE_DYING)
goto done;