diff options
author | Thomas Falcon <tlfalcon@linux.ibm.com> | 2019-01-24 12:17:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-25 01:48:15 -0500 |
commit | e95d22c69b2c130ccce257b84daf283fd82d611e (patch) | |
tree | 54cb193da4fe1f79dc338dedd83a8627e861b111 | |
parent | 3b707c3008cad04604c1f50e39f456621821c414 (diff) |
ibmveth: Do not process frames after calling napi_reschedule
The IBM virtual ethernet driver's polling function continues
to process frames after rescheduling NAPI, resulting in a warning
if it exhausted its budget. Do not restart polling after calling
napi_reschedule. Instead let frames be processed in the following
instance.
Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/ibm/ibmveth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 098d8764c0ea..dd71d5db7274 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c | |||
@@ -1313,7 +1313,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) | |||
1313 | unsigned long lpar_rc; | 1313 | unsigned long lpar_rc; |
1314 | u16 mss = 0; | 1314 | u16 mss = 0; |
1315 | 1315 | ||
1316 | restart_poll: | ||
1317 | while (frames_processed < budget) { | 1316 | while (frames_processed < budget) { |
1318 | if (!ibmveth_rxq_pending_buffer(adapter)) | 1317 | if (!ibmveth_rxq_pending_buffer(adapter)) |
1319 | break; | 1318 | break; |
@@ -1401,7 +1400,6 @@ restart_poll: | |||
1401 | napi_reschedule(napi)) { | 1400 | napi_reschedule(napi)) { |
1402 | lpar_rc = h_vio_signal(adapter->vdev->unit_address, | 1401 | lpar_rc = h_vio_signal(adapter->vdev->unit_address, |
1403 | VIO_IRQ_DISABLE); | 1402 | VIO_IRQ_DISABLE); |
1404 | goto restart_poll; | ||
1405 | } | 1403 | } |
1406 | } | 1404 | } |
1407 | 1405 | ||