From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Date: Mon, 20 Jun 2016 10:39:32 -0700 Subject: [Intel-wired-lan] [PATCH 1/2] fm10k: napi polling routine must return actual work done Message-ID: <20160620173933.5638-1-jacob.e.keller@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: When fm10k_poll fully cleans rings it returns 0. This is incorrect as it messes up the budget accounting in the core napi code. Fix this by returning actual work done, capped at budget - 1 since the core doesn't expect a return of the full budget when the driver modifies the napi status. Signed-off-by: Jacob Keller Cc: Paolo Abeni Cc: Venkatesh Srinivas Cc: Alexander Duyck --- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c index 682a372bdb20..79d5093d83d1 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c @@ -1484,7 +1484,7 @@ static int fm10k_poll(struct napi_struct *napi, int budget) /* re-enable the q_vector */ fm10k_qv_enable(q_vector); - return 0; + return min(work_done, budget - 1); } /** -- 2.9.0.rc1.405.g81f467e