net: hns3: Fixes the initialization of MAC address in hardware

321lipeng · davem330 · commit 139e8792537b · 2017-09-19T16:06:49.000-07:00
This patch fixes the initialization of MAC address, fetched from HNS3
firmware i.e. when it is not randomly generated, to the HNS3 hardware.

Fixes: ca60906d2795 ("net: hns3: Add support of HNS3 Ethernet Driver for
hip08 SoC")
Signed-off-by: Lipeng &lt;lipeng321@huawei.com&gt;
Signed-off-by: Salil Mehta &lt;salil.mehta@huawei.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
@@ -2705,10 +2705,11 @@ static void hns3_init_mac_addr(struct net_device *netdev)
 		eth_hw_addr_random(netdev);
 		dev_warn(priv->dev, "using random MAC address %pM\n",
 			 netdev->dev_addr);
-		/* Also copy this new MAC address into hdev */
-		if (h->ae_algo->ops->set_mac_addr)
-			h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr);
 	}
+
+	if (h->ae_algo->ops->set_mac_addr)
+		h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr);
+
 }
 
 static void hns3_nic_set_priv_ops(struct net_device *netdev)

Original file line number	Diff line number	Diff line change
`@@ -2705,10 +2705,11 @@ static void hns3_init_mac_addr(struct net_device *netdev)`
`2705`	`2705`	`eth_hw_addr_random(netdev);`
`2706`	`2706`	`dev_warn(priv->dev, "using random MAC address %pM\n",`
`2707`	`2707`	`netdev->dev_addr);`
`2708`		`- /* Also copy this new MAC address into hdev */`
`2709`		`- if (h->ae_algo->ops->set_mac_addr)`
`2710`		`- h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr);`
`2711`	`2708`	`}`
	`2709`	`+`
	`2710`	`+ if (h->ae_algo->ops->set_mac_addr)`
	`2711`	`+ h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr);`
	`2712`	`+`
`2712`	`2713`	`}`
`2713`	`2714`
`2714`	`2715`	`static void hns3_nic_set_priv_ops(struct net_device *netdev)`