diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-11-19 15:21:39 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-19 18:53:45 -0800 |
| commit | 68e9864221cae716680f64ac2832c4bfa50006f0 (patch) | |
| tree | 6957097b9e20fb78fe6e43f320d9a46c2746964d | |
| parent | nfp: abm: pass band parameter to functions (diff) | |
| download | linux-dev-68e9864221cae716680f64ac2832c4bfa50006f0.tar.xz linux-dev-68e9864221cae716680f64ac2832c4bfa50006f0.zip | |
nfp: abm: size threshold table to account for bands
Make sure the threshold table is large enough to hold information
for all bands.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/abm/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c index a5732d3bd1b7..b21250b95475 100644 --- a/drivers/net/ethernet/netronome/nfp/abm/main.c +++ b/drivers/net/ethernet/netronome/nfp/abm/main.c @@ -422,7 +422,7 @@ static int nfp_abm_init(struct nfp_app *app) goto err_free_abm; err = -ENOMEM; - abm->num_thresholds = NFP_NET_MAX_RX_RINGS; + abm->num_thresholds = array_size(abm->num_bands, NFP_NET_MAX_RX_RINGS); abm->threshold_undef = bitmap_zalloc(abm->num_thresholds, GFP_KERNEL); if (!abm->threshold_undef) goto err_free_abm; @@ -431,7 +431,7 @@ static int nfp_abm_init(struct nfp_app *app) sizeof(*abm->thresholds), GFP_KERNEL); if (!abm->thresholds) goto err_free_thresh_umap; - for (i = 0; i < NFP_NET_MAX_RX_RINGS; i++) + for (i = 0; i < abm->num_bands * NFP_NET_MAX_RX_RINGS; i++) __nfp_abm_ctrl_set_q_lvl(abm, i, NFP_ABM_LVL_INFINITY); /* We start in legacy mode, make sure advanced queuing is disabled */ |