summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-07-02 10:39:45 +0000
committermav <mav@FreeBSD.org>2014-07-02 10:39:45 +0000
commitcf9ef683281d484059d25e09c0e362e657e59189 (patch)
tree10b7921ebf51a78d74041bade80783506df4dfab /sys/cam
parent9389599de58078b9be23210e513f0e67e5a00d08 (diff)
downloadFreeBSD-src-cf9ef683281d484059d25e09c0e362e657e59189.zip
FreeBSD-src-cf9ef683281d484059d25e09c0e362e657e59189.tar.gz
MFC r267500:
Format Portal Group Tag same as istgt does -- %4.4x instead of %x. SPC-4 spec tells it should be "two or more hexadecimal digits". RFC3720 tells it is 16-bit value.
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 39b9259..1d8496d 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -2045,7 +2045,7 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, int alloc_len)
cs = PDU_SESSION(request);
wwpn_len = strlen(cs->cs_target->ct_name);
- wwpn_len += strlen(",t,0x01");
+ wwpn_len += strlen(",t,0x0001");
wwpn_len += 1; /* '\0' */
if ((wwpn_len % 4) != 0)
wwpn_len += (4 - (wwpn_len % 4));
@@ -2134,7 +2134,7 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, int alloc_len)
desc1->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
SVPD_ID_TYPE_SCSI_NAME;
desc1->length = wwpn_len;
- snprintf(desc1->identifier, wwpn_len, "%s,t,0x%x",
+ snprintf(desc1->identifier, wwpn_len, "%s,t,0x%4.4x",
cs->cs_target->ct_name, cs->cs_portal_group_tag);
/*
OpenPOWER on IntegriCloud