diff options
| author | Nathan Fontenot | 2018-02-19 20:30:05 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-02-21 20:20:05 +0100 |
| commit | 8862541de781329b3e1e553bd936cecf998dc565 (patch) | |
| tree | 842655bafab11dbd1c20b8cdab1939bd22902b9c | |
| parent | rds: send: mark expected switch fall-through in rds_rm_size (diff) | |
| download | kernel-qcow2-linux-8862541de781329b3e1e553bd936cecf998dc565.tar.gz kernel-qcow2-linux-8862541de781329b3e1e553bd936cecf998dc565.tar.xz kernel-qcow2-linux-8862541de781329b3e1e553bd936cecf998dc565.zip | |
ibmvnic: Rename active queue count variables
Rename the tx/rx active pool variables to be tx/rx active scrq
counts. The tx/rx pools are per sub-crq so this is a more appropriate
name. This also is a preparatory step for using thiese variables
for handling updates to sub-crqs and napi based on the active
count.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 16 | ||||
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 64770a1c406d..f1166efd8eb7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -461,7 +461,7 @@ static void release_rx_pools(struct ibmvnic_adapter *adapter) if (!adapter->rx_pool) return; - for (i = 0; i < adapter->num_active_rx_pools; i++) { + for (i = 0; i < adapter->num_active_rx_scrqs; i++) { rx_pool = &adapter->rx_pool[i]; netdev_dbg(adapter->netdev, "Releasing rx_pool[%d]\n", i); @@ -484,7 +484,7 @@ static void release_rx_pools(struct ibmvnic_adapter *adapter) kfree(adapter->rx_pool); adapter->rx_pool = NULL; - adapter->num_active_rx_pools = 0; + adapter->num_active_rx_scrqs = 0; } static int init_rx_pools(struct net_device *netdev) @@ -509,7 +509,7 @@ static int init_rx_pools(struct net_device *netdev) return -1; } - adapter->num_active_rx_pools = 0; + adapter->num_active_rx_scrqs = 0; for (i = 0; i < rxadd_subcrqs; i++) { rx_pool = &adapter->rx_pool[i]; @@ -554,7 +554,7 @@ static int init_rx_pools(struct net_device *netdev) rx_pool->next_free = 0; } - adapter->num_active_rx_pools = rxadd_subcrqs; + adapter->num_active_rx_scrqs = rxadd_subcrqs; return 0; } @@ -613,7 +613,7 @@ static void release_tx_pools(struct ibmvnic_adapter *adapter) if (!adapter->tx_pool) return; - for (i = 0; i < adapter->num_active_tx_pools; i++) { + for (i = 0; i < adapter->num_active_tx_scrqs; i++) { netdev_dbg(adapter->netdev, "Releasing tx_pool[%d]\n", i); tx_pool = &adapter->tx_pool[i]; kfree(tx_pool->tx_buff); @@ -624,7 +624,7 @@ static void release_tx_pools(struct ibmvnic_adapter *adapter) kfree(adapter->tx_pool); adapter->tx_pool = NULL; - adapter->num_active_tx_pools = 0; + adapter->num_active_tx_scrqs = 0; } static int init_tx_pools(struct net_device *netdev) @@ -641,7 +641,7 @@ static int init_tx_pools(struct net_device *netdev) if (!adapter->tx_pool) return -1; - adapter->num_active_tx_pools = 0; + adapter->num_active_tx_scrqs = 0; for (i = 0; i < tx_subcrqs; i++) { tx_pool = &adapter->tx_pool[i]; @@ -690,7 +690,7 @@ static int init_tx_pools(struct net_device *netdev) tx_pool->producer_index = 0; } - adapter->num_active_tx_pools = tx_subcrqs; + adapter->num_active_tx_scrqs = tx_subcrqs; return 0; } diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index 2f51458ccdc3..68e712c69211 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -1092,8 +1092,8 @@ struct ibmvnic_adapter { u64 opt_rxba_entries_per_subcrq; __be64 tx_rx_desc_req; u8 map_id; - u64 num_active_rx_pools; - u64 num_active_tx_pools; + u64 num_active_rx_scrqs; + u64 num_active_tx_scrqs; struct tasklet_struct tasklet; enum vnic_state state; |