Commit a46f327a authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

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



tt.elsct_send is used by both FCP and by the rport state machine.
After further patches, these two modules will use different
structures for the remote port.

So, change elsct_send to use the FC_ID instead of the fc_rport_priv
as its argument.  It currently only uses the FC_ID anyway.

For CT requests the destination FC_ID is still implicitly 0xfffffc.
After further patches the did arg on CT requests will be used to
specify the FC_ID being inquired about for GPN_ID or other queries.

Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 9fb9d328

drivers/scsi/libfc/fc_disc.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc) 
	if (!fp)

		goto err;



	if (lport->tt.elsct_send(lport, NULL, fp,

	if (lport->tt.elsct_send(lport, 0, fp,

				 FC_NS_GPN_FT,

				 fc_disc_gpn_ft_resp,

				 disc, lport->e_d_tov))

drivers/scsi/libfc/fc_elsct.c

+6 −5
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/libfc/fc_fcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp) 
	fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, rport->port_id,

		       fc_host_port_id(rp->local_port->host), FC_TYPE_ELS,

		       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);

	if (lp->tt.elsct_send(lp, rport->dd_data, fp, ELS_REC, fc_fcp_rec_resp,

	if (lp->tt.elsct_send(lp, rport->port_id, fp, ELS_REC, fc_fcp_rec_resp,

			      fsp, jiffies_to_msecs(FC_SCSI_REC_TOV))) {

		fc_fcp_pkt_hold(fsp);		/* hold while REC outstanding */

		return;

drivers/scsi/libfc/fc_lport.c

+6 −6
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ static void fc_lport_enter_scr(struct fc_lport *lport) 
		return;

	}



	if (!lport->tt.elsct_send(lport, NULL, fp, ELS_SCR,

	if (!lport->tt.elsct_send(lport, FC_FID_FCTRL, fp, ELS_SCR,

				  fc_lport_scr_resp, lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}
@@ -1258,7 +1258,7 @@ static void fc_lport_enter_rft_id(struct fc_lport *lport) 
		return;

	}



	if (!lport->tt.elsct_send(lport, NULL, fp, FC_NS_RFT_ID,

	if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RFT_ID,

				  fc_lport_rft_id_resp,

				  lport, lport->e_d_tov))

		fc_lport_error(lport, fp);
@@ -1287,7 +1287,7 @@ static void fc_lport_enter_rpn_id(struct fc_lport *lport) 
		return;

	}



	if (!lport->tt.elsct_send(lport, NULL, fp, FC_NS_RPN_ID,

	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, fp);
@@ -1443,8 +1443,8 @@ static void fc_lport_enter_logo(struct fc_lport *lport) 
		return;

	}



	if (!lport->tt.elsct_send(lport, NULL, fp, ELS_LOGO, fc_lport_logo_resp,

				  lport, lport->e_d_tov))

	if (!lport->tt.elsct_send(lport, FC_FID_FLOGI, fp, ELS_LOGO,

				  fc_lport_logo_resp, lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}
@@ -1567,7 +1567,7 @@ void fc_lport_enter_flogi(struct fc_lport *lport) 
	if (!fp)

		return fc_lport_error(lport, fp);



	if (!lport->tt.elsct_send(lport, NULL, fp, ELS_FLOGI,

	if (!lport->tt.elsct_send(lport, FC_FID_FLOGI, fp, ELS_FLOGI,

				  fc_lport_flogi_resp, lport, lport->e_d_tov))

		fc_lport_error(lport, fp);

}

drivers/scsi/libfc/fc_rport.c

+4 −4
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void fc_rport_enter_plogi(struct fc_rport_priv *rdata) 
	}

	rdata->e_d_tov = lport->e_d_tov;



	if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PLOGI,

	if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_PLOGI,

				  fc_rport_plogi_resp, rdata, lport->e_d_tov))

		fc_rport_error_retry(rdata, fp);

	else
@@ -747,7 +747,7 @@ static void fc_rport_enter_prli(struct fc_rport_priv *rdata) 
		return;

	}



	if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PRLI,

	if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_PRLI,

				  fc_rport_prli_resp, rdata, lport->e_d_tov))

		fc_rport_error_retry(rdata, fp);

	else
@@ -845,7 +845,7 @@ static void fc_rport_enter_rtv(struct fc_rport_priv *rdata) 
		return;

	}



	if (!lport->tt.elsct_send(lport, rdata, fp, ELS_RTV,

	if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_RTV,

				     fc_rport_rtv_resp, rdata, lport->e_d_tov))

		fc_rport_error_retry(rdata, fp);

	else
@@ -876,7 +876,7 @@ static void fc_rport_enter_logo(struct fc_rport_priv *rdata) 
		return;

	}



	if (!lport->tt.elsct_send(lport, rdata, fp, ELS_LOGO,

	if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_LOGO,

				  fc_rport_logo_resp, rdata, lport->e_d_tov))

		fc_rport_error_retry(rdata, fp);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE