36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
upstream commits 854e37aab7d7d2093a0a6620a3257b8f2a1d405c
|
|
and fb45f0343e3de45f2bc7516591d36c7466c2184e
|
|
|
|
diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
|
|
index cbadf85..20993d4 100644
|
|
--- a/test-tool/iscsi-support.c
|
|
+++ b/test-tool/iscsi-support.c
|
|
@@ -2931,16 +2931,17 @@ void populate_ident_tgt_desc(unsigned char *buf, struct scsi_device *dev)
|
|
|
|
for (desig = inq_di->designators; desig; desig = desig->next) {
|
|
switch (desig->designator_type) {
|
|
- case SCSI_DESIGNATOR_TYPE_VENDOR_SPECIFIC:
|
|
- case SCSI_DESIGNATOR_TYPE_T10_VENDORT_ID:
|
|
- case SCSI_DESIGNATOR_TYPE_EUI_64:
|
|
- case SCSI_DESIGNATOR_TYPE_NAA:
|
|
- if (prev_type <= desig->designator_type) {
|
|
- tgt_desig = desig;
|
|
- prev_type = desig->designator_type;
|
|
- }
|
|
- default:
|
|
- continue;
|
|
+ case SCSI_DESIGNATOR_TYPE_VENDOR_SPECIFIC:
|
|
+ case SCSI_DESIGNATOR_TYPE_T10_VENDORT_ID:
|
|
+ case SCSI_DESIGNATOR_TYPE_EUI_64:
|
|
+ case SCSI_DESIGNATOR_TYPE_NAA:
|
|
+ if (prev_type <= desig->designator_type) {
|
|
+ tgt_desig = desig;
|
|
+ prev_type = desig->designator_type;
|
|
+ }
|
|
+ continue;
|
|
+ default:
|
|
+ continue;
|
|
}
|
|
}
|
|
if (tgt_desig == NULL) {
|