Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f90e51 authored by Vasu Dev's avatar Vasu Dev Committed by James Bottomley
Browse files

[SCSI] libfc: update mfs boundry checking 



A previous commit changed the mfs checking to ensure the new
mfs is less or equal to the mfs supported by the FCF. This
doesn't work for BRDCM cards as they set an mfs of 2048 regardless
of whether the switch returns a larger mfs.

This patch validates the new mfs against the upper and lower spec
defined boundries for a FCoE mfs.

Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b4698d88

drivers/scsi/libfc/fc_lport.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -1742,17 +1742,19 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp, 




	mfs = ntohs(flp->fl_csp.sp_bb_data) &

	mfs = ntohs(flp->fl_csp.sp_bb_data) &

		FC_SP_BB_DATA_MASK;

		FC_SP_BB_DATA_MASK;

	if (mfs >= FC_SP_MIN_MAX_PAYLOAD &&



	    mfs <= lport->mfs) {

	if (mfs < FC_SP_MIN_MAX_PAYLOAD || mfs > FC_SP_MAX_MAX_PAYLOAD) {

		lport->mfs = mfs;

		fc_host_maxframe_size(lport->host) = mfs;

	} else {

		FC_LPORT_DBG(lport, "FLOGI bad mfs:%hu response, "

		FC_LPORT_DBG(lport, "FLOGI bad mfs:%hu response, "

			     "lport->mfs:%hu\n", mfs, lport->mfs);

			     "lport->mfs:%hu\n", mfs, lport->mfs);

		fc_lport_error(lport, fp);

		fc_lport_error(lport, fp);

		goto err;

		goto err;

	}

	}





	if (mfs <= lport->mfs) {

		lport->mfs = mfs;

		fc_host_maxframe_size(lport->host) = mfs;

	}



	csp_flags = ntohs(flp->fl_csp.sp_features);

	csp_flags = ntohs(flp->fl_csp.sp_features);

	r_a_tov = ntohl(flp->fl_csp.sp_r_a_tov);

	r_a_tov = ntohl(flp->fl_csp.sp_r_a_tov);

	e_d_tov = ntohl(flp->fl_csp.sp_e_d_tov);

	e_d_tov = ntohl(flp->fl_csp.sp_e_d_tov);