From: William Dauchy <william@gandi.net>
Date: Fri, 30 Oct 2015 17:16:30 +0000 (+0100)
Subject: ixgbevf: Fix handling of NAPI budget when multiple queues are enabled per vector
X-Git-Tag: v4.1.12-92~126^2~171
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=13e3bc5f7e67541275a0d08b14650da9197664c4;p=users%2Fjedix%2Flinux-maple.git

ixgbevf: Fix handling of NAPI budget when multiple queues are enabled per vector

Orabug: 23177316

This is the same patch as for ixgbe but applied differently according to
busy polling.  See commit 5d6002b7b822c74 ("ixgbe: Fix handling of NAPI
budget when multiple queues are enabled per vector")

Signed-off-by: William Dauchy <william@gandi.net>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit d0f71afffa1c3d5a36a4a278f1dbbd2643176dc3)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index bff5031611fe2..f78384ff030c9 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1016,6 +1016,8 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget)
 	ixgbevf_for_each_ring(ring, q_vector->tx)
 		clean_complete &= ixgbevf_clean_tx_irq(q_vector, ring);
 
+	if (budget <= 0)
+		return budget;
 #ifdef CONFIG_NET_RX_BUSY_POLL
 	if (!ixgbevf_qv_lock_napi(q_vector))
 		return budget;