diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-04 12:05:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-04 12:05:13 +0300 |
| commit | 8730379ee067ccbd2ea24eb02ea623d688e9707b (patch) | |
| tree | ca67c02d5b39d10117e6f2caae0330b2ded15cb6 /drivers | |
| parent | 8679c31e0284aa3aaba038035e443180b5bacb99 (diff) | |
| parent | e874f4557b365fc07f960c0e5a224f9ecaedd838 (diff) | |
| download | linux-8730379ee067ccbd2ea24eb02ea623d688e9707b.tar.xz | |
Merge branch 'queues'
Jakub Kicinski says:
====================
net: add netif_set_real_num_queues() for device reconfig
This short set adds a helper to make the implementation of
two-phase NIC reconfig easier.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 15078f9dc9f1..5bfa22accf2c 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3281,17 +3281,12 @@ static int nfp_net_dp_swap_enable(struct nfp_net *nn, struct nfp_net_dp *dp) for (r = 0; r < nn->max_r_vecs; r++) nfp_net_vector_assign_rings(&nn->dp, &nn->r_vecs[r], r); - err = netif_set_real_num_rx_queues(nn->dp.netdev, nn->dp.num_rx_rings); + err = netif_set_real_num_queues(nn->dp.netdev, + nn->dp.num_stack_tx_rings, + nn->dp.num_rx_rings); if (err) return err; - if (nn->dp.netdev->real_num_tx_queues != nn->dp.num_stack_tx_rings) { - err = netif_set_real_num_tx_queues(nn->dp.netdev, - nn->dp.num_stack_tx_rings); - if (err) - return err; - } - return nfp_net_set_config_and_enable(nn); } |