|
@@ -457,6 +457,9 @@ static void fc_rport_enter_delete(struct fc_rport_priv *rdata,
|
|
|
*/
|
|
|
static int fc_rport_logoff(struct fc_rport_priv *rdata)
|
|
|
{
|
|
|
+ struct fc_lport *lport = rdata->local_port;
|
|
|
+ u32 port_id = rdata->ids.port_id;
|
|
|
+
|
|
|
mutex_lock(&rdata->rp_mutex);
|
|
|
|
|
|
FC_RPORT_DBG(rdata, "Remove port\n");
|
|
@@ -466,6 +469,15 @@ static int fc_rport_logoff(struct fc_rport_priv *rdata)
|
|
|
FC_RPORT_DBG(rdata, "Port in Delete state, not removing\n");
|
|
|
goto out;
|
|
|
}
|
|
|
+ /*
|
|
|
+ * FC-LS states:
|
|
|
+ * To explicitly Logout, the initiating Nx_Port shall terminate
|
|
|
+ * other open Sequences that it initiated with the destination
|
|
|
+ * Nx_Port prior to performing Logout.
|
|
|
+ */
|
|
|
+ lport->tt.exch_mgr_reset(lport, 0, port_id);
|
|
|
+ lport->tt.exch_mgr_reset(lport, port_id, 0);
|
|
|
+
|
|
|
fc_rport_enter_logo(rdata);
|
|
|
|
|
|
/*
|
|
@@ -1923,7 +1935,7 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp)
|
|
|
FC_RPORT_DBG(rdata, "Received LOGO request while in state %s\n",
|
|
|
fc_rport_state(rdata));
|
|
|
|
|
|
- fc_rport_enter_delete(rdata, RPORT_EV_LOGO);
|
|
|
+ fc_rport_enter_delete(rdata, RPORT_EV_STOP);
|
|
|
mutex_unlock(&rdata->rp_mutex);
|
|
|
kref_put(&rdata->kref, rdata->local_port->tt.rport_destroy);
|
|
|
} else
|