diff mbox series

[net-next] nfp: flower: fix incorrect flag assignment

Message ID 20200528141846.16468-1-simon.horman@netronome.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] nfp: flower: fix incorrect flag assignment | expand

Commit Message

Simon Horman May 28, 2020, 2:18 p.m. UTC 
From: Louis Peens <louis.peens@netronome.com>

A previous refactoring missed some locations the flags were renamed
but not moved from the previous flower_ext_feats to the new flower_en_feats
variable. This lead to the FLOW_MERGE and LAG features not being enabled.

Fixes: e09303d3c4d9 ("nfp: flower: renaming of feature bits")
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/flower/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

 This fix is for net-next as the patch that introduces this problem
 hasn't propagated to Linus's tree yet.

Comments

Jakub Kicinski May 28, 2020, 7:24 p.m. UTC | #1 
On Thu, 28 May 2020 16:18:46 +0200 Simon Horman wrote:
> From: Louis Peens <louis.peens@netronome.com>
> 
> A previous refactoring missed some locations the flags were renamed
> but not moved from the previous flower_ext_feats to the new flower_en_feats
> variable. This lead to the FLOW_MERGE and LAG features not being enabled.
> 
> Fixes: e09303d3c4d9 ("nfp: flower: renaming of feature bits")
> Signed-off-by: Louis Peens <louis.peens@netronome.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>

Acked-by: Jakub Kicinski <kuba@kernel.org>
David Miller May 30, 2020, 12:09 a.m. UTC | #2 
From: Simon Horman <simon.horman@netronome.com>
Date: Thu, 28 May 2020 16:18:46 +0200

> From: Louis Peens <louis.peens@netronome.com>
> 
> A previous refactoring missed some locations the flags were renamed
> but not moved from the previous flower_ext_feats to the new flower_en_feats
> variable. This lead to the FLOW_MERGE and LAG features not being enabled.
> 
> Fixes: e09303d3c4d9 ("nfp: flower: renaming of feature bits")
> Signed-off-by: Louis Peens <louis.peens@netronome.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>

Applied, thanks.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index d054553c75e0..ca7032d22196 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -708,7 +708,7 @@  static int nfp_flower_sync_feature_bits(struct nfp_app *app)
 	err = nfp_rtsym_write_le(app->pf->rtbl,
 				 "_abi_flower_balance_sync_enable", 1);
 	if (!err) {
-		app_priv->flower_ext_feats |= NFP_FL_ENABLE_LAG;
+		app_priv->flower_en_feats |= NFP_FL_ENABLE_LAG;
 		nfp_flower_lag_init(&app_priv->nfp_lag);
 	} else if (err == -ENOENT) {
 		nfp_warn(app->cpp, "LAG not supported by FW.\n");
@@ -721,7 +721,7 @@  static int nfp_flower_sync_feature_bits(struct nfp_app *app)
 		err = nfp_rtsym_write_le(app->pf->rtbl,
 					 "_abi_flower_merge_hint_enable", 1);
 		if (!err) {
-			app_priv->flower_ext_feats |= NFP_FL_ENABLE_FLOW_MERGE;
+			app_priv->flower_en_feats |= NFP_FL_ENABLE_FLOW_MERGE;
 			nfp_flower_internal_port_init(app_priv);
 		} else if (err == -ENOENT) {
 			nfp_warn(app->cpp,
@@ -840,7 +840,7 @@  static int nfp_flower_init(struct nfp_app *app)
 	return 0;
 
 err_cleanup:
-	if (app_priv->flower_ext_feats & NFP_FL_ENABLE_LAG)
+	if (app_priv->flower_en_feats & NFP_FL_ENABLE_LAG)
 		nfp_flower_lag_cleanup(&app_priv->nfp_lag);
 	nfp_flower_metadata_cleanup(app);
 err_free_app_priv: