From: Keith Mange <keith.ma...@microsoft.com>

Use storage protocol version instead of vmbus protocol
version when determining storage capabilities.

Tested-by: Alex Ng <ale...@microsoft.com>
Signed-off-by: Keith Mange <keith.ma...@microsoft.com>
Signed-off-by: K. Y. Srinivasan <k...@microsoft.com>
---
 drivers/scsi/storvsc_drv.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 6f38cdf..58fa47a 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1049,7 +1049,7 @@ static int storvsc_channel_init(struct hv_device *device)
         * support multi-channel.
         */
        max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;
-       if (vmbus_proto_version >= VERSION_WIN8) {
+       if (vmstor_proto_version >= VMSTOR_PROTO_VERSION_WIN8) {
                if (vstor_packet->storage_channel_properties.flags &
                    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)
                        process_sub_channels = true;
@@ -1491,9 +1491,9 @@ static int storvsc_device_configure(struct scsi_device 
*sdevice)
         * if the device is a MSFT virtual device.
         */
        if (!strncmp(sdevice->vendor, "Msft", 4)) {
-               switch (vmbus_proto_version) {
-               case VERSION_WIN8:
-               case VERSION_WIN8_1:
+               switch (vmstor_proto_version) {
+               case VMSTOR_PROTO_VERSION_WIN8:
+               case VMSTOR_PROTO_VERSION_WIN8_1:
                        sdevice->scsi_level = SCSI_SPC_3;
                        break;
                }
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to