diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-08-05 23:40:21 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-08-05 23:53:07 +0100 |
| commit | a0b827b916ed51317eddf41cdca35ab73ec4cbdb (patch) | |
| tree | c73e0bacacfaf2ff520882b621b175d427a0ced5 /target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch | |
| parent | 986685f4f09936bad22e6406d217c927d584bc13 (diff) | |
| download | upstream-a0b827b916ed51317eddf41cdca35ab73ec4cbdb.tar.gz upstream-a0b827b916ed51317eddf41cdca35ab73ec4cbdb.tar.bz2 upstream-a0b827b916ed51317eddf41cdca35ab73ec4cbdb.zip | |
kirkwood: import patch to fix build and refresh patches
kirkwood build broke due to missing include needed for ETH_ALEN.
Add patch (sent upstream as well) to address that.
Refresh patches for 5.4 and 5.10.
Fixes: 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch index 377f16e7c9..509d721403 100644 --- a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch +++ b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch @@ -1,6 +1,6 @@ --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -132,6 +132,30 @@ static void *of_get_mac_address_mtd(stru +@@ -141,6 +141,30 @@ static int of_get_mac_address_mtd(struct return -EINVAL; } @@ -31,7 +31,7 @@ /** * Search the device tree for the best MAC address to use. 'mac-address' is -@@ -205,6 +232,7 @@ found: +@@ -216,6 +240,7 @@ found: if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) addr[inc_idx] += mac_inc; |