diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-01 17:42:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-01 17:42:05 -0700 |
| commit | 6026e043d09012c6269f9a96a808d52d9c498224 (patch) | |
| tree | a80578915557db98596821ff60d2ff37dafffb4f /drivers/scsi/ipr.c | |
| parent | 4cc5b44b29a9de9b3f841efedaa3f769066c63cc (diff) | |
| parent | 138e4ad67afd5c6c318b056b4d17c17f2c0ca5c0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three cases of simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index da5bdbdcce52..f838bd73befa 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -4945,6 +4945,7 @@ static int ipr_slave_configure(struct scsi_device *sdev) } if (ipr_is_vset_device(res)) { sdev->scsi_level = SCSI_SPC_3; + sdev->no_report_opcodes = 1; blk_queue_rq_timeout(sdev->request_queue, IPR_VSET_RW_TIMEOUT); blk_queue_max_hw_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS); |