From: James Bottomley <jejb@mulgrave.(none)>
Date: Fri, 28 Oct 2005 16:41:41 +0000 (-0500)
Subject: Merge HEAD from ../scsi-misc-2.6-old
X-Git-Tag: v2.6.15-rc1~723^2~2^2~50
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a9a621aba953ddb8051547e98c10ec3c741312;p=linux-2.6

Merge HEAD from ../scsi-misc-2.6-old
---

38a9a621aba953ddb8051547e98c10ec3c741312
diff --cc drivers/scsi/Makefile
index 2d4439826c,2349f902b4..8dfb9884af
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -31,8 -31,8 +31,9 @@@ obj-$(CONFIG_RAID_ATTRS)	+= raid_class.
  obj-$(CONFIG_SCSI_SPI_ATTRS)	+= scsi_transport_spi.o
  obj-$(CONFIG_SCSI_FC_ATTRS) 	+= scsi_transport_fc.o
  obj-$(CONFIG_SCSI_ISCSI_ATTRS)	+= scsi_transport_iscsi.o
 +obj-$(CONFIG_SCSI_SAS_ATTRS)	+= scsi_transport_sas.o
  
+ obj-$(CONFIG_ISCSI_TCP) 	+= iscsi_tcp.o
  obj-$(CONFIG_SCSI_AMIGA7XX)	+= amiga7xx.o	53c7xx.o
  obj-$(CONFIG_A3000_SCSI)	+= a3000.o	wd33c93.o
  obj-$(CONFIG_A2091_SCSI)	+= a2091.o	wd33c93.o
diff --cc drivers/scsi/aacraid/linit.c
index a1f9ceef0a,7a25dab48a..c235d0c0e7
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@@ -748,12 -748,11 +748,12 @@@ static int __devinit aac_probe_one(stru
  		unique_id++;
  	}
  
 -	if (pci_enable_device(pdev))
 +	error = pci_enable_device(pdev);
 +	if (error)
  		goto out;
  
- 	if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || 
- 			pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL))
+ 	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || 
+ 			pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
  		goto out;
  	/*
  	 * If the quirk31 bit is set, the adapter needs adapter
@@@ -797,13 -795,11 +797,13 @@@
  	 * address space.
  	 */
  	if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
- 		if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL))
- 			goto out_free_fibs;
- 
+ 		if (pci_set_dma_mask(pdev, DMA_32BIT_MASK))
+ 			goto out_deinit;
+  
  	aac->maximum_num_channels = aac_drivers[index].channels;
 -	aac_get_adapter_info(aac);
 +	error = aac_get_adapter_info(aac);
 +	if (error < 0)
 +		goto out_deinit;
  
  	/*
   	 * Lets override negotiations and drop the maximum SG limit to 34