diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2021-10-25 11:37:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-26 14:56:19 +0100 |
| commit | a137c069fbc1972bdaf2dd6c75083cd2f3e6e3d7 (patch) | |
| tree | ba44ae89a68a7d5f0e8947f93957071fc6fb3c81 /drivers/net/ethernet/microsoft/mana/mana_en.c | |
| parent | eafaa88b3eb7f28aecb222281655473431d3ef2e (diff) | |
| download | linux-a137c069fbc1972bdaf2dd6c75083cd2f3e6e3d7.tar.bz2 | |
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: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microsoft/mana/mana_en.c')
| -rw-r--r-- | drivers/net/ethernet/microsoft/mana/mana_en.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index d65697c239c8..ef95f4017c6d 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -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; } |