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

Commit 2b634bb0 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e/i40evf: rename bytes_per_int to bytes_per_usec 



This value is not calculating bytes_per_int, which would actually just
be bytes/ITR_COUNTDOWN_START, but rather it's calculating bytes/usecs.

Rename the variable for clarity so that future developers understand
what the value is actually calculating.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fa8fefaa

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

+6 −6
Original line number Diff line number Diff line
@@ -960,14 +960,14 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc) 
{

	enum i40e_latency_range new_latency_range = rc->latency_range;

	u32 new_itr = rc->itr;

	int bytes_per_int;

	int bytes_per_usec;

	unsigned int usecs, estimated_usecs;



	if (rc->total_packets == 0 || !rc->itr)

		return false;



	usecs = (rc->itr << 1) * ITR_COUNTDOWN_START;

	bytes_per_int = rc->total_bytes / usecs;

	bytes_per_usec = rc->total_bytes / usecs;



	/* The calculations in this algorithm depend on interrupts actually

	 * firing at the ITR rate. This may not happen if the packet rate is
@@ -993,18 +993,18 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc) 
	 */

	switch (new_latency_range) {

	case I40E_LOWEST_LATENCY:

		if (bytes_per_int > 10)

		if (bytes_per_usec > 10)

			new_latency_range = I40E_LOW_LATENCY;

		break;

	case I40E_LOW_LATENCY:

		if (bytes_per_int > 20)

		if (bytes_per_usec > 20)

			new_latency_range = I40E_BULK_LATENCY;

		else if (bytes_per_int <= 10)

		else if (bytes_per_usec <= 10)

			new_latency_range = I40E_LOWEST_LATENCY;

		break;

	case I40E_BULK_LATENCY:

	default:

		if (bytes_per_int <= 20)

		if (bytes_per_usec <= 20)

			new_latency_range = I40E_LOW_LATENCY;

		break;

	}

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

+6 −6
Original line number Diff line number Diff line
@@ -358,14 +358,14 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc) 
{

	enum i40e_latency_range new_latency_range = rc->latency_range;

	u32 new_itr = rc->itr;

	int bytes_per_int;

	int bytes_per_usec;

	unsigned int usecs, estimated_usecs;



	if (rc->total_packets == 0 || !rc->itr)

		return false;



	usecs = (rc->itr << 1) * ITR_COUNTDOWN_START;

	bytes_per_int = rc->total_bytes / usecs;

	bytes_per_usec = rc->total_bytes / usecs;



	/* The calculations in this algorithm depend on interrupts actually

	 * firing at the ITR rate. This may not happen if the packet rate is
@@ -391,18 +391,18 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc) 
	 */

	switch (new_latency_range) {

	case I40E_LOWEST_LATENCY:

		if (bytes_per_int > 10)

		if (bytes_per_usec > 10)

			new_latency_range = I40E_LOW_LATENCY;

		break;

	case I40E_LOW_LATENCY:

		if (bytes_per_int > 20)

		if (bytes_per_usec > 20)

			new_latency_range = I40E_BULK_LATENCY;

		else if (bytes_per_int <= 10)

		else if (bytes_per_usec <= 10)

			new_latency_range = I40E_LOWEST_LATENCY;

		break;

	case I40E_BULK_LATENCY:

	default:

		if (bytes_per_int <= 20)

		if (bytes_per_usec <= 20)

			new_latency_range = I40E_LOW_LATENCY;

		break;

	}