Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_lport.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index e5efa0e..9bbae01 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -41,6 +41,7 @@ static void fc_lport_enter_dns(struct fc_lport *);
static void fc_lport_enter_reg_pn(struct fc_lport *);
static void fc_lport_enter_reg_ft(struct fc_lport *);
static void fc_lport_enter_scr(struct fc_lport *);
+static void fc_lport_enter_ready(struct fc_lport *);
static void fc_lport_enter_logo(struct fc_lport *);
static const char *fc_lport_state_names[] = {
@@ -50,7 +51,7 @@ static const char *fc_lport_state_names[] = {
[LPORT_ST_REG_PN] = "REG_PN",
[LPORT_ST_REG_FT] = "REG_FT",
[LPORT_ST_SCR] = "SCR",
- [LPORT_ST_READY] = "ready",
+ [LPORT_ST_READY] = "Ready",
[LPORT_ST_DNS_STOP] = "stop",
[LPORT_ST_LOGO] = "LOGO",
[LPORT_ST_RESET] = "reset",
@@ -116,7 +117,7 @@ static void fc_lport_ptp_setup(struct fc_lport *lp,
if (lp->ptp_rp)
fc_remote_port_delete(lp->ptp_rp);
lp->ptp_rp = rport;
- fc_lport_state_enter(lp, LPORT_ST_READY);
+ fc_lport_enter_ready(lp);
}
}
@@ -473,6 +474,15 @@ int fc_set_mfs(struct fc_lport *lp, u32 mfs)
}
EXPORT_SYMBOL(fc_set_mfs);
+static void fc_lport_enter_ready(struct fc_lport *lport)
+{
+ if (fc_lport_debug)
+ FC_DBG("Port (%6x) entered Ready from state %s\n",
+ lport->fid, fc_lport_state(lport));
+
+ fc_lport_state_enter(lport, LPORT_ST_READY);
+}
+
/*
* re-enter state for retrying a request after a timeout or alloc failure.
*/
@@ -802,7 +812,7 @@ static void fc_lport_scr_resp(struct fc_seq *sp, struct
fc_frame *fp,
fc_lport_error(lport, fp);
else {
fc_lport_lock(lport);
- fc_lport_state_enter(lport, LPORT_ST_READY);
+ fc_lport_enter_ready(lport);
fc_lport_unlock(lport);
err = lport->tt.disc_start(lport);
if (err)
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
