diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:36:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:36:34 -0400 |
| commit | 61bd1e858db743af64f6e363c526f7e433d12e0c (patch) | |
| tree | a9213c472c1458e9e7686f9d9fa1c4ed1362e3f3 /drivers/infiniband | |
| parent | 8c0c3f7ff0daa119f0bb109148f6f0e39573b429 (diff) | |
| parent | e9da4d7f731dafc2b93ce7b31aa09c4d935ef978 (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: (53 commits)
[SCSI] libosd: OSD2r05: on-the-wire changes for latest OSD2 revision 5.
[SCSI] libosd: OSD2r05: OSD_CRYPTO_KEYID_SIZE will grow 20 => 32 bytes
[SCSI] libosd: OSD2r05: Prepare for rev5 attribute list changes
[SCSI] libosd: fix potential ERR_PTR dereference in osd_initiator.c
[SCSI] mpt2sas : bump driver version to 01.100.02.00
[SCSI] mpt2sas: fix hotplug event processing
[SCSI] mpt2sas : release diagnotic buffers prior host reset
[SCSI] mpt2sas : Broadcast Primative AEN bug fix
[SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time
[SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
[SCSI] mpt2sas : running out of message frames
[SCSI] mpt2sas : fix oops when firmware sends large sense buffer size
[SCSI] mpt2sas : the sanity check in base_interrupt needs to be on dword boundary
[SCSI] mpt2sas : unique ioctl magic number
[SCSI] fix sign extension with 1.5TB usb-storage LBD=y
[SCSI] ipr: Fix sleeping function called with interrupts disabled
[SCSI] fcoe: fip: add multicast filter to receive FIP advertisements.
[SCSI] libfc: Fix compilation warnings with allmodconfig
[SCSI] fcoe: fix spelling typos and bad comments
[SCSI] fcoe: don't export functions that are internal to fcoe
...
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 13d7674b293d..75223f50de58 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
| @@ -599,6 +599,7 @@ static struct scsi_host_template iscsi_iser_sht = { | |||
| 599 | .eh_abort_handler = iscsi_eh_abort, | 599 | .eh_abort_handler = iscsi_eh_abort, |
| 600 | .eh_device_reset_handler= iscsi_eh_device_reset, | 600 | .eh_device_reset_handler= iscsi_eh_device_reset, |
| 601 | .eh_target_reset_handler= iscsi_eh_target_reset, | 601 | .eh_target_reset_handler= iscsi_eh_target_reset, |
| 602 | .target_alloc = iscsi_target_alloc, | ||
| 602 | .use_clustering = DISABLE_CLUSTERING, | 603 | .use_clustering = DISABLE_CLUSTERING, |
| 603 | .proc_name = "iscsi_iser", | 604 | .proc_name = "iscsi_iser", |
| 604 | .this_id = -1, | 605 | .this_id = -1, |