2021-07-28 22:29:53 +00:00
|
|
|
--- a/drivers/of/of_net.c
|
|
|
|
+++ b/drivers/of/of_net.c
|
2021-08-05 22:40:21 +00:00
|
|
|
@@ -135,6 +135,30 @@ static int of_get_mac_address_mtd(struct
|
2021-07-23 18:19:43 +00:00
|
|
|
return -EINVAL;
|
2021-07-28 22:29:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+static int of_add_mac_address(struct device_node *np, u8* addr)
|
|
|
|
+{
|
|
|
|
+ struct property *prop;
|
|
|
|
+
|
2021-07-23 18:19:43 +00:00
|
|
|
+ prop = of_find_property(np, "mac-address", NULL);
|
|
|
|
+ if (prop)
|
|
|
|
+ kfree(prop);
|
2021-07-28 22:29:53 +00:00
|
|
|
+
|
|
|
|
+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
|
|
+ if (!prop)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ prop->name = "mac-address";
|
|
|
|
+ prop->length = ETH_ALEN;
|
|
|
|
+ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
|
|
|
|
+ if (!prop->value || of_add_property(np, prop))
|
|
|
|
+ goto free;
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+free:
|
|
|
|
+ kfree(prop->value);
|
|
|
|
+ kfree(prop);
|
|
|
|
+ return -ENOMEM;
|
|
|
|
+}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Search the device tree for the best MAC address to use. 'mac-address' is
|
2021-08-05 22:40:21 +00:00
|
|
|
@@ -210,6 +234,7 @@ found:
|
2021-07-28 22:29:53 +00:00
|
|
|
if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
|
|
|
|
addr[inc_idx] += mac_inc;
|
|
|
|
|
|
|
|
+ of_add_mac_address(np, addr);
|
2021-07-23 18:19:43 +00:00
|
|
|
return ret;
|
2021-07-28 22:29:53 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(of_get_mac_address);
|