提交 a137c069 编写于 作者: H Haiyang Zhang 提交者: 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: NHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 eafaa88b
......@@ -1667,24 +1667,23 @@ int mana_attach(struct net_device *ndev)
if (err)
return err;
err = mana_alloc_queues(ndev);
if (err) {
kfree(apc->rxqs);
apc->rxqs = NULL;
return err;
if (apc->port_st_save) {
err = mana_alloc_queues(ndev);
if (err) {
mana_cleanup_port_context(apc);
return err;
}
}
netif_device_attach(ndev);
apc->port_is_up = apc->port_st_save;
/* Ensure port state updated before txq state */
smp_wmb();
if (apc->port_is_up) {
if (apc->port_is_up)
netif_carrier_on(ndev);
netif_tx_wake_all_queues(ndev);
}
netif_device_attach(ndev);
return 0;
}
......
......@@ -211,9 +211,6 @@ static int mana_set_channels(struct net_device *ndev,
unsigned int old_count = apc->num_queues;
int err, err2;
if (!apc->port_is_up)
return -EOPNOTSUPP;
err = mana_detach(ndev, false);
if (err) {
netdev_err(ndev, "mana_detach failed: %d\n", err);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册