diff options
| author |   Nathan Fontenot <nfont@linux.vnet.ibm.com> | 2017-04-21 15:38:58 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-24 12:52:13 -0400 |
| commit | 5d5e84eb7276d30a21257515a83b34d1ef77f99b (patch) | |
| tree | 391a6afd42f0a2a2a9846bc8bb56e5912dcaac15 | |
| parent | ibmvnic: Only retrieve error info if present (diff) | |
| download | linux-dev-5d5e84eb7276d30a21257515a83b34d1ef77f99b.tar.xz linux-dev-5d5e84eb7276d30a21257515a83b34d1ef77f99b.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index cc34bf9be405..199cccbb577a 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -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)) { |