qla2xxx: Add endianizer to max_payload_size modifier.
authorJoe Carnuccio <joe.carnuccio@qlogic.com>
Thu, 25 Sep 2014 09:16:38 +0000 (05:16 -0400)
committerChristoph Hellwig <hch@lst.de>
Thu, 25 Sep 2014 12:25:01 +0000 (14:25 +0200)
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/qla2xxx/qla_fw.h
drivers/scsi/qla2xxx/qla_init.c

index eb8f57249f1dd6e1613d874562b9df0695100072..c7d1c4569fa1a0d00ad0b514af44e858561fc4fe 100644 (file)
@@ -91,7 +91,7 @@ struct nvram_24xx {
        /* Firmware Initialization Control Block. */
        uint16_t version;
        uint16_t reserved_1;
-       uint16_t frame_payload_size;
+       __le16 frame_payload_size;
        uint16_t execution_throttle;
        uint16_t exchange_count;
        uint16_t hard_address;
index 46990f4ceb4097be3acbb98f8235994be33bd475..748bd90936804eca14f73cd5489f9bf97766109e 100644 (file)
@@ -2596,18 +2596,18 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
                        nv->firmware_options[1] = BIT_7 | BIT_5;
                        nv->add_firmware_options[0] = BIT_5;
                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
-                       nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                       nv->frame_payload_size = 2048;
                        nv->special_options[1] = BIT_7;
                } else if (IS_QLA2200(ha)) {
                        nv->firmware_options[0] = BIT_2 | BIT_1;
                        nv->firmware_options[1] = BIT_7 | BIT_5;
                        nv->add_firmware_options[0] = BIT_5;
                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
-                       nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                       nv->frame_payload_size = 1024;
                } else if (IS_QLA2100(ha)) {
                        nv->firmware_options[0] = BIT_3 | BIT_1;
                        nv->firmware_options[1] = BIT_5;
-                       nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                       nv->frame_payload_size = 1024;
                }
 
                nv->max_iocb_allocation = __constant_cpu_to_le16(256);
@@ -2643,7 +2643,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
         * are valid.
         */
        if (ia64_platform_is("sn2")) {
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                if (IS_QLA23XX(ha))
                        nv->special_options[1] = BIT_7;
        }
@@ -4958,7 +4958,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
                memset(nv, 0, ha->nvram_size);
                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
                nv->version = __constant_cpu_to_le16(ICB_VERSION);
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
                nv->exchange_count = __constant_cpu_to_le16(0);
                nv->hard_address = __constant_cpu_to_le16(124);
@@ -5905,7 +5905,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
                memset(nv, 0, ha->nvram_size);
                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
                nv->version = __constant_cpu_to_le16(ICB_VERSION);
-               nv->frame_payload_size = __constant_cpu_to_le16(2048);
+               nv->frame_payload_size = 2048;
                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
                nv->exchange_count = __constant_cpu_to_le16(0);
                nv->port_name[0] = 0x21;