Commit a137c069 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by David S. Miller

net: mana: Allow setting the number of queues while the NIC is down

The existing code doesn't allow setting the number of queues while the
NIC is down.

Update the ethtool handler functions to support setting the number of
queues while the NIC is at down state.
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eafaa88b
...@@ -1667,24 +1667,23 @@ int mana_attach(struct net_device *ndev) ...@@ -1667,24 +1667,23 @@ int mana_attach(struct net_device *ndev)
if (err) if (err)
return err; return err;
if (apc->port_st_save) {
err = mana_alloc_queues(ndev); err = mana_alloc_queues(ndev);
if (err) { if (err) {
kfree(apc->rxqs); mana_cleanup_port_context(apc);
apc->rxqs = NULL;
return err; return err;
} }
}
netif_device_attach(ndev);
apc->port_is_up = apc->port_st_save; apc->port_is_up = apc->port_st_save;
/* Ensure port state updated before txq state */ /* Ensure port state updated before txq state */
smp_wmb(); smp_wmb();
if (apc->port_is_up) { if (apc->port_is_up)
netif_carrier_on(ndev); netif_carrier_on(ndev);
netif_tx_wake_all_queues(ndev);
} netif_device_attach(ndev);
return 0; return 0;
} }
......
...@@ -211,9 +211,6 @@ static int mana_set_channels(struct net_device *ndev, ...@@ -211,9 +211,6 @@ static int mana_set_channels(struct net_device *ndev,
unsigned int old_count = apc->num_queues; unsigned int old_count = apc->num_queues;
int err, err2; int err, err2;
if (!apc->port_is_up)
return -EOPNOTSUPP;
err = mana_detach(ndev, false); err = mana_detach(ndev, false);
if (err) { if (err) {
netdev_err(ndev, "mana_detach failed: %d\n", err); netdev_err(ndev, "mana_detach failed: %d\n", err);
......
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