Commit d06e2f05 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Tony Nguyen
Browse files

i40e: adjust i40e_is_non_eop 



i40e_is_non_eop had a leftover comment and unused skb argument which was
used for placing the skb onto rx_buf in case when current buffer was
non-eop one. This is not relevant anymore as commit e72e5659
("i40e/i40evf: Moves skb from i40e_rx_buffer to i40e_ring") pulled the
non-complete skb handling out of rx_bufs up to rx_ring.  Therefore,
let's adjust the function arguments that i40e_is_non_eop takes.

Furthermore, since there is already a function responsible for bumping
the ntc, make use of that and drop that logic from i40e_is_non_eop so
that the scope of this function is limited to what the name actually
states.

Reviewed-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4a14994a

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+6 −17
Original line number Diff line number Diff line
@@ -2271,25 +2271,13 @@ static void i40e_put_rx_buffer(struct i40e_ring *rx_ring, 
 * i40e_is_non_eop - process handling of non-EOP buffers

 * @rx_ring: Rx ring being processed

 * @rx_desc: Rx descriptor for current buffer

 * @skb: Current socket buffer containing buffer in progress

 *

 * This function updates next to clean.  If the buffer is an EOP buffer

 * this function exits returning false, otherwise it will place the

 * sk_buff in the next buffer to be chained and return true indicating

 * that this is in fact a non-EOP buffer.

 **/

 * If the buffer is an EOP buffer, this function exits returning false,

 * otherwise return true indicating that this is in fact a non-EOP buffer.

 */

static bool i40e_is_non_eop(struct i40e_ring *rx_ring,

			    union i40e_rx_desc *rx_desc,

			    struct sk_buff *skb)

			    union i40e_rx_desc *rx_desc)

{

	u32 ntc = rx_ring->next_to_clean + 1;



	/* fetch, update, and store next to clean */

	ntc = (ntc < rx_ring->count) ? ntc : 0;

	rx_ring->next_to_clean = ntc;



	prefetch(I40E_RX_DESC(rx_ring, ntc));



	/* if we are the last buffer then there is nothing else to do */

#define I40E_RXD_EOF BIT(I40E_RX_DESC_STATUS_EOF_SHIFT)

	if (likely(i40e_test_staterr(rx_desc, I40E_RXD_EOF)))
@@ -2568,7 +2556,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
		i40e_put_rx_buffer(rx_ring, rx_buffer, rx_buffer_pgcnt);

		cleaned_count++;



		if (i40e_is_non_eop(rx_ring, rx_desc, skb))

		i40e_inc_ntc(rx_ring);

		if (i40e_is_non_eop(rx_ring, rx_desc))

			continue;



		if (i40e_cleanup_headers(rx_ring, skb, rx_desc)) {