diff options
| author | trasz <trasz@FreeBSD.org> | 2015-01-31 07:49:50 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-01-31 07:49:50 +0000 |
| commit | 124348170748bedfd6cadac86d4ec998df962bc7 (patch) | |
| tree | 8168f8612a56907b2e775c2008a267c1c793e8f4 /sys/cam/ctl | |
| parent | 7551e7e8833f8cfc60c758b438fbbd912bc3121c (diff) | |
| download | FreeBSD-src-124348170748bedfd6cadac86d4ec998df962bc7.zip FreeBSD-src-124348170748bedfd6cadac86d4ec998df962bc7.tar.gz | |
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
Diffstat (limited to 'sys/cam/ctl')
| -rw-r--r-- | sys/cam/ctl/ctl_frontend_iscsi.c | 4 |
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 0114b57..99d698b 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; |
