xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: atlantic: reduce scope of is_rsc_complete

Browse Source 
[ Upstream commit 79784d77ebbd3ec516b7a5ce555d979fb7946202 ]

Don't defer handling the err case outside the loop. That's pointless.

And since is_rsc_complete is only used inside this loop, declare
it inside the loop to reduce it's scope.

Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Grant Grundler
2022-05-09 19:28:24 -07:00
committed by Greg Kroah-Hartman
parent 9b84e83a92
commit 9bee8b4275
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/aquantia/atlantic/aq_ring.c
View File

@@ -345,7 +345,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
int budget) int budget)
{ {
struct net_device *ndev = aq_nic_get_ndev(self->aq_nic); struct net_device *ndev = aq_nic_get_ndev(self->aq_nic);
bool is_rsc_completed = true;
int err = 0; int err = 0;
for (; (self->sw_head != self->hw_head) && budget; for (; (self->sw_head != self->hw_head) && budget;
@@ -365,6 +364,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
if (!buff->is_eop) { if (!buff->is_eop) {
buff_ = buff; buff_ = buff;
do { do {
bool is_rsc_completed = true;
if (buff_->next >= self->size) { if (buff_->next >= self->size) {
err = -EIO; err = -EIO;
goto err_exit; goto err_exit;
@@ -376,18 +377,16 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
next_, next_,
self->hw_head); self->hw_head);
if (unlikely(!is_rsc_completed)) if (unlikely(!is_rsc_completed)) {
break; err = 0;
goto err_exit;
}
buff->is_error |= buff_->is_error; buff->is_error |= buff_->is_error;
buff->is_cso_err |= buff_->is_cso_err; buff->is_cso_err |= buff_->is_cso_err;
} while (!buff_->is_eop); } while (!buff_->is_eop);
if (!is_rsc_completed) {
err = 0;
goto err_exit;
}
if (buff->is_error || if (buff->is_error ||
(buff->is_lro && buff->is_cso_err)) { (buff->is_lro && buff->is_cso_err)) {
buff_ = buff; buff_ = buff;