git: 952d47e5cc33 - stable/13 - mlx5en: Create TIRs before flowtables.

The branch stable/13 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=952d47e5cc3313d8f869d44a3671caa5e2bd94df

commit 952d47e5cc3313d8f869d44a3671caa5e2bd94df
Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
AuthorDate: 2022-02-08 15:08:54 +0000
Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
CommitDate: 2022-02-08 15:08:54 +0000

    mlx5en: Create TIRs before flowtables.
    
    Because flowtables may redirect traffic to TIRs.
    
    Sponsored by:   NVIDIA Networking
    
    (cherry picked from commit 5381f936473b06e3d62da5e0f22119789db8e621)
---
 sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index 5330dd384fa3..03a92a7a25cc 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -4621,16 +4621,16 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
 		goto err_open_drop_rq;
 	}
 
-	err = mlx5e_open_flow_tables(priv);
+	err = mlx5e_open_tirs(priv);
 	if (err) {
-		if_printf(ifp, "%s: mlx5e_open_flow_tables failed (%d)\n", __func__, err);
+		mlx5_en_err(ifp, "mlx5e_open_tirs() failed, %d\n", err);
 		goto err_open_rqt;
 	}
 
-	err = mlx5e_open_tirs(priv);
+	err = mlx5e_open_flow_tables(priv);
 	if (err) {
-		mlx5_en_err(ifp, "mlx5e_open_tirs() failed, %d\n", err);
-		goto err_open_flow_tables;
+		if_printf(ifp, "%s: mlx5e_open_flow_tables failed (%d)\n", __func__, err);
+		goto err_open_tirs;
 	}
 
 	/* set default MTU */
@@ -4768,8 +4768,8 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
 
 	return (priv);
 
-err_open_flow_tables:
-	mlx5e_close_flow_tables(priv);
+err_open_tirs:
+	mlx5e_close_tirs(priv);
 
 err_open_rqt:
 	mlx5_core_destroy_rqt(priv->mdev, priv->rqtn, 0);
@@ -4876,8 +4876,8 @@ mlx5e_destroy_ifp(struct mlx5_core_dev *mdev, void *vpriv)
 	ifmedia_removeall(&priv->media);
 	ether_ifdetach(ifp);
 
-	mlx5e_close_tirs(priv);
 	mlx5e_close_flow_tables(priv);
+	mlx5e_close_tirs(priv);
 	mlx5_core_destroy_rqt(priv->mdev, priv->rqtn, 0);
 	mlx5e_close_drop_rq(&priv->drop_rq);
 	mlx5e_tls_cleanup(priv);