openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ibmvnic: Move initialization of the stats token to ibmvnic_open 

We should be initializing the stats token in the same place we
initialize the other resources for the driver.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nathan Fontenot 2017-04-21 15:38:58 -04:00 committed by David S. Miller
parent 2f9de9bac6
commit 5d5e84eb72
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -607,6 +607,10 @@ static int ibmvnic_open(struct net_device *netdev)
return -1;
}
rc = init_stats_token(adapter);
if (rc)
return rc;
adapter->map_id = 1;
adapter->napi = kcalloc(adapter->req_rx_queues,
sizeof(struct napi_struct), GFP_KERNEL);
@ -3241,12 +3245,6 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
return rc;
}
rc = init_stats_token(adapter);
if (rc) {
release_crq_queue(adapter);
return rc;
}
init_completion(&adapter->init_done);
ibmvnic_send_crq_init(adapter);
if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {