diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-19 05:17:10 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:38 +0200 |
| commit | 5408e811b29643e3fd5f2cd227f17263daa45a74 (patch) | |
| tree | c41b5db75482b8a16c092183206a60c13b2e1173 /target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch | |
| parent | 2b2ac841e022054ff3390f25fa41336467530a91 (diff) | |
| download | upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.gz upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.bz2 upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.zip | |
kernel: bump 5.4 to 5.4.133
Manually rebased:
pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch')
| -rw-r--r-- | target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch b/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch index de561c5336..f0418dbb70 100644 --- a/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch +++ b/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch @@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc +@@ -55,6 +55,7 @@ static void *of_get_mac_addr_nvmem(struc void *mac; u8 nvmem_mac[ETH_ALEN]; struct platform_device *pdev = of_find_device_by_node(np); @@ -26,7 +26,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> if (!pdev) { *err = -ENODEV; -@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc +@@ -72,10 +73,29 @@ static void *of_get_mac_addr_nvmem(struc put_device(&pdev->dev); if (!mac) { *err = -ENOMEM; |