Merge branch 'xenpacer-cwnd' into xenpacer-exp

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

@@ -2335,7 +2335,12 @@ rx_intercept:
     goto rx_intercept;
   }
 
-	napi_schedule_irqoff(&bnx2x_fp(bp, fp->index, napi));
+  /*
+   * in modified driver, interrupts are still on,
+   * so need to schedule with irqsave.
+   */
+  napi_schedule(&bnx2x_fp(bp, fp->index, napi));
+//  napi_schedule_irqoff(&bnx2x_fp(bp, fp->index, napi));
 
 	return IRQ_HANDLED;
 }
@@ -4688,7 +4693,12 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
 					napi_complete(napi);
 
           if (bnx2x_has_rx_work(fp)) {
-						napi_schedule_irqoff(napi);
+            /*
+             * in modified driver, interrupts are still on,
+             * so need to reschedule with irqsave.
+             */
+            napi_reschedule(napi);
+//            napi_schedule_irqoff(napi);
 #if 0
 						/* enable this if irq enabled from here */
 						tmp_bd_prod = NEXT_RX_IDX(fp->rx_bd_prod);