Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f880d07b authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: cleanup IXGBE_DESC_UNUSED 



This patch just replaces the IXGBE_DESC_UNUSED macro with a like named
inline function ixgbevf_desc_unused. The inline function makes the logic
a bit more readable.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fb44519d

drivers/net/ethernet/intel/ixgbevf/ixgbevf.h

+7 −3
Original line number Diff line number Diff line
@@ -286,9 +286,13 @@ static inline bool ixgbevf_qv_disable(struct ixgbevf_q_vector *q_vector) 
	((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)

#define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG



#define IXGBE_DESC_UNUSED(R) \

	((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \

	(R)->next_to_clean - (R)->next_to_use - 1)

static inline u16 ixgbevf_desc_unused(struct ixgbevf_ring *ring)

{

	u16 ntc = ring->next_to_clean;

	u16 ntu = ring->next_to_use;



	return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;

}



#define IXGBEVF_RX_DESC(R, i)	    \

	(&(((union ixgbe_adv_rx_desc *)((R)->desc))[i]))

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+5 −5
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_q_vector *q_vector, 


#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)

	if (unlikely(count && netif_carrier_ok(tx_ring->netdev) &&

		     (IXGBE_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD))) {

		     (ixgbevf_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {

		/* Make sure that anybody stopping the queue after this

		 * sees the new next_to_clean.

		 */
@@ -529,7 +529,7 @@ next_desc: 
	}



	rx_ring->next_to_clean = i;

	cleaned_count = IXGBE_DESC_UNUSED(rx_ring);

	cleaned_count = ixgbevf_desc_unused(rx_ring);



	if (cleaned_count)

		ixgbevf_alloc_rx_buffers(adapter, rx_ring, cleaned_count);
@@ -1380,7 +1380,7 @@ static void ixgbevf_configure(struct ixgbevf_adapter *adapter) 
	for (i = 0; i < adapter->num_rx_queues; i++) {

		struct ixgbevf_ring *ring = &adapter->rx_ring[i];

		ixgbevf_alloc_rx_buffers(adapter, ring,

					 IXGBE_DESC_UNUSED(ring));

					 ixgbevf_desc_unused(ring));

	}

}
@@ -3102,7 +3102,7 @@ static int __ixgbevf_maybe_stop_tx(struct ixgbevf_ring *tx_ring, int size) 


	/* We need to check again in a case another CPU has just

	 * made room available. */

	if (likely(IXGBE_DESC_UNUSED(tx_ring) < size))

	if (likely(ixgbevf_desc_unused(tx_ring) < size))

		return -EBUSY;



	/* A reprieve! - use start_queue because it doesn't call schedule */
@@ -3113,7 +3113,7 @@ static int __ixgbevf_maybe_stop_tx(struct ixgbevf_ring *tx_ring, int size) 


static int ixgbevf_maybe_stop_tx(struct ixgbevf_ring *tx_ring, int size)

{

	if (likely(IXGBE_DESC_UNUSED(tx_ring) >= size))

	if (likely(ixgbevf_desc_unused(tx_ring) >= size))

		return 0;

	return __ixgbevf_maybe_stop_tx(tx_ring, size);

}