diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 17:49:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 17:49:59 -0800 |
| commit | 103926c689650396901002c3a8c38970fff70391 (patch) | |
| tree | db520fd02cc46c9afe1d6fa4389dbe5a2892a9f3 /drivers/scsi/libiscsi.c | |
| parent | da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75 (diff) | |
| parent | 51f39eae14b4874618e73281c236e3a1c1572d4d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (27 commits)
[SCSI] mpt fusion: don't oops if NumPhys==0
[SCSI] iscsi class: regression - fix races with state manipulation and blocking/unblocking
[SCSI] qla4xxx: regression - add start scan callout
[SCSI] qla4xxx: fix host reset dpc race
[SCSI] tgt: fix build errors when dprintk is defined
[SCSI] tgt: set the data length properly
[SCSI] tgt: stop zero'ing scsi_cmnd
[SCSI] ibmvstgt: set up scsi_host properly before __scsi_alloc_queue
[SCSI] docbook: fix fusion source files
[SCSI] docbook: fix scsi source file
[SCSI] qla2xxx: Update version number to 8.02.00-k9.
[SCSI] qla2xxx: Correct usage of inconsistent timeout values while issuing ELS commands.
[SCSI] qla2xxx: Correct discrepancies during OVERRUN handling on FWI2-capable cards.
[SCSI] qla2xxx: Correct needless clean-up resets during shutdown.
[SCSI] arcmsr: update version and changelog
[SCSI] ps3rom: disable clustering
[SCSI] ps3rom: fix wrong resid calculation bug
[SCSI] mvsas: fix phy sas address
[SCSI] gdth: fix to internal commands execution
[SCSI] gdth: bugfix for the at-exit problems
...
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 59f8445eab0..bdd7de7da39 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1708,8 +1708,8 @@ iscsi_session_setup(struct iscsi_transport *iscsit, qdepth = ISCSI_DEF_CMD_PER_LUN; } - if (!is_power_of_2(cmds_max) || - cmds_max >= ISCSI_MGMT_ITT_OFFSET) { + if (!is_power_of_2(cmds_max) || cmds_max >= ISCSI_MGMT_ITT_OFFSET || + cmds_max < 2) { if (cmds_max != 0) printk(KERN_ERR "iscsi: invalid can_queue of %d. " "can_queue must be a power of 2 and between " |