[openwrt/openwrt] kernel: move mac-address-ascii patches to generic

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 22 16:58:56 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7b863af180dac48ea392a5ee582e37d0f378b3d3

commit 7b863af180dac48ea392a5ee582e37d0f378b3d3
Author: Chukun Pan <amadeus at jmu.edu.cn>
AuthorDate: Wed Jun 1 23:16:04 2022 +0800

    kernel: move mac-address-ascii patches to generic
    
    This enables other targets to use the mac-address-ascii
    feature.
    
    Signed-off-by: Chukun Pan <amadeus at jmu.edu.cn>
---
 .../hack-5.10/601-of_net-add-mac-address-ascii-support.patch}         | 4 ++--
 .../hack-5.15/601-of_net-add-mac-address-ascii-support.patch}         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch b/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch
similarity index 95%
rename from target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch
rename to target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch
index 7f95852c7e..f73e262bba 100644
--- a/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch
+++ b/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch
@@ -11,7 +11,7 @@ Submitted-by: Yousong Zhou <yszhou4tech at gmail.com>
 
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
-@@ -545,6 +545,63 @@ int eth_platform_get_mac_address(struct
+@@ -539,6 +539,63 @@ int eth_platform_get_mac_address(struct
  }
  EXPORT_SYMBOL(eth_platform_get_mac_address);
  
@@ -75,7 +75,7 @@ Submitted-by: Yousong Zhou <yszhou4tech at gmail.com>
  /**
   * Obtain the MAC address from an nvmem cell named 'mac-address' associated
   * with given device.
-@@ -558,19 +615,23 @@ int nvmem_get_mac_address(struct device
+@@ -552,19 +609,23 @@ int nvmem_get_mac_address(struct device
  {
  	struct nvmem_cell *cell;
  	const void *mac;
diff --git a/target/linux/ath79/patches-5.15/600-of_net-add-mac-address-ascii-support.patch b/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch
similarity index 95%
rename from target/linux/ath79/patches-5.15/600-of_net-add-mac-address-ascii-support.patch
rename to target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch
index ff22945eb4..83483751f8 100644
--- a/target/linux/ath79/patches-5.15/600-of_net-add-mac-address-ascii-support.patch
+++ b/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch
@@ -11,7 +11,7 @@ Submitted-by: Yousong Zhou <yszhou4tech at gmail.com>
 
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
-@@ -544,6 +544,63 @@ int eth_platform_get_mac_address(struct
+@@ -538,6 +538,63 @@ int eth_platform_get_mac_address(struct
  }
  EXPORT_SYMBOL(eth_platform_get_mac_address);
  
@@ -75,7 +75,7 @@ Submitted-by: Yousong Zhou <yszhou4tech at gmail.com>
  /**
   * nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named
   * 'mac-address' associated with given device.
-@@ -557,19 +614,23 @@ int nvmem_get_mac_address(struct device
+@@ -551,19 +608,23 @@ int nvmem_get_mac_address(struct device
  {
  	struct nvmem_cell *cell;
  	const void *mac;




More information about the lede-commits mailing list