diff options
author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:28:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:11 -0500 |
commit | 0c95fdc59640824d7e0b017be295fb912ceef4ab (patch) | |
tree | d72d273e6fa6cf2163f60d4bd015f677f32303ce /drivers | |
parent | b7d8629f8b4b250fda578e59ecddc77c6bdec2b6 (diff) |
iommu sg merging: aacraid: use pci_set_dma_max_seg_size
This sets the segment size limit properly via pci_set_dma_max_seg_size
and remove blk_queue_max_segment_size because scsi-ml calls it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 0e8267c1e915..fb0886140dd7 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -449,9 +449,6 @@ static int aac_slave_configure(struct scsi_device *sdev) | |||
449 | else if (depth < 2) | 449 | else if (depth < 2) |
450 | depth = 2; | 450 | depth = 2; |
451 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth); | 451 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth); |
452 | if (!(((struct aac_dev *)host->hostdata)->adapter_info.options & | ||
453 | AAC_OPT_NEW_COMM)) | ||
454 | blk_queue_max_segment_size(sdev->request_queue, 65536); | ||
455 | } else | 452 | } else |
456 | scsi_adjust_queue_depth(sdev, 0, 1); | 453 | scsi_adjust_queue_depth(sdev, 0, 1); |
457 | 454 | ||
@@ -1133,6 +1130,12 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
1133 | if (error < 0) | 1130 | if (error < 0) |
1134 | goto out_deinit; | 1131 | goto out_deinit; |
1135 | 1132 | ||
1133 | if (!(aac->adapter_info.options & AAC_OPT_NEW_COMM)) { | ||
1134 | error = pci_set_dma_max_seg_size(pdev, 65536); | ||
1135 | if (error) | ||
1136 | goto out_deinit; | ||
1137 | } | ||
1138 | |||
1136 | /* | 1139 | /* |
1137 | * Lets override negotiations and drop the maximum SG limit to 34 | 1140 | * Lets override negotiations and drop the maximum SG limit to 34 |
1138 | */ | 1141 | */ |