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

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

[SCSI] libfc: fix fc_els_resp_type to correct display of CT responses 



Local port debug messages were using fc_els_resp_type() which showed
all CT responses as rejects.

Handle CT responses correctly based by inspecting fh_type.

I decided not to rename the function to keep the patch smaller.
We could call it just fc_resp_type() or fc_elsct_resp_type().

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 5f9a056d

drivers/scsi/libfc/fc_elsct.c

+35 −6
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ EXPORT_SYMBOL(fc_elsct_init); 
const char *fc_els_resp_type(struct fc_frame *fp)

{

	const char *msg;

	struct fc_frame_header *fh;

	struct fc_ct_hdr *ct;



	if (IS_ERR(fp)) {

		switch (-PTR_ERR(fp)) {

		case FC_NO_ERR:
@@ -106,6 +109,9 @@ const char *fc_els_resp_type(struct fc_frame *fp) 
			break;

		}

	} else {

		fh = fc_frame_header_get(fp);

		switch (fh->fh_type) {

		case FC_TYPE_ELS:

			switch (fc_frame_payload_op(fp)) {

			case ELS_LS_ACC:

				msg = "accept";
@@ -117,6 +123,29 @@ const char *fc_els_resp_type(struct fc_frame *fp) 
				msg = "response unknown ELS";

				break;

			}

			break;

		case FC_TYPE_CT:

			ct = fc_frame_payload_get(fp, sizeof(*ct));

			if (ct) {

				switch (ntohs(ct->ct_cmd)) {

				case FC_FS_ACC:

					msg = "CT accept";

					break;

				case FC_FS_RJT:

					msg = "CT reject";

					break;

				default:

					msg = "response unknown CT";

					break;

				}

			} else {

				msg = "short CT response";

			}

			break;

		default:

			msg = "response not ELS or CT";

			break;

		}

	}

	return msg;

}