1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index c11675f34b93..a83419991357 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2056,6 +2056,17 @@ static unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf)
                       ATA_ID_SERNO_LEN);
         num += ATA_ID_SERNO_LEN;
 
+        if (ata_id_has_wwn(args->id)) {
+                /* SAT defined lu world wide name */
+                /* piv=0, assoc=lu, code_set=binary, designator=NAA */
+                rbuf[num + 0] = 1;
+                rbuf[num + 1] = 3;
+                rbuf[num + 3] = ATA_ID_WWN_LEN;
+                num += 4;
+                ata_id_string(args->id, (unsigned char *) rbuf + num,
+                              ATA_ID_WWN, ATA_ID_WWN_LEN);
+                num += ATA_ID_WWN_LEN;
+        }
         rbuf[3] = num - 4;    /* page len (assume less than 256 bytes) */
         return 0;
 }