net/mlx5e: don't write directly to netdev->dev_addr

kuba-moo · Saeed Mahameed · commit 537e4d2e6fe3 · 2021-10-25T13:51:17.000-07:00
Use a local buffer and eth_hw_addr_set()

Signed-off-by: Jakub Kicinski &lt;kuba@kernel.org&gt;
Signed-off-by: Saeed Mahameed &lt;saeedm@nvidia.com&gt;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -4432,13 +4432,17 @@ void mlx5e_build_nic_params(struct mlx5e_priv priv, struct mlx5e_xsk xsk, u16`
`4432`	`4432`	`static void mlx5e_set_netdev_dev_addr(struct net_device *netdev)`
`4433`	`4433`	`{`
`4434`	`4434`	`struct mlx5e_priv *priv = netdev_priv(netdev);`
	`4435`	`+ u8 addr[ETH_ALEN];`
`4435`	`4436`
`4436`		`- mlx5_query_mac_address(priv->mdev, netdev->dev_addr);`
`4437`		`- if (is_zero_ether_addr(netdev->dev_addr) &&`
	`4437`	`+ mlx5_query_mac_address(priv->mdev, addr);`
	`4438`	`+ if (is_zero_ether_addr(addr) &&`
`4438`	`4439`	`!MLX5_CAP_GEN(priv->mdev, vport_group_manager)) {`
`4439`	`4440`	`eth_hw_addr_random(netdev);`
`4440`	`4441`	`mlx5_core_info(priv->mdev, "Assigned random MAC address %pM\n", netdev->dev_addr);`
	`4442`	`+ return;`
`4441`	`4443`	`}`
	`4444`	`+`
	`4445`	`+ eth_hw_addr_set(netdev, addr);`
`4442`	`4446`	`}`
`4443`	`4447`
`4444`	`4448`	`static int mlx5e_vxlan_set_port(struct net_device *netdev, unsigned int table,`