Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_rport.c | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index b10a26e..46a755d 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -40,10 +40,8 @@ static int fc_rp_debug;
* static functions.
*/
static void fc_rport_gpn_id_resp(struct fc_seq *, struct fc_frame *, void *);
-static void fc_rport_gpn_id_error(struct fc_rport *, struct fc_frame *);
-
+static void fc_rport_ns_error(struct fc_rport *, struct fc_frame *);
static void fc_rport_gnn_id_resp(struct fc_seq *, struct fc_frame *, void *);
-static void fc_rport_gnn_id_error(struct fc_rport *, struct fc_frame *);
static void fc_rport_enter_gpn_id(struct fc_rport *);
static void fc_rport_enter_gnn_id(struct fc_rport *);
@@ -232,7 +230,7 @@ static void fc_rport_gpn_id_resp(struct fc_seq *sp, struct
fc_frame *fp,
unsigned int cmd;
if (IS_ERR(fp)) {
- fc_rport_gpn_id_error(rp, fp);
+ fc_rport_ns_error(rp, fp);
return;
}
@@ -269,27 +267,6 @@ static void fc_rport_gpn_id_resp(struct fc_seq *sp, struct
fc_frame *fp,
}
/**
- * fc_rport_gpn_id_error - Handle error from GPN_ID
- * @dp: Temporary discovery port for holding IDs and world wide names
- * @fp: response frame
- */
-static void fc_rport_gpn_id_error(struct fc_rport *rp, struct fc_frame *fp)
-{
- struct fc_rport_libfc_priv *rpp = rp->dd_data;
- struct fc_lport *lp = rpp->local_port;
-
- switch (PTR_ERR(fp)) {
- case -FC_EX_TIMEOUT:
- lp->tt.lport_event_callback(lp, rp, LPORT_EV_RPORT_FAILED);
- fc_rport_destroy_dummy(rp);
- break;
- case -FC_EX_CLOSED:
- default:
- break;
- }
-}
-
-/**
* fc_rport_enter_gnn_id - Send Get Node Name by ID (GNN_ID) request
* @lp: Fibre Channel host port instance
* @dp: Temporary discovery port for holding IDs and world wide names
@@ -357,7 +334,7 @@ static void fc_rport_gnn_id_resp(struct fc_seq *sp, struct
fc_frame *fp,
rpp = rp->dd_data;
if (IS_ERR(fp)) {
- fc_rport_gnn_id_error(rp, fp);
+ fc_rport_ns_error(rp, fp);
return;
}
@@ -422,11 +399,11 @@ static void fc_rport_gnn_id_resp(struct fc_seq *sp,
struct fc_frame *fp,
}
/**
- * fc_rport_gnn_id_error - Handle error from GNN_ID
+ * fc_rport_ns_error - Handle error from GNN_ID
* @dp: Temporary discovery port for holding IDs and world wide names
* @fp: response frame
*/
-static void fc_rport_gnn_id_error(struct fc_rport *rp, struct fc_frame *fp)
+static void fc_rport_ns_error(struct fc_rport *rp, struct fc_frame *fp)
{
struct fc_rport_libfc_priv *rpp = rp->dd_data;
struct fc_lport *lp = rpp->local_port;
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
