kernel: drop "mac-address-increment-byte" DT property support
[openwrt/staging/stintel.git] / target / linux / generic / pending-6.1 / 683-of_net-add-mac-address-to-of-tree.patch
1 From 8585756342caa6d27008d1ad0c18023e4211a40a Mon Sep 17 00:00:00 2001
2 From: OpenWrt community <openwrt-devel@lists.openwrt.org>
3 Date: Wed, 13 Jul 2022 12:22:48 +0200
4 Subject: [PATCH] of/of_net: write back netdev MAC-address to device-tree
5
6 The label-mac logic relies on the mac-address property of a netdev
7 devices of-node. However, the mac address can also be stored as a
8 different property or read from e.g. an mtd device.
9
10 Create this node when reading a mac-address from OF if it does not
11 already exist and copy the mac-address used for the device to this
12 property. This way, the MAC address can be accessed using procfs.
13
14 ---
15 net/core/of_net.c | 22 ++++++++++++++++++++++
16 1 file changed, 22 insertions(+)
17
18 --- a/net/core/of_net.c
19 +++ b/net/core/of_net.c
20 @@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct
21 return 0;
22 }
23
24 +static int of_add_mac_address(struct device_node *np, u8* addr)
25 +{
26 + struct property *prop;
27 +
28 + prop = kzalloc(sizeof(*prop), GFP_KERNEL);
29 + if (!prop)
30 + return -ENOMEM;
31 +
32 + prop->name = "mac-address";
33 + prop->length = ETH_ALEN;
34 + prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
35 + if (!prop->value || of_update_property(np, prop))
36 + goto free;
37 +
38 + return 0;
39 +free:
40 + kfree(prop->value);
41 + kfree(prop);
42 + return -ENOMEM;
43 +}
44 +
45 /**
46 * of_get_mac_address()
47 * @np: Caller's Device Node
48 @@ -165,6 +186,7 @@ found:
49 addr[5] = (mac_val >> 0) & 0xff;
50 }
51
52 + of_add_mac_address(np, addr);
53 return ret;
54 }
55 EXPORT_SYMBOL(of_get_mac_address);