diff options
| author |   Keith Mange <keith.mange@microsoft.com> | 2015-08-13 08:43:50 -0700 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Odin.com> | 2015-08-26 22:41:35 -0700 |
| commit | e6c4bc66842752110a66746e2d044fafc01e4800 (patch) | |
| tree | 0c1d685c605c7d009ee2fe69cec44b8867312829 /drivers/scsi/storvsc_drv.c | |
| parent | storvsc: use correct defaults for values determined by protocol negotiation (diff) | |
| download | linux-dev-e6c4bc66842752110a66746e2d044fafc01e4800.tar.xz linux-dev-e6c4bc66842752110a66746e2d044fafc01e4800.zip | |
storvsc: use storage protocol version to determine storage capabilities
Use storage protocol version instead of vmbus protocol
version when determining storage capabilities.
Tested-by: Alex Ng <alexng@microsoft.com>
Signed-off-by: Keith Mange <keith.mange@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/storvsc_drv.c')
| -rw-r--r-- | 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 8937ce92f875..97219a0bb280 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -1041,7 +1041,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; @@ -1483,9 +1483,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; } |