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

Commit e7046ee1 authored by Akeem G Abodunrin's avatar Akeem G Abodunrin Committed by Jeff Kirsher
Browse files

i40e: Tx/Rx rings declaration 



This patch changes the declaration of Tx/Rx rings inside several loops. It
eliminates declaring the same rings every time for the duration of the loop,
instead declaring them once before the loop.

Change-ID: I59dea54276f18c47dca522f520c18f65fe42a15d
Signed-off-by: default avatarAkeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 84590fd9

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

+2 −2
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, 
				   struct ethtool_stats *stats, u64 *data)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_ring *tx_ring, *rx_ring;

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	int i = 0;
@@ -650,8 +651,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, 
	}

	rcu_read_lock();

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

		struct i40e_ring *tx_ring = ACCESS_ONCE(vsi->tx_rings[j]);

		struct i40e_ring *rx_ring;

		tx_ring = ACCESS_ONCE(vsi->tx_rings[j]);



		if (!tx_ring)

			continue;

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

+5 −6
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct( 
					     struct rtnl_link_stats64 *stats)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_ring *tx_ring, *rx_ring;

	struct i40e_vsi *vsi = np->vsi;

	struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);

	int i;
@@ -368,7 +369,6 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct( 


	rcu_read_lock();

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

		struct i40e_ring *tx_ring, *rx_ring;

		u64 bytes, packets;

		unsigned int start;
@@ -2415,6 +2415,7 @@ static int i40e_vsi_configure_rx(struct i40e_vsi *vsi) 
 **/

static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi)

{

	struct i40e_ring *tx_ring, *rx_ring;

	u16 qoffset, qcount;

	int i, n;
@@ -2428,8 +2429,8 @@ static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi) 
		qoffset = vsi->tc_config.tc_info[n].qoffset;

		qcount = vsi->tc_config.tc_info[n].qcount;

		for (i = qoffset; i < (qoffset + qcount); i++) {

			struct i40e_ring *rx_ring = vsi->rx_rings[i];

			struct i40e_ring *tx_ring = vsi->tx_rings[i];

			rx_ring = vsi->rx_rings[i];

			tx_ring = vsi->tx_rings[i];

			rx_ring->dcb_tc = n;

			tx_ring->dcb_tc = n;

		}
@@ -5948,14 +5949,12 @@ static void i40e_vsi_clear_rings(struct i40e_vsi *vsi) 
 **/

static int i40e_alloc_rings(struct i40e_vsi *vsi)

{

	struct i40e_ring *tx_ring, *rx_ring;

	struct i40e_pf *pf = vsi->back;

	int i;



	/* Set basic values in the rings to be used later during open() */

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

		struct i40e_ring *tx_ring;

		struct i40e_ring *rx_ring;



		/* allocate space for both Tx and Rx in one shot */

		tx_ring = kzalloc(sizeof(struct i40e_ring) * 2, GFP_KERNEL);

		if (!tx_ring)