2 files changed, 3 insertions, 93 deletions

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 807f5b3e4efe..47577e4a2e87 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -108,7 +108,6 @@ static void fc_lport_error(struct fc_lport *, struct fc_frame *);
 static void fc_lport_enter_reset(struct fc_lport *);
 static void fc_lport_enter_flogi(struct fc_lport *);
 static void fc_lport_enter_dns(struct fc_lport *);
-static void fc_lport_enter_rpn_id(struct fc_lport *);
 static void fc_lport_enter_rft_id(struct fc_lport *);
 static void fc_lport_enter_scr(struct fc_lport *);
 static void fc_lport_enter_ready(struct fc_lport *);
@@ -118,7 +117,6 @@ static const char *fc_lport_state_names[] = {
         [LPORT_ST_DISABLED] = "disabled",
         [LPORT_ST_FLOGI] =    "FLOGI",
         [LPORT_ST_DNS] =      "dNS",
-        [LPORT_ST_RPN_ID] =   "RPN_ID",
         [LPORT_ST_RFT_ID] =   "RFT_ID",
         [LPORT_ST_SCR] =      "SCR",
         [LPORT_ST_READY] =    "Ready",
@@ -153,7 +151,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport,
         case RPORT_EV_READY:
                 if (lport->state == LPORT_ST_DNS) {
                         lport->dns_rp = rdata;
-                        fc_lport_enter_rpn_id(lport);
+                        fc_lport_enter_rft_id(lport);
                 } else {
                         FC_LPORT_DBG(lport, "Received an READY event "
                                      "on port (%6x) for the directory "
@@ -965,7 +963,6 @@ static void fc_lport_error(struct fc_lport *lport, struct fc_frame *fp)
                         case LPORT_ST_DISABLED:
                         case LPORT_ST_READY:
                         case LPORT_ST_RESET:
-                        case LPORT_ST_RPN_ID:
                         case LPORT_ST_RFT_ID:
                         case LPORT_ST_SCR:
                         case LPORT_ST_DNS:
@@ -980,8 +977,8 @@ static void fc_lport_error(struct fc_lport *lport, struct fc_frame *fp)
 
 /**
  * fc_lport_rft_id_resp() - Handle response to Register Fibre
- *                          Channel Types by ID (RPN_ID) request
- * @sp: current sequence in RPN_ID exchange
+ *                          Channel Types by ID (RFT_ID) request
+ * @sp: current sequence in RFT_ID exchange
  * @fp: response frame
  * @lp_arg: Fibre Channel host port instance
  *
@@ -1033,60 +1030,6 @@ err:
 }
 
 /**
- * fc_lport_rpn_id_resp() - Handle response to Register Port
- *                          Name by ID (RPN_ID) request
- * @sp: current sequence in RPN_ID exchange
- * @fp: response frame
- * @lp_arg: Fibre Channel host port instance
- *
- * Locking Note: This function will be called without the lport lock
- * held, but it will lock, call an _enter_* function or fc_lport_error
- * and then unlock the lport.
- */
-static void fc_lport_rpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,
-                                 void *lp_arg)
-{
-        struct fc_lport *lport = lp_arg;
-        struct fc_frame_header *fh;
-        struct fc_ct_hdr *ct;
-
-        FC_LPORT_DBG(lport, "Received a RPN_ID %s\n", fc_els_resp_type(fp));
-
-        if (fp == ERR_PTR(-FC_EX_CLOSED))
-                return;
-
-        mutex_lock(&lport->lp_mutex);
-
-        if (lport->state != LPORT_ST_RPN_ID) {
-                FC_LPORT_DBG(lport, "Received a RPN_ID response, but in state "
-                             "%s\n", fc_lport_state(lport));
-                if (IS_ERR(fp))
-                        goto err;
-                goto out;
-        }
-
-        if (IS_ERR(fp)) {
-                fc_lport_error(lport, fp);
-                goto err;
-        }
-
-        fh = fc_frame_header_get(fp);
-        ct = fc_frame_payload_get(fp, sizeof(*ct));
-        if (fh && ct && fh->fh_type == FC_TYPE_CT &&
-            ct->ct_fs_type == FC_FST_DIR &&
-            ct->ct_fs_subtype == FC_NS_SUBTYPE &&
-            ntohs(ct->ct_cmd) == FC_FS_ACC)
-                fc_lport_enter_rft_id(lport);
-        else
-                fc_lport_error(lport, fp);
-
-out:
-        fc_frame_free(fp);
-err:
-        mutex_unlock(&lport->lp_mutex);
-}
-
-/**
  * fc_lport_scr_resp() - Handle response to State Change Register (SCR) request
  * @sp: current sequence in SCR exchange
  * @fp: response frame
@@ -1203,35 +1146,6 @@ static void fc_lport_enter_rft_id(struct fc_lport *lport)
                 fc_lport_error(lport, fp);
 }
 
-/**
- * fc_rport_enter_rft_id() - Register port name with the name server
- * @lport: Fibre Channel local port to register
- *
- * Locking Note: The lport lock is expected to be held before calling
- * this routine.
- */
-static void fc_lport_enter_rpn_id(struct fc_lport *lport)
-{
-        struct fc_frame *fp;
-
-        FC_LPORT_DBG(lport, "Entered RPN_ID state from %s state\n",
-                     fc_lport_state(lport));
-
-        fc_lport_state_enter(lport, LPORT_ST_RPN_ID);
-
-        fp = fc_frame_alloc(lport, sizeof(struct fc_ct_hdr) +
-                            sizeof(struct fc_ns_rn_id));
-        if (!fp) {
-                fc_lport_error(lport, fp);
-                return;
-        }
-
-        if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RPN_ID,
-                                  fc_lport_rpn_id_resp,
-                                  lport, lport->e_d_tov))
-                fc_lport_error(lport, NULL);
-}
-
 static struct fc_rport_operations fc_lport_rport_ops = {
         .event_callback = fc_lport_rport_callback,
 };
@@ -1293,9 +1207,6 @@ static void fc_lport_timeout(struct work_struct *work)
         case LPORT_ST_DNS:
                 fc_lport_enter_dns(lport);
                 break;
-        case LPORT_ST_RPN_ID:
-                fc_lport_enter_rpn_id(lport);
-                break;
         case LPORT_ST_RFT_ID:
                 fc_lport_enter_rft_id(lport);
                 break;
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index dad66ce8673d..75be713ea036 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -61,7 +61,6 @@ enum fc_lport_state {
         LPORT_ST_DISABLED = 0,
         LPORT_ST_FLOGI,
         LPORT_ST_DNS,
-        LPORT_ST_RPN_ID,
         LPORT_ST_RFT_ID,
         LPORT_ST_SCR,
         LPORT_ST_READY,