gistfile1.txt

--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -407,9 +407,12 @@
 {
 	struct octeon_ethernet *priv = netdev_priv(dev);
 	const u8 *mac = NULL;
+	const u8 *label = NULL;
 
-	if (priv->of_node)
+	if (priv->of_node) {
 		mac = of_get_mac_address(priv->of_node);
+		label = of_get_property(priv->of_node, "label", NULL);
+	}
 
 	if (!IS_ERR_OR_NULL(mac))
 		ether_addr_copy(dev->dev_addr, mac);
@@ -444,6 +447,9 @@
 	if (dev->netdev_ops->ndo_stop)
 		dev->netdev_ops->ndo_stop(dev);
 
+	if (!IS_ERR_OR_NULL(label))
+		dev_change_name(dev, label);
+
 	return 0;
 }