From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36AC97461 for ; Sun, 17 Sep 2023 20:19:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D716C433C8; Sun, 17 Sep 2023 20:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694981982; bh=eyUaPxDvoBiSihAEMziXLBnWMtiD1hYaMGJpwl7jGIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=inPiWdk97AmhAKU7xVsw2dbRsr1wBulB50WZeU+WgbvR3QMc0wyig6rnaHH1sohmq c1V/zAymMsdA0p210s1LY7F3kpd4iMoNnOpAtdGeDXBWWEMIXR24jPJ6Pi0189eose MJfkpRFo9iIYOR1/hbfwKLo6GPU6SldRfwtzQ45s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hayes Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 6.1 201/219] r8152: check budget for r8152_poll() Date: Sun, 17 Sep 2023 21:15:28 +0200 Message-ID: <20230917191048.205044060@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230917191040.964416434@linuxfoundation.org> References: <20230917191040.964416434@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hayes Wang [ Upstream commit a7b8d60b37237680009dd0b025fe8c067aba0ee3 ] According to the document of napi, there is no rx process when the budget is 0. Therefore, r8152_poll() has to return 0 directly when the budget is equal to 0. Fixes: d2187f8e4454 ("r8152: divide the tx and rx bottom functions") Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 059d610901d84..fc1458f96e170 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2628,6 +2628,9 @@ static int r8152_poll(struct napi_struct *napi, int budget) struct r8152 *tp = container_of(napi, struct r8152, napi); int work_done; + if (!budget) + return 0; + work_done = rx_bottom(tp, budget); if (work_done < budget) { -- 2.40.1