diff --git a/sys/dev/iscsi/icl_conn_if.m b/sys/dev/iscsi/icl_conn_if.m index 1a52882dd649..077fabec43c2 100644 --- a/sys/dev/iscsi/icl_conn_if.m +++ b/sys/dev/iscsi/icl_conn_if.m @@ -82,10 +82,6 @@ METHOD void close { struct icl_conn *_ic; }; -METHOD bool connected { - struct icl_conn *_ic; -}; - METHOD int task_setup { struct icl_conn *_ic; struct ccb_scsiio *_csio; diff --git a/sys/dev/iscsi/icl_soft.c b/sys/dev/iscsi/icl_soft.c index 2dd5e5c40044..e31b213972c9 100644 --- a/sys/dev/iscsi/icl_soft.c +++ b/sys/dev/iscsi/icl_soft.c @@ -97,7 +97,6 @@ static icl_conn_pdu_queue_t icl_soft_conn_pdu_queue; static icl_conn_handoff_t icl_soft_conn_handoff; static icl_conn_free_t icl_soft_conn_free; static icl_conn_close_t icl_soft_conn_close; -static icl_conn_connected_t icl_soft_conn_connected; static icl_conn_task_setup_t icl_soft_conn_task_setup; static icl_conn_task_done_t icl_soft_conn_task_done; static icl_conn_transfer_setup_t icl_soft_conn_transfer_setup; @@ -114,7 +113,6 @@ static kobj_method_t icl_soft_methods[] = { KOBJMETHOD(icl_conn_handoff, icl_soft_conn_handoff), KOBJMETHOD(icl_conn_free, icl_soft_conn_free), KOBJMETHOD(icl_conn_close, icl_soft_conn_close), - KOBJMETHOD(icl_conn_connected, icl_soft_conn_connected), KOBJMETHOD(icl_conn_task_setup, icl_soft_conn_task_setup), KOBJMETHOD(icl_conn_task_done, icl_soft_conn_task_done), KOBJMETHOD(icl_conn_transfer_setup, icl_soft_conn_transfer_setup), @@ -1425,24 +1423,6 @@ icl_soft_conn_close(struct icl_conn *ic) ICL_CONN_UNLOCK(ic); } -bool -icl_soft_conn_connected(struct icl_conn *ic) -{ - ICL_CONN_LOCK_ASSERT_NOT(ic); - - ICL_CONN_LOCK(ic); - if (ic->ic_socket == NULL) { - ICL_CONN_UNLOCK(ic); - return (false); - } - if (ic->ic_socket->so_error != 0) { - ICL_CONN_UNLOCK(ic); - return (false); - } - ICL_CONN_UNLOCK(ic); - return (true); -} - int icl_soft_conn_task_setup(struct icl_conn *ic, struct ccb_scsiio *csio, uint32_t *task_tagp, void **prvp) diff --git a/sys/dev/iscsi/icl_wrappers.h b/sys/dev/iscsi/icl_wrappers.h index 2cf7d96446fc..1ed72ae8bbdf 100644 --- a/sys/dev/iscsi/icl_wrappers.h +++ b/sys/dev/iscsi/icl_wrappers.h @@ -105,13 +105,6 @@ icl_conn_close(struct icl_conn *ic) ICL_CONN_CLOSE(ic); } -static inline bool -icl_conn_connected(struct icl_conn *ic) -{ - - return (ICL_CONN_CONNECTED(ic)); -} - static inline int icl_conn_task_setup(struct icl_conn *ic, struct ccb_scsiio *csio, uint32_t *task_tagp, void **prvp)