Skip to content

Commit

Permalink
nfp: use netif_set_real_num_queues()
Browse files Browse the repository at this point in the history
Avoid reconfig problems due to failures in netif_set_real_num_tx_queues()
by using netif_set_real_num_queues().

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jakub Kicinski authored and David S. Miller committed Aug 4, 2021
1 parent 271e5b7 commit e874f45
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit e874f45

Please sign in to comment.