2 files changed, 20 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 43557bf661f6..75abd0453289 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -44,7 +44,9 @@
 
 #include "aacraid.h"
 
-struct aac_common aac_config;
+struct aac_common aac_config = {
+        .irq_mod = 1
+};
 
 static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long commsize, unsigned long commalign)
 {
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 5322865942e2..a1d303f03480 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -254,6 +254,7 @@ static void fib_dealloc(struct fib * fibptr)
 static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entry, u32 * index, unsigned long *nonotify)
 {
         struct aac_queue * q;
+        unsigned long idx;
 
         /*
          *      All of the queues wrap when they reach the end, so we check
@@ -263,10 +264,23 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
          */
 
         q = &dev->queues->queue[qid];
-        
-        *index = le32_to_cpu(*(q->headers.producer));
-        if ((*index - 2) == le32_to_cpu(*(q->headers.consumer)))
+
+        idx = *index = le32_to_cpu(*(q->headers.producer));
+        /* Interrupt Moderation, only interrupt for first two entries */
+        if (idx != le32_to_cpu(*(q->headers.consumer))) {
+                if (--idx == 0) {
+                        if (qid == AdapHighCmdQueue)
+                                idx = ADAP_HIGH_CMD_ENTRIES;
+                        else if (qid == AdapNormCmdQueue)
+                                idx = ADAP_NORM_CMD_ENTRIES;
+                        else if (qid == AdapHighRespQueue) 
+                                idx = ADAP_HIGH_RESP_ENTRIES;
+                        else if (qid == AdapNormRespQueue) 
+                                idx = ADAP_NORM_RESP_ENTRIES;
+                }
+                if (idx != le32_to_cpu(*(q->headers.consumer)))
                         *nonotify = 1; 
+        }
 
         if (qid == AdapHighCmdQueue) {
                 if (*index >= ADAP_HIGH_CMD_ENTRIES)