]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
kirkwood: remove upstreamed patch 21954/head
authorRosen Penev <rosenp@gmail.com>
Mon, 9 Feb 2026 20:00:55 +0000 (12:00 -0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 10 Feb 2026 00:29:41 +0000 (01:29 +0100)
Upstream solution came with 6.4. Seems quilt refreshed it to the extent
that it basically gets applied twice.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21954
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch [deleted file]

diff --git a/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch b/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch
deleted file mode 100644 (file)
index ebfa19d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Tobias Schramm <tobias@t-sys.eu>
-Subject: mvpp2: support fetching mac address from nvmem
-
-The mvpp2 driver did not query nvmem for hardware mac addresses. This
-patch adds querying of mac addresses stored in nvmem cells as a further
-fallback option before assigning a random address.
-Purposely added separately to fwnode_get_mac_address() above to maintain
-existing behaviour with builtin adapter mac address still taking
-precedence.
-
-Signed-off-by: Tobias Schramm <tobias@t-sys.eu>
----
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-@@ -6179,6 +6179,12 @@ static int mvpp2_port_copy_mac_addr(stru
-               return 0;
-       }
-+      if (!of_get_mac_address(to_of_node(fwnode), hw_mac_addr)) {
-+              *mac_from = "nvmem cell";
-+              eth_hw_addr_set(dev, hw_mac_addr);
-+              return 0;
-+      }
-+
-       *mac_from = "random";
-       eth_hw_addr_random(dev);