]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net/mlx5: Use common mlx5_same_hw_devs function
authorMark Bloch <mbloch@nvidia.com>
Thu, 23 Oct 2025 09:16:56 +0000 (12:16 +0300)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 28 Oct 2025 10:11:27 +0000 (11:11 +0100)
Refactor duplicate hardware device comparison code to use the common
mlx5_same_hw_devs() function instead of reimplementing system GUID
comparison logic in multiple places.

This cleanup eliminates code duplication in:
- Bridge representor device comparison.
- TC hardware device comparison.

Using the centralized function improves maintainability and ensures
consistent behavior across the driver.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Shay Drori <shayd@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1761211020-925651-2-git-send-email-tariqt@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index 9d1c677814e062f9f8d6caff274e3002c1cae6cf..87a2ad69526d720064a1c0dee6ad7b2ae0dac7ac 100644 (file)
@@ -30,15 +30,11 @@ static bool mlx5_esw_bridge_dev_same_hw(struct net_device *dev, struct mlx5_eswi
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
        struct mlx5_core_dev *mdev, *esw_mdev;
-       u64 system_guid, esw_system_guid;
 
        mdev = priv->mdev;
        esw_mdev = esw->dev;
 
-       system_guid = mlx5_query_nic_system_image_guid(mdev);
-       esw_system_guid = mlx5_query_nic_system_image_guid(esw_mdev);
-
-       return system_guid == esw_system_guid;
+       return mlx5_same_hw_devs(mdev, esw_mdev);
 }
 
 static struct net_device *
index 00c2763e57ca1794c84e2a7389232bcac191c756..54ccfb4e6c4e2f6c14c2c007e7f18738742f315c 100644 (file)
@@ -3614,15 +3614,11 @@ static bool same_port_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv
 bool mlx5e_same_hw_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv)
 {
        struct mlx5_core_dev *fmdev, *pmdev;
-       u64 fsystem_guid, psystem_guid;
 
        fmdev = priv->mdev;
        pmdev = peer_priv->mdev;
 
-       fsystem_guid = mlx5_query_nic_system_image_guid(fmdev);
-       psystem_guid = mlx5_query_nic_system_image_guid(pmdev);
-
-       return (fsystem_guid == psystem_guid);
+       return mlx5_same_hw_devs(fmdev, pmdev);
 }
 
 static int