net/mlx5: Fix E-Switch flow steering capabilities check

Add missing capabilities check for E-Switch FDB and ACLs flow
tables before creating their namespace in flow steering.

Fixes: efdc810ba39d ('net/mlx5: Flow steering, Add vport ACL support')
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 13 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index c1efa5517d17..e912a3d2505e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1846,19 +1846,21 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)
         }
 
         if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
-                err = init_fdb_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
-                err = init_egress_acl_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
-                err = init_ingress_acl_root_ns(dev);
-                if (err)
-                        goto err;
+                if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {
+                        err = init_fdb_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
+                        err = init_egress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
+                        err = init_ingress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
         }
 
         return 0;