Commit a1e99685 authored Jun 26, 2019 by Brett Creeley Committed by Jeff Kirsher Jul 31, 2019

ice: Remove duplicate code in ice_alloc_rx_bufs

Currently if the call to ice_alloc_mapped_page() fails we jump to the
no_buf label, possibly call ice_release_rx_desc(), and return true
indicating that there is more work to do. In the success case we just
fall out of the while loop, possibly call ice_alloc_mapped_page(), and
return false saying we exhausted cleaned_count. This flow can be
improved by breaking if ice_alloc_mapped_page() fails and then the flow
outside of the while loop is the same for the failure and success case.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 56923ab6

drivers/net/ethernet/intel/ice/ice_txrx.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -478,8 +478,9 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)
		bi = &rx_ring->rx_buf[ntu];

		do {
		/* if we fail here, we have work remaining */
		if (!ice_alloc_mapped_page(rx_ring, bi))
		goto no_bufs;
		break;

		/* sync the buffer for use by the device */
		dma_sync_single_range_for_device(rx_ring->dev, bi->dma,
		@@ -510,16 +511,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)
		if (rx_ring->next_to_use != ntu)
		ice_release_rx_desc(rx_ring, ntu);

		return false;

		no_bufs:
		if (rx_ring->next_to_use != ntu)
		ice_release_rx_desc(rx_ring, ntu);

		/* make sure to come back via polling to try again after
		* allocation failure
		*/
		return true;
		return !!cleaned_count;
		}

		/**