diff options
author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-08-22 14:58:53 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-10-09 21:14:54 +0200 |
commit | 5ae2e786395c7f9db0167ebe875be5df9502d8d8 (patch) | |
tree | 21d888f47b626306af0842c9e325fa4208d3cdc9 /target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch | |
parent | 46646efc38b496d95c87d1951aff21d2cff838d5 (diff) | |
download | upstream-5ae2e786395c7f9db0167ebe875be5df9502d8d8.tar.gz upstream-5ae2e786395c7f9db0167ebe875be5df9502d8d8.tar.bz2 upstream-5ae2e786395c7f9db0167ebe875be5df9502d8d8.zip |
kernel: drop support for mtd-mac-address
Now that we have fully switched to nvmem interface we can drop
the use of mtd-mac-address patches as it's not used anymore and
the new nvmem implementation should be used for any new device.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch')
-rw-r--r-- | target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch index e48e6311c6..cd5cad38f7 100644 --- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch +++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch @@ -20,9 +20,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -166,31 +166,56 @@ static int of_get_mac_address_mtd(struct - * If a mtd-mac-address property exists, try to fetch the MAC address from the - * specified mtd device. +@@ -115,27 +115,52 @@ static int of_get_mac_addr_nvmem(struct + * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists + * but is all zeros. * + * DT can tell the system to increment the mac-address after is extracted by + * using: @@ -64,11 +64,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> if (!ret) - return 0; + goto found; - - ret = of_get_mac_address_mtd(np, addr); - if (!ret) -- return 0; -+ goto found; + + ret = of_get_mac_addr_nvmem(np, addr); + if (ret) |