OSDN Git Service

net/mlx5e: don't write directly to netdev->dev_addr
authorJakub Kicinski <kuba@kernel.org>
Wed, 13 Oct 2021 20:20:01 +0000 (13:20 -0700)
committerSaeed Mahameed <saeedm@nvidia.com>
Mon, 25 Oct 2021 20:51:17 +0000 (13:51 -0700)
Use a local buffer and eth_hw_addr_set()

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/en_main.c

index 0ff36c8..f3dec58 100644 (file)
@@ -4432,13 +4432,17 @@ void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16
 static void mlx5e_set_netdev_dev_addr(struct net_device *netdev)
 {
        struct mlx5e_priv *priv = netdev_priv(netdev);
+       u8 addr[ETH_ALEN];
 
-       mlx5_query_mac_address(priv->mdev, netdev->dev_addr);
-       if (is_zero_ether_addr(netdev->dev_addr) &&
+       mlx5_query_mac_address(priv->mdev, addr);
+       if (is_zero_ether_addr(addr) &&
            !MLX5_CAP_GEN(priv->mdev, vport_group_manager)) {
                eth_hw_addr_random(netdev);
                mlx5_core_info(priv->mdev, "Assigned random MAC address %pM\n", netdev->dev_addr);
+               return;
        }
+
+       eth_hw_addr_set(netdev, addr);
 }
 
 static int mlx5e_vxlan_set_port(struct net_device *netdev, unsigned int table,