diff options
| author | Rosen Penev | 2026-02-09 20:00:55 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-10 00:29:41 +0000 |
| commit | 1519b69f43b9424b6513379bac16fbeaa85b8a70 (patch) | |
| tree | 6393655db0f3bc618126f08dd9c35b2121a94086 | |
| parent | 361885b1331860f683eb4beeeae1bcac1e05dd40 (diff) | |
| download | openwrt-1519b69f43b9424b6513379bac16fbeaa85b8a70.tar.gz | |
kirkwood: remove upstreamed patch
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>
| -rw-r--r-- | target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch | 27 |
1 files changed, 0 insertions, 27 deletions
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 index ebfa19db08..0000000000 --- a/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch +++ /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); - |