Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_lport.c | 14 +-------------
include/scsi/libfc/libfc.h | 1 -
2 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index d2aeb3b..3eac0b3 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -74,7 +74,7 @@ static int fc_lport_event_callback(struct fc_lport *lp,
struct fc_rport *rp,
break;
case LPORT_EV_RPORT_FAILURE:
printk(KERN_ERR "Failed to log into the name server\n");
- lp->tt.lport_logout(lp);
+ fc_lport_enter_logo(lp);
break;
}
}
@@ -884,15 +884,6 @@ static void fc_lport_enter_logo(struct fc_lport *lp)
FC_FC_SEQ_INIT | FC_FC_END_SEQ);
}
-static int fc_lport_logout(struct fc_lport *lp)
-{
- fc_lport_lock(lp);
- if (lp->state != LPORT_ST_LOGO)
- fc_lport_enter_logo(lp);
- fc_lport_unlock(lp);
- return 0;
-}
-
/*
* Handle incoming ELS FLOGI response.
* Save parameters of remote switch. Finish exchange.
@@ -1214,9 +1205,6 @@ int fc_lport_init(struct fc_lport *lp)
if (!lp->tt.lport_reset)
lp->tt.lport_reset = fc_lport_enter_reset;
- if (!lp->tt.lport_logout)
- lp->tt.lport_logout = fc_lport_logout;
-
if (!lp->tt.lport_event_callback)
lp->tt.lport_event_callback = fc_lport_event_callback;
diff --git a/include/scsi/libfc/libfc.h b/include/scsi/libfc/libfc.h
index a2b19e9..4d7291f 100644
--- a/include/scsi/libfc/libfc.h
+++ b/include/scsi/libfc/libfc.h
@@ -331,7 +331,6 @@ struct libfc_function_template {
struct fc_frame *fp);
int (*lport_reset)(struct fc_lport *);
- int (*lport_logout)(struct fc_lport *);
int (*lport_event_callback)(struct fc_lport *, struct fc_rport *,
enum fc_lport_event);
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
