From: Simon Horman <simon.hor...@netronome.com>
Date: Thu, 28 May 2020 16:18:46 +0200
> From: Louis Peens <louis.pe...@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.pe...@netronome.com>
> Signed-off-by: Simon Horman <simon.hor...@netronome.com>
Applied, thanks.
