17 files changed, 53 insertions, 12 deletions

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 2061b471fd16..26efaaa5e73f 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -720,6 +720,9 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
         int rx_pkt_limit = budget;
         unsigned long flags;
 
+        if (rx_pkt_limit <= 0)
+                goto rx_not_empty;
+
         do{
                 /* process receive packets until we use the quota*/
                 /* If we own the next entry, it's a new packet. Send it up. */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 117b5c7f8ac9..acd494647f25 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -872,6 +872,8 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
         if (unlikely(bp->panic))
                 return 0;
 #endif
+        if (budget <= 0)
+                return rx_pkt;
 
         bd_cons = fp->rx_bd_cons;
         bd_prod = fp->rx_bd_prod;
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index dcd58f23834a..4c35fc8fad99 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1086,14 +1086,15 @@ static int enic_poll(struct napi_struct *napi, int budget)
         unsigned int intr = enic_legacy_io_intr();
         unsigned int rq_work_to_do = budget;
         unsigned int wq_work_to_do = -1; /* no limit */
-        unsigned int  work_done, rq_work_done, wq_work_done;
+        unsigned int  work_done, rq_work_done = 0, wq_work_done;
         int err;
 
         /* Service RQ (first) and WQ
          */
 
-        rq_work_done = vnic_cq_service(&enic->cq[cq_rq],
-                rq_work_to_do, enic_rq_service, NULL);
+        if (budget > 0)
+                rq_work_done = vnic_cq_service(&enic->cq[cq_rq],
+                        rq_work_to_do, enic_rq_service, NULL);
 
         wq_work_done = vnic_cq_service(&enic->cq[cq_wq],
                 wq_work_to_do, enic_wq_service, NULL);
@@ -1141,14 +1142,15 @@ static int enic_poll_msix(struct napi_struct *napi, int budget)
         unsigned int cq = enic_cq_rq(enic, rq);
         unsigned int intr = enic_msix_rq_intr(enic, rq);
         unsigned int work_to_do = budget;
-        unsigned int work_done;
+        unsigned int work_done = 0;
         int err;
 
         /* Service RQ
          */
 
-        work_done = vnic_cq_service(&enic->cq[cq],
-                work_to_do, enic_rq_service, NULL);
+        if (budget > 0)
+                work_done = vnic_cq_service(&enic->cq[cq],
+                        work_to_do, enic_rq_service, NULL);
 
         /* Return intr event credits for this polling
          * cycle.  An intr event is the completion of a
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 62f042d4aaa9..dc80db41d6b3 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -91,6 +91,9 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
         u16 pkt_len, sc;
         int curidx;
 
+        if (budget <= 0)
+                return received;
+
         /*
          * First, grab all of the stats for the incoming packet.
          * These get messed up if we get called due to a busy condition.
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 1fc8334fc181..e75bdfcd1374 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1072,7 +1072,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
         unsigned long lpar_rc;
 
 restart_poll:
-        do {
+        while (frames_processed < budget) {
                 if (!ibmveth_rxq_pending_buffer(adapter))
                         break;
 
@@ -1121,7 +1121,7 @@ restart_poll:
                         netdev->stats.rx_bytes += length;
                         frames_processed++;
                 }
-        } while (frames_processed < budget);
+        }
 
         ibmveth_replenish_task(adapter);
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index daa3b295ff3d..88666adb0743 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1302,6 +1302,9 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
         u8 rx_ptype;
         u64 qword;
 
+        if (budget <= 0)
+                return 0;
+
         rx_desc = I40E_RX_DESC(rx_ring, i);
         qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
         rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index f81d87cfcc8d..d6b11522fed7 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6946,7 +6946,7 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget)
         unsigned int total_bytes = 0, total_packets = 0;
         u16 cleaned_count = igb_desc_unused(rx_ring);
 
-        do {
+        while (likely(total_packets < budget)) {
                 union e1000_adv_rx_desc *rx_desc;
 
                 /* return some buffers to hardware, one at a time is too slow */
@@ -6998,7 +6998,7 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget)
 
                 /* update budget accounting */
                 total_packets++;
-        } while (likely(total_packets < budget));
+        }
 
         /* place incomplete frames back on ring for completion */
         rx_ring->skb = skb;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 5d314fe873bb..18cd8ca319ea 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2076,7 +2076,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,