[SCSI] libfc: change elsct to use FC_ID instead of rdata

[deliverable/linux.git] / drivers / scsi / libfc / fc_elsct.c

diff --git a/drivers/scsi/libfc/fc_elsct.c b/drivers/scsi/libfc/fc_elsct.c
index 2b8a3bbc0399519f699eff74ea7d515b0fd25c55..5e8b011af50e69cc4100a6f9fa3312a8bdfa5db4 100644 (file)
--- a/drivers/scsi/libfc/fc_elsct.c
+++ b/drivers/scsi/libfc/fc_elsct.c
@@ -32,7 +32,7 @@
  * fc_elsct_send - sends ELS/CT frame
  */
 static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
-                                   struct fc_rport_priv *rdata,
+                                   u32 did,
                                    struct fc_frame *fp,
                                    unsigned int op,
                                    void (*resp)(struct fc_seq *,
@@ -41,16 +41,17 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
                                    void *arg, u32 timer_msec)
 {
        enum fc_rctl r_ctl;
-       u32 did = FC_FID_NONE;
        enum fc_fh_type fh_type;
        int rc;
 
        /* ELS requests */
        if ((op >= ELS_LS_RJT) && (op <= ELS_AUTH_ELS))
-               rc = fc_els_fill(lport, rdata, fp, op, &r_ctl, &did, &fh_type);
-       else
+               rc = fc_els_fill(lport, did, fp, op, &r_ctl, &fh_type);
+       else {
                /* CT requests */
-               rc = fc_ct_fill(lport, fp, op, &r_ctl, &did, &fh_type);
+               rc = fc_ct_fill(lport, fp, op, &r_ctl, &fh_type);
+               did = FC_FID_DIR_SERV;
+       }
 
        if (rc)
                return NULL;