disc_enter_dns is a confusing name when compared with
disc_start. disc_start is when the lport sends a GPN_FT
to the NS to do rport discovery. disc_enter_dns is used
to register the lport with the NS. dns_register may not
be perfect, but it's more descriptive than disc_enter_dns.
Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_lport.c | 2 +-
drivers/scsi/libfc/fc_ns.c | 6 +++---
drivers/scsi/libfc/fc_rport.c | 8 ++++----
include/scsi/libfc/libfc.h | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 1ecfed7..1cbc2b4 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -822,7 +822,7 @@ fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
void *lp_arg)
} else {
lp->e_d_tov = e_d_tov;
lp->r_a_tov = r_a_tov;
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
}
}
fc_lport_unlock(lp);
diff --git a/drivers/scsi/libfc/fc_ns.c b/drivers/scsi/libfc/fc_ns.c
index 80466f1..6204bcc 100644
--- a/drivers/scsi/libfc/fc_ns.c
+++ b/drivers/scsi/libfc/fc_ns.c
@@ -325,7 +325,7 @@ static void fc_ns_enter_retry(struct fc_lport *lp)
WARN_ON(1);
break;
case LPORT_ST_DNS:
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
break;
case LPORT_ST_DNS_STOP:
lp->tt.disc_stop(lp);
@@ -1159,8 +1159,8 @@ int fc_ns_init(struct fc_lport *lp)
if (!lp->tt.disc_recv_req)
lp->tt.disc_recv_req = fc_ns_recv_req;
- if (!lp->tt.disc_enter_dns)
- lp->tt.disc_enter_dns = fc_ns_enter_dns;
+ if (!lp->tt.dns_register)
+ lp->tt.dns_register = fc_ns_enter_dns;
if (!lp->tt.disc_stop)
lp->tt.disc_stop = fc_ns_enter_dns_stop;
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 50f7fa6..3ea9f26 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -378,7 +378,7 @@ static void fc_rport_reject(struct fc_rport *rport)
lp->state == LPORT_ST_DNS) {
fc_lport_lock(lp);
del_timer(&lp->state_timer);
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
fc_lport_unlock(lp);
}
break;
@@ -722,7 +722,7 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
lp->state == LPORT_ST_DNS) {
fc_lport_lock(lp);
del_timer(&lp->state_timer);
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
fc_lport_unlock(lp);
}
return;
@@ -800,7 +800,7 @@ static void fc_rport_els_rtv_resp(struct fc_seq *sp, struct
fc_frame *fp,
lp->state == LPORT_ST_DNS) {
fc_lport_lock(lp);
del_timer(&lp->state_timer);
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
fc_lport_unlock(lp);
}
fc_frame_free(fp);
@@ -1197,7 +1197,7 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport,
lp->state == LPORT_ST_DNS) {
fc_lport_lock(lp);
del_timer(&lp->state_timer);
- lp->tt.disc_enter_dns(lp);
+ lp->tt.dns_register(lp);
fc_lport_unlock(lp);
}
break;
diff --git a/include/scsi/libfc/libfc.h b/include/scsi/libfc/libfc.h
index 0797a9c..c9afeed 100644
--- a/include/scsi/libfc/libfc.h
+++ b/include/scsi/libfc/libfc.h
@@ -373,7 +373,7 @@ struct libfc_function_template {
*/
int (*disc_start)(struct fc_lport *);
- void (*disc_enter_dns)(struct fc_lport *);
+ void (*dns_register)(struct fc_lport *);
void (*disc_stop)(struct fc_lport *);
};
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
