patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / scsi / aacraid / comminit.c

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 32849f2..beb561f 100644 (file)
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -81,9 +81,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         *      Adapter Fibs are the first thing allocated so that they
         *      start page aligned
         */
-       dev->fib_base_va = (ulong)base;
+       dev->aif_base_va = (struct hw_fib *)base;
        
-       init->AdapterFibsVirtualAddress = cpu_to_le32((u32)(ulong)phys);
+       init->AdapterFibsVirtualAddress = cpu_to_le32(0);
        init->AdapterFibsPhysicalAddress = cpu_to_le32((u32)phys);
        init->AdapterFibsSize = cpu_to_le32(fibsize);
        init->AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib));
@@ -94,6 +94,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         * mapping system, but older Firmware did, and had *troubles* dealing
         * with the math overloading past 32 bits, thus we must limit this
         * field.
+        *
+        * FIXME: this assumes the memory is mapped zero->n, which isnt
+        * always true on real computers.
         */
        if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
                init->HostPhysMemPages = 
@@ -140,7 +143,7 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
        q->dev = dev;
        INIT_LIST_HEAD(&q->pendingq);
        init_waitqueue_head(&q->cmdready);
-       AAC_INIT_LIST_HEAD(&q->cmdq);
+       INIT_LIST_HEAD(&q->cmdq);
        init_waitqueue_head(&q->qfull);
        spin_lock_init(&q->lockdata);
        q->lock = &q->lockdata;