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

Commit e26dc25b authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Update and clean up reset TX pool routine 



Update TX pool reset routine to accommodate new TSO pool array. Introduce
a function that resets one TX pool, and use that function to initialize
each pool in both pool arrays.

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4bd95a51

drivers/net/ethernet/ibm/ibmvnic.c

+25 −20
Original line number Diff line number Diff line
@@ -557,36 +557,41 @@ static int init_rx_pools(struct net_device *netdev) 
	return 0;

}



static int reset_tx_pools(struct ibmvnic_adapter *adapter)

static int reset_one_tx_pool(struct ibmvnic_adapter *adapter,

			     struct ibmvnic_tx_pool *tx_pool)

{

	struct ibmvnic_tx_pool *tx_pool;

	int tx_scrqs;

	int i, j, rc;



	tx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_txsubm_subcrqs);

	for (i = 0; i < tx_scrqs; i++) {

		netdev_dbg(adapter->netdev, "Re-setting tx_pool[%d]\n", i);



		tx_pool = &adapter->tx_pool[i];

	int rc, i;



	rc = reset_long_term_buff(adapter, &tx_pool->long_term_buff);

	if (rc)

		return rc;



		rc = reset_long_term_buff(adapter, &tx_pool->tso_ltb);

		if (rc)

			return rc;



	memset(tx_pool->tx_buff, 0,

		       adapter->req_tx_entries_per_subcrq *

	       tx_pool->num_buffers *

	       sizeof(struct ibmvnic_tx_buff));



		for (j = 0; j < adapter->req_tx_entries_per_subcrq; j++)

			tx_pool->free_map[j] = j;

	for (i = 0; i < tx_pool->num_buffers; i++)

		tx_pool->free_map[i] = i;



	tx_pool->consumer_index = 0;

	tx_pool->producer_index = 0;

		tx_pool->tso_index = 0;



	return 0;

}



static int reset_tx_pools(struct ibmvnic_adapter *adapter)

{

	int tx_scrqs;

	int i, rc;



	tx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_txsubm_subcrqs);

	for (i = 0; i < tx_scrqs; i++) {

		rc = reset_one_tx_pool(adapter, &adapter->tso_pool[i]);

		if (rc)

			return rc;

		rc = reset_one_tx_pool(adapter, &adapter->tx_pool[i]);

		if (rc)

			return rc;

	}



	return 0;