generic: 6.12: refresh hack patches

Refreshed patches for generic/hack-6.12 by running
make target/linux/refresh

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/16547
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/generic/hack-6.12/205-kconfig-abort-configuration-on-unset-symbol.patch b/target/linux/generic/hack-6.12/205-kconfig-abort-configuration-on-unset-symbol.patch
index df18507041f7bed876ea09019667ca5fe3cf26e6..d7416d81a9e916038bf0f2577e0c2c970e5be4d5 100644 (file)
--- a/target/linux/generic/hack-6.12/205-kconfig-abort-configuration-on-unset-symbol.patch
+++ b/target/linux/generic/hack-6.12/205-kconfig-abort-configuration-on-unset-symbol.patch
@@ -19,7 +19,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
-@@ -338,6 +338,9 @@ static int conf_askvalue(struct symbol *
+@@ -312,6 +312,9 @@ static int conf_askvalue(struct symbol *
                }
                /* fall through */
        default:
@@ -29,7 +29,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
                fflush(stdout);
                xfgets(line, sizeof(line), stdin);
                break;
-@@ -520,6 +523,9 @@ static int conf_choice(struct menu *menu
+@@ -470,6 +473,9 @@ static void conf_choice(struct menu *men
                        }
                        /* fall through */
                case oldaskconfig:

diff --git a/target/linux/generic/hack-6.12/230-openwrt_lzma_options.patch b/target/linux/generic/hack-6.12/230-openwrt_lzma_options.patch
index ca70da7e31e62cba6400fac83ed8b0245403bf40..20f2b29bf19f5abe7a6f14e635281cc316b10ee9 100644 (file)
--- a/target/linux/generic/hack-6.12/230-openwrt_lzma_options.patch
+++ b/target/linux/generic/hack-6.12/230-openwrt_lzma_options.patch
@@ -23,7 +23,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
        { {0x02, 0x21}, "lz4", unlz4 },
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -460,10 +460,10 @@ quiet_cmd_bzip2_with_size = BZIP2   $@
+@@ -359,10 +359,10 @@ quiet_cmd_bzip2_with_size = BZIP2   $@
  # ---------------------------------------------------------------------------
  
  quiet_cmd_lzma = LZMA    $@

diff --git a/target/linux/generic/hack-6.12/251-kconfig.patch b/target/linux/generic/hack-6.12/251-kconfig.patch
index 845cfbfcc8e3ff6ba1c57d5e7ccb3b546ff2ff88..dd73e7945358ead630abe527875d4e8f0901c322 100644 (file)
--- a/target/linux/generic/hack-6.12/251-kconfig.patch
+++ b/target/linux/generic/hack-6.12/251-kconfig.patch
@@ -42,8 +42,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      tristate "SKCIPHER"
        select CRYPTO_SKCIPHER2
        select CRYPTO_ALGAPI
- 
-@@ -91,7 +91,7 @@ config CRYPTO_SKCIPHER2
+       select CRYPTO_ECB
+@@ -92,7 +92,7 @@ config CRYPTO_SKCIPHER2
        select CRYPTO_ALGAPI2
  
  config CRYPTO_HASH
@@ -52,7 +52,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        select CRYPTO_HASH2
        select CRYPTO_ALGAPI
  
-@@ -100,7 +100,7 @@ config CRYPTO_HASH2
+@@ -101,7 +101,7 @@ config CRYPTO_HASH2
        select CRYPTO_ALGAPI2
  
  config CRYPTO_RNG
@@ -92,7 +92,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        bool
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -460,16 +460,16 @@ config BCH_CONST_T
+@@ -457,16 +457,16 @@ config BCH_CONST_T
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
@@ -135,8 +135,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  config SND_SEQ_DEVICE
        tristate
-@@ -40,7 +40,7 @@ config SND_UMP_LEGACY_RAWMIDI
-         The device contains 16 substreams corresponding to UMP groups.
+@@ -57,7 +57,7 @@ config SND_CORE_TEST
+ 
  
  config SND_COMPRESS_OFFLOAD
 -      tristate
@@ -146,7 +146,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        bool
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -467,7 +467,7 @@ config NET_DEVLINK
+@@ -484,7 +484,7 @@ config NET_DEVLINK
        default n
  
  config PAGE_POOL

diff --git a/target/linux/generic/hack-6.12/253-ksmbd-config.patch b/target/linux/generic/hack-6.12/253-ksmbd-config.patch
index d54b48895ea36984f8bd8456b7225344f48a4503..a48f528116c1a6cfac13ba966f41c10c1085ba35 100644 (file)
--- a/target/linux/generic/hack-6.12/253-ksmbd-config.patch
+++ b/target/linux/generic/hack-6.12/253-ksmbd-config.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -2002,7 +2002,7 @@ config PADATA
+@@ -2059,7 +2059,7 @@ config PADATA
        bool
  
  config ASN1
@@ -21,7 +21,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
          that can be interpreted by the ASN.1 stream decoder and used to
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -641,7 +641,7 @@ config LIBFDT
+@@ -642,7 +642,7 @@ config LIBFDT
        bool
  
  config OID_REGISTRY

diff --git a/target/linux/generic/hack-6.12/259-regmap_dynamic.patch b/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
index 4f6dca7127b8e8ba6277b3a3ce44a617c2543491..e7614d6822fa751ac27cc257beee0618c5c166be 100644 (file)
--- a/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
@@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/property.h>
-@@ -3483,3 +3484,5 @@ static int __init regmap_initcall(void)
+@@ -3519,3 +3520,5 @@ static int __init regmap_initcall(void)
        return 0;
  }
  postcore_initcall(regmap_initcall);

diff --git a/target/linux/generic/hack-6.12/260-crypto_test_dependencies.patch b/target/linux/generic/hack-6.12/260-crypto_test_dependencies.patch
index 6221d0f8688dff1ccdbb1e343335129d5a350cda..ce900a87ea7fca2ade131bec6d84c3967c3c435f 100644 (file)
--- a/target/linux/generic/hack-6.12/260-crypto_test_dependencies.patch
+++ b/target/linux/generic/hack-6.12/260-crypto_test_dependencies.patch
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -148,15 +148,15 @@ config CRYPTO_MANAGER
+@@ -149,15 +149,15 @@ config CRYPTO_MANAGER
          cbc(aes).
  
  config CRYPTO_MANAGER2
@@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        tristate "Userspace cryptographic algorithm configuration"
 --- a/crypto/algboss.c
 +++ b/crypto/algboss.c
-@@ -204,6 +204,10 @@ static int cryptomgr_schedule_test(struc
+@@ -203,6 +203,10 @@ static int cryptomgr_schedule_test(struc
        memcpy(param->alg, alg->cra_name, sizeof(param->alg));
        param->type = alg->cra_flags;
  

diff --git a/target/linux/generic/hack-6.12/261-lib-arc4-unhide.patch b/target/linux/generic/hack-6.12/261-lib-arc4-unhide.patch
index af1d2862088ce9cd717c0a23a285b892b710fdb1..f1e1ad4c40377bb5b54aa73eecde6230c1c03c2d 100644 (file)
--- a/target/linux/generic/hack-6.12/261-lib-arc4-unhide.patch
+++ b/target/linux/generic/hack-6.12/261-lib-arc4-unhide.patch
@@ -13,7 +13,7 @@ from backports.
 
 --- a/lib/crypto/Kconfig
 +++ b/lib/crypto/Kconfig
-@@ -15,7 +15,7 @@ config CRYPTO_LIB_AESGCM
+@@ -20,7 +20,7 @@ config CRYPTO_LIB_AESGCM
        select CRYPTO_LIB_UTILS
  
  config CRYPTO_LIB_ARC4

diff --git a/target/linux/generic/hack-6.12/280-rfkill-stubs.patch b/target/linux/generic/hack-6.12/280-rfkill-stubs.patch
index 7a650d132eb3aec49136b735b30651b371d85f4b..ff6638f7a05b4c62090d365fab8c3d06c23ed35e 100644 (file)
--- a/target/linux/generic/hack-6.12/280-rfkill-stubs.patch
+++ b/target/linux/generic/hack-6.12/280-rfkill-stubs.patch
@@ -26,7 +26,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
   * @name: name of the struct -- the string is not copied internally
 --- a/net/Makefile
 +++ b/net/Makefile
-@@ -52,7 +52,7 @@ obj-$(CONFIG_TIPC)           += tipc/
+@@ -51,7 +51,7 @@ obj-$(CONFIG_TIPC)           += tipc/
  obj-$(CONFIG_NETLABEL)                += netlabel/
  obj-$(CONFIG_IUCV)            += iucv/
  obj-$(CONFIG_SMC)             += smc/

diff --git a/target/linux/generic/hack-6.12/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch b/target/linux/generic/hack-6.12/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch
index f21f200136f00b13b514f1b5ff079f079ee10530..6ee98ebfa25f578d9c0c678616147264fe18de43 100644 (file)
--- a/target/linux/generic/hack-6.12/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch
+++ b/target/linux/generic/hack-6.12/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/arch/mips/include/asm/r4kcache.h
 +++ b/arch/mips/include/asm/r4kcache.h
-@@ -286,14 +286,46 @@ static inline void prot##extra##blast_##
+@@ -290,14 +290,46 @@ static inline void prot##extra##blast_##
                                                    unsigned long end)  \
  {                                                                     \
        unsigned long lsize = cpu_##desc##_line_size();                 \

diff --git a/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index 24b7963cbf30e31a9dadbb31e722d412d0a2eaa8..5ccb6bc7d849a314eb811f1c731763b5a59a9e52 100644 (file)
--- a/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -25,7 +25,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/mtd_blkdevs.c
 +++ b/drivers/mtd/mtd_blkdevs.c
-@@ -386,19 +386,8 @@ int add_mtd_blktrans_dev(struct mtd_blkt
+@@ -379,19 +379,8 @@ int add_mtd_blktrans_dev(struct mtd_blkt
        if (new->readonly)
                set_disk_ro(gd, 1);
  
@@ -45,7 +45,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  out_free_tag_set:
        blk_mq_free_tag_set(new->tag_set);
  out_kfree_tag_set:
-@@ -408,6 +397,35 @@ out_list_del:
+@@ -401,6 +390,35 @@ out_list_del:
        return ret;
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        unsigned long flags;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -1127,6 +1128,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1132,6 +1133,8 @@ int mtd_device_parse_register(struct mtd
                register_reboot_notifier(&mtd->reboot_notifier);
        }
  

diff --git a/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch b/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
index c32d8ec184bfa12d5ffbd2d1dca40960af4baf60..52965418004baf3c8f911096b432a36cfdaa1187 100644 (file)
--- a/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
+++ b/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -801,7 +801,8 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -803,7 +803,8 @@ int add_mtd_device(struct mtd_info *mtd)
  
        mutex_unlock(&mtd_table_mutex);
  

diff --git a/target/linux/generic/hack-6.12/600-net-enable-fraglist-GRO-by-default.patch b/target/linux/generic/hack-6.12/600-net-enable-fraglist-GRO-by-default.patch
index 9633525bc4f259a52a485a1fc71cb524254484f1..feed2cd2e0fe751913f20de7b2cae5ad77d43049 100644 (file)
--- a/target/linux/generic/hack-6.12/600-net-enable-fraglist-GRO-by-default.patch
+++ b/target/linux/generic/hack-6.12/600-net-enable-fraglist-GRO-by-default.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/netdev_features.h
 +++ b/include/linux/netdev_features.h
-@@ -243,10 +243,10 @@ static inline int find_next_netdev_featu
+@@ -235,10 +235,10 @@ static inline int find_next_netdev_featu
  #define NETIF_F_UPPER_DISABLES        NETIF_F_LRO
  
  /* changeable features with no special hardware requirements */

diff --git a/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
index 58b37db2fb9ce16b31527e8d608c6e0e46da488b..53093daa36aa89e42a303b915e3d0e4dfb6349be 100644 (file)
--- a/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
+++ b/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -163,6 +163,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF
+@@ -168,6 +168,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
@@ -798,7 +798,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +#endif /* _XT_FLOWOFFLOAD_H */
 --- a/include/net/netfilter/nf_flow_table.h
 +++ b/include/net/netfilter/nf_flow_table.h
-@@ -293,6 +293,11 @@ void nf_flow_table_free(struct nf_flowta
+@@ -294,6 +294,11 @@ void nf_flow_table_free(struct nf_flowta
  
  void flow_offload_teardown(struct flow_offload *flow);
  

diff --git a/target/linux/generic/hack-6.12/651-wireless_mesh_header.patch b/target/linux/generic/hack-6.12/651-wireless_mesh_header.patch
index 3a2a9970bdc5a59e813cc44efa512f4a4e90b57d..d3f85ea1d115b62a6f8af76b1a85e56b64826b36 100644 (file)
--- a/target/linux/generic/hack-6.12/651-wireless_mesh_header.patch
+++ b/target/linux/generic/hack-6.12/651-wireless_mesh_header.patch
@@ -11,7 +11,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -157,8 +157,8 @@ static inline bool dev_xmit_complete(int
+@@ -159,8 +159,8 @@ static inline bool dev_xmit_complete(int
  
  #if defined(CONFIG_HYPERV_NET)
  # define LL_MAX_HEADER 128

diff --git a/target/linux/generic/hack-6.12/660-fq_codel_defaults.patch b/target/linux/generic/hack-6.12/660-fq_codel_defaults.patch
index 3e27351fa6d1d9c65bd9209489015f9ef1d5489e..4d7b01d24379977f659412d44b4583de01943f35 100644 (file)
--- a/target/linux/generic/hack-6.12/660-fq_codel_defaults.patch
+++ b/target/linux/generic/hack-6.12/660-fq_codel_defaults.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -465,7 +465,11 @@ static int fq_codel_init(struct Qdisc *s
+@@ -472,7 +472,11 @@ static int fq_codel_init(struct Qdisc *s
  
        sch->limit = 10*1024;
        q->flows_cnt = 1024;

diff --git a/target/linux/generic/hack-6.12/661-kernel-ct-size-the-hashtable-more-adequately.patch b/target/linux/generic/hack-6.12/661-kernel-ct-size-the-hashtable-more-adequately.patch
index ff959ec8d264728a2247da0990ea2851a3119345..f548cdb9b597fc97a778b6eeaf01be2914cd4e70 100644 (file)
--- a/target/linux/generic/hack-6.12/661-kernel-ct-size-the-hashtable-more-adequately.patch
+++ b/target/linux/generic/hack-6.12/661-kernel-ct-size-the-hashtable-more-adequately.patch
@@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
 
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2685,7 +2685,7 @@ int nf_conntrack_init_start(void)
+@@ -2634,7 +2634,7 @@ int nf_conntrack_init_start(void)
  
        if (!nf_conntrack_htable_size) {
                nf_conntrack_htable_size

diff --git a/target/linux/generic/hack-6.12/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-6.12/700-swconfig_switch_drivers.patch
index 4428ebbb5adda8dac14053fc914d711945b12915..4591a42f7827145cfc4664fe1f9dfb5a4e59795d 100644 (file)
--- a/target/linux/generic/hack-6.12/700-swconfig_switch_drivers.patch
+++ b/target/linux/generic/hack-6.12/700-swconfig_switch_drivers.patch
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -66,6 +66,80 @@ config SFP
+@@ -77,6 +77,80 @@ config SFP
        depends on HWMON || HWMON=n
        select MDIO_I2C
  
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config AIR_EN8811H_PHY
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -26,6 +26,21 @@ libphy-$(CONFIG_LED_TRIGGER_PHY)    += phy_
+@@ -27,6 +27,21 @@ libphy-$(CONFIG_OPEN_ALLIANCE_HELPERS) +
  obj-$(CONFIG_PHYLINK)         += phylink.o
  obj-$(CONFIG_PHYLIB)          += libphy.o
  

diff --git a/target/linux/generic/hack-6.12/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.12/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
index ab594a471e3c13150e53823e4b54799143667460..b8d8652d8f9f12f081585e4d015a3a31f9cf872a 100644 (file)
--- a/target/linux/generic/hack-6.12/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-6.12/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3435,6 +3435,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3582,6 +3582,9 @@ static int mv88e6xxx_setup_port(struct m
        else
                reg = 1 << port;
  

diff --git a/target/linux/generic/hack-6.12/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-6.12/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
index 522dbaf68f4cf8ee98a643f88d0b98838480c041..2d7edc9e75265d1ce4b7e8436dee29b67e9f70fe 100644 (file)
--- a/target/linux/generic/hack-6.12/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
+++ b/target/linux/generic/hack-6.12/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
@@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
 
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
-@@ -96,6 +96,29 @@
+@@ -97,6 +97,29 @@
  #define AQR107_OP_IN_PROG_SLEEP               1000
  #define AQR107_OP_IN_PROG_TIMEOUT     100000
  
@@ -45,7 +45,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  static int aqr107_get_sset_count(struct phy_device *phydev)
  {
        return AQR107_SGMII_STAT_SZ;
-@@ -202,6 +225,51 @@ static int aqr_config_aneg(struct phy_de
+@@ -203,6 +226,51 @@ static int aqr_config_aneg(struct phy_de
        return genphy_c45_check_and_restart_aneg(phydev, changed);
  }
  
@@ -97,7 +97,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  static int aqr_config_intr(struct phy_device *phydev)
  {
        bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
-@@ -854,7 +922,7 @@ static struct phy_driver aqr_driver[] =
+@@ -972,7 +1040,7 @@ static struct phy_driver aqr_driver[] =
        PHY_ID_MATCH_MODEL(PHY_ID_AQR112),
        .name           = "Aquantia AQR112",
        .probe          = aqr107_probe,
@@ -106,7 +106,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
        .config_intr    = aqr_config_intr,
        .handle_interrupt = aqr_handle_interrupt,
        .get_tunable    = aqr107_get_tunable,
-@@ -877,7 +945,7 @@ static struct phy_driver aqr_driver[] =
+@@ -995,7 +1063,7 @@ static struct phy_driver aqr_driver[] =
        PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
        .name           = "Aquantia AQR412",
        .probe          = aqr107_probe,

diff --git a/target/linux/generic/hack-6.12/723-net-phy-aquantia-fix-system-side-protocol-mi.patch b/target/linux/generic/hack-6.12/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
index b0cd8016018beb00360ac383d4fc343081319eab..eaeb3b6a92642ee6af36fa42aa7cd6b1fc04ca45 100644 (file)
--- a/target/linux/generic/hack-6.12/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
+++ b/target/linux/generic/hack-6.12/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
 
 --- a/drivers/net/phy/aquantia/aquantia_main.c
 +++ b/drivers/net/phy/aquantia/aquantia_main.c
-@@ -258,10 +258,16 @@ static int aqr_config_aneg_set_prot(stru
+@@ -259,10 +259,16 @@ static int aqr_config_aneg_set_prot(stru
        phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
                      aquantia_syscfg[if_type].start_rate);
  

diff --git a/target/linux/generic/hack-6.12/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch b/target/linux/generic/hack-6.12/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch
index dbc139fb064b53be690f97f04f78b5645dab6cde..a0678753fdf87ed82b2d59265949bb3b54973f43 100644 (file)
--- a/target/linux/generic/hack-6.12/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch
+++ b/target/linux/generic/hack-6.12/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch
@@ -37,7 +37,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
                .glo_cfg        = 0x4604,
                .rst_idx        = 0x4608,
                .delay_irq      = 0x460c,
-@@ -3895,6 +3898,56 @@ static void mtk_set_mcr_max_rx(struct mt
+@@ -3900,6 +3903,56 @@ static void mtk_set_mcr_max_rx(struct mt
                mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
  }
  
@@ -94,7 +94,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
  static void mtk_hw_reset(struct mtk_eth *eth)
  {
        u32 val;
-@@ -4354,6 +4407,8 @@ static void mtk_pending_work(struct work
+@@ -4363,6 +4416,8 @@ static void mtk_pending_work(struct work
        rtnl_lock();
        set_bit(MTK_RESETTING, &eth->state);
  

diff --git a/target/linux/generic/hack-6.12/735-net-phy-realtek-rtl8261n.patch b/target/linux/generic/hack-6.12/735-net-phy-realtek-rtl8261n.patch
index 946869c3037377a302c653c0bbeb1769f0c3aebe..e7372dc2cc88f88d5e642921523117235c7fc2d9 100644 (file)
--- a/target/linux/generic/hack-6.12/735-net-phy-realtek-rtl8261n.patch
+++ b/target/linux/generic/hack-6.12/735-net-phy-realtek-rtl8261n.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -406,6 +406,8 @@ config QSEMI_PHY
+@@ -434,6 +434,8 @@ config QSEMI_PHY
  
  source "drivers/net/phy/realtek/Kconfig"
  
@@ -11,7 +11,7 @@
        help
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY)      += nxp-tja
+@@ -111,6 +111,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY)      += nxp-tja
  obj-y                         += qcom/
  obj-$(CONFIG_QSEMI_PHY)               += qsemi.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek/

diff --git a/target/linux/generic/hack-6.12/766-net-phy-mediatek-ge-add-LED-configuration-interface.patch b/target/linux/generic/hack-6.12/766-net-phy-mediatek-ge-add-LED-configuration-interface.patch
index 3405d5c535b6c9fe5d1b696c441ef565bb90d991..95134083fa2a4f351948b326ba6f8aa92c8ee47a 100644 (file)
--- a/target/linux/generic/hack-6.12/766-net-phy-mediatek-ge-add-LED-configuration-interface.patch
+++ b/target/linux/generic/hack-6.12/766-net-phy-mediatek-ge-add-LED-configuration-interface.patch
@@ -23,7 +23,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  #include <linux/bitfield.h>
  #include <linux/module.h>
  #include <linux/phy.h>
-@@ -53,6 +54,36 @@ static int mt7530_phy_config_init(struct
+@@ -50,6 +51,36 @@ static int mt7530_phy_config_init(struct
        return 0;
  }
  
@@ -60,7 +60,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  static int mt7531_phy_config_init(struct phy_device *phydev)
  {
        mtk_gephy_config_init(phydev);
-@@ -65,6 +96,9 @@ static int mt7531_phy_config_init(struct
+@@ -62,6 +93,9 @@ static int mt7531_phy_config_init(struct
        phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x13, 0x404);
        phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x14, 0x404);
  

diff --git a/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch
index bbd73b1e601d0fcc7c24f906890db8c72df15d86..74be0eb72affc3876bdf3f19909d418020580cb8 100644 (file)
--- a/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1084,6 +1084,11 @@ static const struct usb_device_id produc
+@@ -1076,6 +1076,11 @@ static const struct usb_device_id produc
                USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
                .driver_info = (unsigned long)&qmi_wwan_info,
        },
@@ -22,7 +22,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)},   /* Quectel RG650V */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)},   /* Quectel EC25, EC20 R2.0  Mini PCIe */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)},   /* Quectel EP06/EG06/EM06 */
-@@ -1091,6 +1096,7 @@ static const struct usb_device_id produc
+@@ -1083,6 +1088,7 @@ static const struct usb_device_id produc
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},   /* Quectel EM160R-GL */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},   /* Quectel RM500Q-GL */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},   /* Quectel RM520N */

diff --git a/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
index 1d78a9dc4dedc3d3b666dc7bd063d2c19136575a..4763e82421e537f02132b6beef75b7e055c421fd 100644 (file)
--- a/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
+++ b/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] of/ftd: add device tree cmdline
 
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1186,6 +1186,9 @@ int __init early_init_dt_scan_chosen(cha
+@@ -1049,6 +1049,9 @@ int __init early_init_dt_scan_chosen(cha
        p = of_get_flat_dt_prop(node, "bootargs", &l);
        if (p != NULL && l > 0)
                strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));