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

Commit 163cd5fa authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Nicholas Bellinger
Browse files

target: fix typo Assoication -> Association 



Additionally this patch brings proper apply of the designator type.
However, the original code luckily has no bug, because the association
equals to 0.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: James Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 5de619a3

drivers/target/target_core_cdb.c

+5 −5
Original line number Diff line number Diff line
@@ -188,11 +188,11 @@ target_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) 
	/* CODE SET == Binary */

	buf[off++] = 0x1;



	/* Set ASSOICATION == addressed logical unit: 0)b */

	/* Set ASSOCIATION == addressed logical unit: 0)b */

	buf[off] = 0x00;



	/* Identifier/Designator type == NAA identifier */

	buf[off++] = 0x3;

	buf[off++] |= 0x3;

	off++;



	/* Identifier/Designator length */
@@ -293,7 +293,7 @@ target_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) 
			(tpg->se_tpg_tfo->get_fabric_proto_ident(tpg) << 4);

		buf[off++] |= 0x1; /* CODE SET == Binary */

		buf[off] = 0x80; /* Set PIV=1 */

		/* Set ASSOICATION == target port: 01b */

		/* Set ASSOCIATION == target port: 01b */

		buf[off] |= 0x10;

		/* DESIGNATOR TYPE == Relative target port identifer */

		buf[off++] |= 0x4;
@@ -338,7 +338,7 @@ target_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) 
			(tpg->se_tpg_tfo->get_fabric_proto_ident(tpg) << 4);

		buf[off++] |= 0x1; /* CODE SET == Binary */

		buf[off] = 0x80; /* Set PIV=1 */

		/* Set ASSOICATION == target port: 01b */

		/* Set ASSOCIATION == target port: 01b */

		buf[off] |= 0x10;

		/* DESIGNATOR TYPE == Target port group identifier */

		buf[off++] |= 0x5;
@@ -405,7 +405,7 @@ target_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) 
			(tpg->se_tpg_tfo->get_fabric_proto_ident(tpg) << 4);

		buf[off++] |= 0x3; /* CODE SET == UTF-8 */

		buf[off] = 0x80; /* Set PIV=1 */

		/* Set ASSOICATION == target port: 01b */

		/* Set ASSOCIATION == target port: 01b */

		buf[off] |= 0x10;

		/* DESIGNATOR TYPE == SCSI name string */

		buf[off++] |= 0x8;

drivers/target/target_core_configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ static ssize_t target_core_dev_wwn_show_attr_##_name( \ 
}



/*

 * VPD page 0x83 Assoication: Logical Unit

 * VPD page 0x83 Association: Logical Unit

 */

DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_logical_unit, 0x00);