Received from Mark Salyzyn
Spelling correction, orphaned comment removal & warning suppression.
Signed-off-by: Mark Haverkamp <markh@xxxxxxxx>
---
Applies to the scsi-misc-2.6 git tree.
--- scsi-misc-aac.orig/drivers/scsi/aacraid/aacraid.h 2006-06-08 09:37:38.000000000 -0700
+++ scsi-misc-aac/drivers/scsi/aacraid/aacraid.h 2006-06-08 09:38:47.000000000 -0700
@@ -12,7 +12,7 @@
#ifndef AAC_DRIVER_BUILD
# define AAC_DRIVER_BUILD 2409
-# define AAC_DRIVER_BRANCH "-mh1"
+# define AAC_DRIVER_BRANCH "-mh2"
#endif
#define MAXIMUM_NUM_CONTAINERS 32
@@ -822,10 +822,6 @@
void *callback_data;
u32 flags; // u32 dmb was ulong
/*
- * The following is used to put this fib context onto the
- * Outstanding I/O queue.
- */
- /*
* And for the internal issue/reply queues (we may be able
* to merge these two)
*/
--- scsi-misc-aac.orig/drivers/scsi/aacraid/comminit.c 2006-06-08 09:37:38.000000000 -0700
+++ scsi-misc-aac/drivers/scsi/aacraid/comminit.c 2006-06-08 09:38:47.000000000 -0700
@@ -55,7 +55,7 @@
const unsigned long fibsize = 4096;
const unsigned long printfbufsiz = 256;
struct aac_init *init;
- dma_addr_t phys;
+ dma_addr_t phys = 0;
size = fibsize + sizeof(struct aac_init) + commsize + commalign + printfbufsiz;
@@ -103,7 +103,7 @@
* This assumes the memory is mapped zero->n, which isnt
* always true on real computers. It also has some slight problems
* with the GART on x86-64. I've btw never tried DMA from PCI space
- * on this platform but don't be suprised if its problematic.
+ * on this platform but don't be surprised if its problematic.
*/
#ifndef CONFIG_GART_IOMMU
if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
--- scsi-misc-aac.orig/drivers/scsi/aacraid/dpcsup.c 2006-06-08 09:37:38.000000000 -0700
+++ scsi-misc-aac/drivers/scsi/aacraid/dpcsup.c 2006-06-08 09:38:47.000000000 -0700
@@ -85,9 +85,9 @@
* continue. The caller has already been notified that
* the fib timed out.
*/
- if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
+ if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
dev->queues->queue[AdapNormCmdQueue].numpending--;
- } else {
+ else {
printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
continue;
--- scsi-misc-aac.orig/drivers/scsi/aacraid/rkt.c 2006-06-08 09:37:38.000000000 -0700
+++ scsi-misc-aac/drivers/scsi/aacraid/rkt.c 2006-06-08 09:38:47.000000000 -0700
@@ -325,10 +325,12 @@
if ((status & 0xFF000000L) == 0xBC000000L)
return (status >> 16) & 0xFF;
+ baddr = 0;
buffer = pci_alloc_consistent(dev->pdev, 512, &baddr);
ret = -2;
if (buffer == NULL)
return ret;
+ paddr = 0;
post = pci_alloc_consistent(dev->pdev,
sizeof(struct POSTSTATUS), &paddr);
if (post == NULL) {
--- scsi-misc-aac.orig/drivers/scsi/aacraid/rx.c 2006-06-08 09:37:38.000000000 -0700
+++ scsi-misc-aac/drivers/scsi/aacraid/rx.c 2006-06-08 09:38:47.000000000 -0700
@@ -324,10 +324,12 @@
if ((status & 0xFF000000L) == 0xBC000000L)
return (status >> 16) & 0xFF;
+ baddr = 0;
buffer = pci_alloc_consistent(dev->pdev, 512, &baddr);
ret = -2;
if (buffer == NULL)
return ret;
+ paddr = 0;
post = pci_alloc_consistent(dev->pdev,
sizeof(struct POSTSTATUS), &paddr);
if (post == NULL) {
--
Mark Haverkamp <markh@xxxxxxxx>
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
