Commit a57a5d25 authored by John Allen's avatar John Allen Committed by David S. Miller

ibmvnic: Move login to its own routine

Move the code that handles login and renegotiation of ibmvnic
capabilities to its own routine.
Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd0b6723
...@@ -371,18 +371,11 @@ static void free_rx_pool(struct ibmvnic_adapter *adapter, ...@@ -371,18 +371,11 @@ static void free_rx_pool(struct ibmvnic_adapter *adapter,
pool->rx_buff = NULL; pool->rx_buff = NULL;
} }
static int ibmvnic_open(struct net_device *netdev) static int ibmvnic_login(struct net_device *netdev)
{ {
struct ibmvnic_adapter *adapter = netdev_priv(netdev); struct ibmvnic_adapter *adapter = netdev_priv(netdev);
unsigned long timeout = msecs_to_jiffies(30000); unsigned long timeout = msecs_to_jiffies(30000);
struct device *dev = &adapter->vdev->dev; struct device *dev = &adapter->vdev->dev;
struct ibmvnic_tx_pool *tx_pool;
union ibmvnic_crq crq;
int rxadd_subcrqs;
u64 *size_array;
int tx_subcrqs;
int rc = 0;
int i, j;
do { do {
if (adapter->renegotiate) { if (adapter->renegotiate) {
...@@ -407,6 +400,25 @@ static int ibmvnic_open(struct net_device *netdev) ...@@ -407,6 +400,25 @@ static int ibmvnic_open(struct net_device *netdev)
} }
} while (adapter->renegotiate); } while (adapter->renegotiate);
return 0;
}
static int ibmvnic_open(struct net_device *netdev)
{
struct ibmvnic_adapter *adapter = netdev_priv(netdev);
struct device *dev = &adapter->vdev->dev;
struct ibmvnic_tx_pool *tx_pool;
union ibmvnic_crq crq;
int rxadd_subcrqs;
u64 *size_array;
int tx_subcrqs;
int rc = 0;
int i, j;
rc = ibmvnic_login(netdev);
if (rc)
return rc;
rc = netif_set_real_num_tx_queues(netdev, adapter->req_tx_queues); rc = netif_set_real_num_tx_queues(netdev, adapter->req_tx_queues);
if (rc) { if (rc) {
dev_err(dev, "failed to set the number of tx queues\n"); dev_err(dev, "failed to set the number of tx queues\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment