Commit 8243c7ed authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by David S. Miller
Browse files

ibmvnic: Use/rename local vars in init_tx_pools 



Use/rename local variables in init_tx_pools() for consistency with
init_rx_pools() and for readability. Also add some comments

Reviewed-by: default avatarRick Lindsley <ricklind@linux.vnet.ibm.com>
Reviewed-by: default avatarDany Madden <drt@linux.ibm.com>
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0df7b9ad

drivers/net/ethernet/ibm/ibmvnic.c

+16 −14
Original line number Diff line number Diff line
@@ -781,31 +781,31 @@ static void release_tx_pools(struct ibmvnic_adapter *adapter) 


static int init_one_tx_pool(struct net_device *netdev,

			    struct ibmvnic_tx_pool *tx_pool,

			    int num_entries, int buf_size)

			    int pool_size, int buf_size)

{

	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

	int i;



	tx_pool->tx_buff = kcalloc(num_entries,

	tx_pool->tx_buff = kcalloc(pool_size,

				   sizeof(struct ibmvnic_tx_buff),

				   GFP_KERNEL);

	if (!tx_pool->tx_buff)

		return -1;



	if (alloc_long_term_buff(adapter, &tx_pool->long_term_buff,

				 num_entries * buf_size))

				 pool_size * buf_size))

		return -1;



	tx_pool->free_map = kcalloc(num_entries, sizeof(int), GFP_KERNEL);

	tx_pool->free_map = kcalloc(pool_size, sizeof(int), GFP_KERNEL);

	if (!tx_pool->free_map)

		return -1;



	for (i = 0; i < num_entries; i++)

	for (i = 0; i < pool_size; i++)

		tx_pool->free_map[i] = i;



	tx_pool->consumer_index = 0;

	tx_pool->producer_index = 0;

	tx_pool->num_buffers = num_entries;

	tx_pool->num_buffers = pool_size;

	tx_pool->buf_size = buf_size;



	return 0;
@@ -815,17 +815,20 @@ static int init_tx_pools(struct net_device *netdev) 
{

	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

	struct device *dev = &adapter->vdev->dev;

	int tx_subcrqs;

	int num_pools;

	u64 pool_size;		/* # of buffers in pool */

	u64 buff_size;

	int i, rc;



	tx_subcrqs = adapter->num_active_tx_scrqs;

	adapter->tx_pool = kcalloc(tx_subcrqs,

	pool_size = adapter->req_tx_entries_per_subcrq;

	num_pools = adapter->num_active_tx_scrqs;



	adapter->tx_pool = kcalloc(num_pools,

				   sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);

	if (!adapter->tx_pool)

		return -1;



	adapter->tso_pool = kcalloc(tx_subcrqs,

	adapter->tso_pool = kcalloc(num_pools,

				    sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);

	/* To simplify release_tx_pools() ensure that ->tx_pool and

	 * ->tso_pool are either both NULL or both non-NULL.
@@ -839,9 +842,9 @@ static int init_tx_pools(struct net_device *netdev) 
	/* Set num_active_tx_pools early. If we fail below after partial

	 * allocation, release_tx_pools() will know how many to look for.

	 */

	adapter->num_active_tx_pools = tx_subcrqs;

	adapter->num_active_tx_pools = num_pools;



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

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

		buff_size = adapter->req_mtu + VLAN_HLEN;

		buff_size = ALIGN(buff_size, L1_CACHE_BYTES);
@@ -849,8 +852,7 @@ static int init_tx_pools(struct net_device *netdev) 
			i, adapter->req_tx_entries_per_subcrq, buff_size);



		rc = init_one_tx_pool(netdev, &adapter->tx_pool[i],

				      adapter->req_tx_entries_per_subcrq,

				      buff_size);

				      pool_size, buff_size);

		if (rc) {

			release_tx_pools(adapter);

			return rc;