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

Commit 6e2feaa3 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: fix warning about shadowed ring parameter 



In commit 147e81ec ("i40e: Test memory before ethtool alloc succeeds")
code was added to handle ring allocation on systems with low memory.

It shadowed the ring parameter pointer by introducing a local ring
pointer inside the for loop. Most of the code in the loop already just
accessed the ring via &rx_rings[i]. Since most of the code already does
this, just remove the local variable.

If someone considers it worth keeping a local around, they should use it
for the whole section instead of just a couple of accesses.

This fixes a warning when -Wshadow is enabled

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 4d976823

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

+2 −4
Original line number Diff line number Diff line
@@ -1589,7 +1589,6 @@ static int i40e_set_ringparam(struct net_device *netdev, 
		}



		for (i = 0; i < vsi->num_queue_pairs; i++) {

			struct i40e_ring *ring;

			u16 unused;



			/* clone ring and setup updated count */
@@ -1613,9 +1612,8 @@ static int i40e_set_ringparam(struct net_device *netdev, 
			/* now allocate the Rx buffers to make sure the OS

			 * has enough memory, any failure here means abort

			 */

			ring = &rx_rings[i];

			unused = I40E_DESC_UNUSED(ring);

			err = i40e_alloc_rx_buffers(ring, unused);

			unused = I40E_DESC_UNUSED(&rx_rings[i]);

			err = i40e_alloc_rx_buffers(&rx_rings[i], unused);

rx_unwind:

			if (err) {

				do {