aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2022-07-14 08:51:48 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2022-07-14 06:45:24 +0200
commit2ed7f6cbb0989068ae94ebe260e1c1d675d05478 (patch)
tree67e5df23561bf9739c27e2b44f63a38719cad5d7 /target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
parenta9573a029a244a89adb1ec3a4340c3ac44c98387 (diff)
downloadupstream-2ed7f6cbb0989068ae94ebe260e1c1d675d05478.tar.gz
upstream-2ed7f6cbb0989068ae94ebe260e1c1d675d05478.tar.bz2
upstream-2ed7f6cbb0989068ae94ebe260e1c1d675d05478.zip
linux/generic/pending-5.15: add missing patch headers
This patches does not have a valid patch headers and does not apply on an external git tree with 'git am'. To fix this add the missing headers. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch')
-rw-r--r--target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch25
1 files changed, 23 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
index 88ade300a4..742d58b708 100644
--- a/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
+++ b/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
@@ -1,6 +1,25 @@
+From 8585756342caa6d27008d1ad0c18023e4211a40a Mon Sep 17 00:00:00 2001
+From: OpenWrt community <openwrt-devel@lists.openwrt.org>
+Date: Wed, 13 Jul 2022 12:22:48 +0200
+Subject: [PATCH] of/of_net: write back netdev MAC-address to device-tree
+
+The label-mac logic relies on the mac-address property of a netdev
+devices of-node. However, the mac address can also be stored as a
+different property or read from e.g. an mtd device.
+
+Create this node when reading a mac-address from OF if it does not
+already exist and copy the mac-address used for the device to this
+property. This way, the MAC address can be accessed using procfs.
+
+---
+ net/core/of_net.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/net/core/of_net.c b/net/core/of_net.c
+index 71c38b532f72..43b28c8ddff9 100644
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
-@@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct
+@@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct device_node *np, u8 *addr)
return 0;
}
@@ -28,7 +47,7 @@
/**
* of_get_mac_address()
* @np: Caller's Device Node
-@@ -175,6 +196,7 @@ found:
+@@ -175,6 +196,7 @@ int of_get_mac_address(struct device_node *np, u8 *addr)
addr[5] = (mac_val >> 0) & 0xff;
}
@@ -36,3 +55,5 @@
return ret;
}
EXPORT_SYMBOL(of_get_mac_address);
+--
+