Commit 79784d77 authored by Grant Grundler's avatar Grant Grundler Committed by David S. Miller
Browse files

net: atlantic: reduce scope of is_rsc_complete 



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: default avatarGrant Grundler <grundler@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62e0ae0f

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+6 −7
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
		     int budget)

{

	struct net_device *ndev = aq_nic_get_ndev(self->aq_nic);

	bool is_rsc_completed = true;

	int err = 0;



	for (; (self->sw_head != self->hw_head) && budget;
@@ -366,6 +365,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
		if (!buff->is_eop) {

			buff_ = buff;

			do {

				bool is_rsc_completed = true;



				if (buff_->next >= self->size) {

					err = -EIO;

					goto err_exit;
@@ -377,18 +378,16 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
							    next_,

							    self->hw_head);



				if (unlikely(!is_rsc_completed))

					break;

				if (unlikely(!is_rsc_completed)) {

					err = 0;

					goto err_exit;

				}



				buff->is_error |= buff_->is_error;

				buff->is_cso_err |= buff_->is_cso_err;



			} while (!buff_->is_eop);



			if (!is_rsc_completed) {

				err = 0;

				goto err_exit;

			}

			if (buff->is_error ||

			    (buff->is_lro && buff->is_cso_err)) {

				buff_ = buff;