aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Falcon <tlfalcon@linux.ibm.com>2019-01-24 11:17:01 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-05 17:58:51 +0100
commite91cbe1de3b331626415f147829963841f6a4836 (patch)
tree2b5488455539848a0b77039d189163c39a6a7c92
parent61fe1005f334a0db551983982bf95857be8389c0 (diff)
downloadlinux-yocto-e91cbe1de3b331626415f147829963841f6a4836.tar.gz
linux-yocto-e91cbe1de3b331626415f147829963841f6a4836.tar.bz2
linux-yocto-e91cbe1de3b331626415f147829963841f6a4836.zip
ibmveth: Do not process frames after calling napi_reschedule
[ Upstream commit e95d22c69b2c130ccce257b84daf283fd82d611e ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 91f48c078073..f70cb4d3c684 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1314,7 +1314,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
unsigned long lpar_rc;
u16 mss = 0;
-restart_poll:
while (frames_processed < budget) {
if (!ibmveth_rxq_pending_buffer(adapter))
break;
@@ -1402,7 +1401,6 @@ restart_poll:
napi_reschedule(napi)) {
lpar_rc = h_vio_signal(adapter->vdev->unit_address,
VIO_IRQ_DISABLE);
- goto restart_poll;
}
}