summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40e
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2016-11-08 22:05:16 +0100
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-12-07 05:46:13 +0100
commit6beb84a73ec5dbd051005068c130195f77e78cfc (patch)
treeccaa4613a5cf407d5b2a9c0a43849d6592203f66 /drivers/net/ethernet/intel/i40e
parenti40e: restore workaround for removing default MAC filter (diff)
downloadlinux-6beb84a73ec5dbd051005068c130195f77e78cfc.tar.xz
linux-6beb84a73ec5dbd051005068c130195f77e78cfc.zip
i40e/i40evf: napi_poll must return the work done
Currently the function i40e_napi-poll() returns 0 when it clean completely the Rx rings, but this foul budget accounting in core code. Fix this by returning the actual work done, capped to budget - 1, since the core doesn't allow to return the full budget when the driver modifies the NAPI status This is based on a similar change that was made for the ixgbe driver by Paolo Abeni. Change-ID: Ic3d93ad2fa2fc8ce3164bc461e69367da0f9173b Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_txrx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 5544b509832f..352cf7cd2ef4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2027,7 +2027,7 @@ tx_only:
else
i40e_update_enable_itr(vsi, q_vector);
- return 0;
+ return min(work_done, budget - 1);
}
/**