diff --git a/qla_isp/common/ispvar.h b/qla_isp/common/ispvar.h
index 24e1282fe..cdd3c28b8 100644
--- a/qla_isp/common/ispvar.h
+++ b/qla_isp/common/ispvar.h
@@ -1,4 +1,4 @@
-/* $Id: ispvar.h,v 1.96 2008/03/16 00:34:49 mjacob Exp $ */
+/* $Id: ispvar.h,v 1.97 2008/03/23 04:56:30 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -735,6 +735,7 @@ struct ispsoftc {
 #define	ISP_HA_FC_2400		0x60
 
 #define	IS_SCSI(isp)	(isp->isp_type & ISP_HA_SCSI)
+#define	IS_1020(isp)	(isp->isp_type < ISP_HA_SCSI_1240)
 #define	IS_1240(isp)	(isp->isp_type == ISP_HA_SCSI_1240)
 #define	IS_1080(isp)	(isp->isp_type == ISP_HA_SCSI_1080)
 #define	IS_1280(isp)	(isp->isp_type == ISP_HA_SCSI_1280)
diff --git a/qla_isp/linux/isp_pci.c b/qla_isp/linux/isp_pci.c
index e072d10fa..d2a9efe1e 100644
--- a/qla_isp/linux/isp_pci.c
+++ b/qla_isp/linux/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.166 2008/03/21 16:10:23 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.167 2008/03/23 17:05:10 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -87,12 +87,18 @@ static int isp_pci_mbxdma(ispsoftc_t *);
 static int isp_pci_dmasetup(ispsoftc_t *, XS_T *, ispreq_t *, uint32_t *, uint32_t);
 static void isp_pci_dmateardown(ispsoftc_t *, XS_T *, uint32_t);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6)
+#define DMA_64BIT_MASK  0xffffffffffffffffULL
+#define DMA_32BIT_MASK  0x00000000ffffffffULL
+#endif
+
 #define SIXTEENM_SEG(x)             (((u64) (x)) & 0xffffffff00000000ULL)
 #define SAME_SIXTEENM(addr, cnt)    (SIXTEENM_SEG(addr) == SIXTEENM_SEG(addr + cnt - 1))
 
 #define FOURG_SEG(x)                (((u64) (x)) & 0xffffffff00000000ULL)
 #define SAME_4G(addr, cnt)          (FOURG_SEG(addr) == FOURG_SEG(addr + cnt - 1))
 
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 #define ISP_IRQ_FLAGS   SA_INTERRUPT | SA_SHIRQ
 #else
@@ -102,7 +108,7 @@ static void isp_pci_dmateardown(ispsoftc_t *, XS_T *, uint32_t);
 #ifdef    ISP_DAC_SUPPORTED
 #define ISP_A64                 1
 #define HIWD(x)                 ((x) >> 32)
-#define IS_HIGH_ISP_ADDR(addr)  ((u64) addr > ((u64) 0xffffffffLL))
+#define IS_HIGH_ISP_ADDR(addr)  (((u64) addr) > DMA_32BIT_MASK)
 #else
 #define ISP_A64                 0
 #define HIWD(x)                 0
@@ -880,23 +886,18 @@ isplinux_pci_init_one(struct Scsi_Host *host)
      * CONFIG_HIGHMEM64G defined.
      */
 
-/*    if (isp->isp_type < ISP_HA_SCSI_1240) {
-        if (pci_set_dma_mask(pdev, (u64)0x00ffffff)) {
-            isp_prt(isp, ISP_LOGERR, "cannot set 24 bit dma mask");
-            goto bad;
-        }
-    } else */ if (ISP_A64) {
-        if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) {
-            if (pci_set_dma_mask(pdev, (u64) 0xffffffff)) {
-                isp_prt(isp, ISP_LOGERR, "cannot set 32 bit dma mask");
+    if (ISP_A64) {
+        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+            if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+                isp_prt(isp, ISP_LOGERR, "cannot even set 32 bit dma mask");
                 goto bad;
             }
         } else {
             isp_prt(isp, ISP_LOGCONFIG, "enabling 64 bit DMA");
         }
     } else {
-        if (pci_set_dma_mask(pdev, (u64)0xffffffff)) {
-            isp_prt(isp, ISP_LOGERR, "cannot set 32 bit dma mask");
+        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+            isp_prt(isp, ISP_LOGERR, "cannot even set 32 bit dma mask");
             goto bad;
         }
     }