diff --git a/target/linux/generic/hack-6.18/211-darwin-uuid-typedef-clash.patch b/target/linux/generic/hack-6.18/211-darwin-uuid-typedef-clash.patch index c0e0b24e3c..1f0ee4b53e 100644 --- a/target/linux/generic/hack-6.18/211-darwin-uuid-typedef-clash.patch +++ b/target/linux/generic/hack-6.18/211-darwin-uuid-typedef-clash.patch @@ -10,7 +10,7 @@ Signed-off-by: Kevin Darbyshire-Bryant --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c -@@ -35,6 +35,9 @@ typedef uint32_t __u32; +@@ -102,6 +102,9 @@ typedef uint32_t __u32; typedef uint16_t __u16; typedef unsigned char __u8; diff --git a/target/linux/generic/hack-6.18/250-netfilter_depends.patch b/target/linux/generic/hack-6.18/250-netfilter_depends.patch index 43faa9959e..5e34606080 100644 --- a/target/linux/generic/hack-6.18/250-netfilter_depends.patch +++ b/target/linux/generic/hack-6.18/250-netfilter_depends.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -259,7 +259,6 @@ config NF_CONNTRACK_FTP +@@ -249,7 +249,6 @@ config NF_CONNTRACK_FTP config NF_CONNTRACK_H323 tristate "H.323 protocol support" @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most -@@ -1120,7 +1119,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -1126,7 +1125,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/hack-6.18/253-ksmbd-config.patch b/target/linux/generic/hack-6.18/253-ksmbd-config.patch index d9587fbe84..724a461e20 100644 --- a/target/linux/generic/hack-6.18/253-ksmbd-config.patch +++ b/target/linux/generic/hack-6.18/253-ksmbd-config.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string --- a/init/Kconfig +++ b/init/Kconfig -@@ -2063,7 +2063,7 @@ config PADATA +@@ -2191,7 +2191,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 -@@ -642,7 +642,7 @@ config LIBFDT +@@ -504,7 +504,7 @@ config LIBFDT bool config OID_REGISTRY diff --git a/target/linux/generic/hack-6.18/260-crypto_test_dependencies.patch b/target/linux/generic/hack-6.18/260-crypto_test_dependencies.patch index ce900a87ea..a8cbd6c6a7 100644 --- a/target/linux/generic/hack-6.18/260-crypto_test_dependencies.patch +++ b/target/linux/generic/hack-6.18/260-crypto_test_dependencies.patch @@ -14,8 +14,8 @@ Signed-off-by: Felix Fietkau --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -149,15 +149,15 @@ config CRYPTO_MANAGER - cbc(aes). +@@ -156,15 +156,15 @@ config CRYPTO_MANAGER + cbc(aes), and the support for the crypto self-tests. config CRYPTO_MANAGER2 - def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) diff --git a/target/linux/generic/hack-6.18/261-lib-arc4-unhide.patch b/target/linux/generic/hack-6.18/261-lib-arc4-unhide.patch index f1e1ad4c40..c08db18f67 100644 --- a/target/linux/generic/hack-6.18/261-lib-arc4-unhide.patch +++ b/target/linux/generic/hack-6.18/261-lib-arc4-unhide.patch @@ -13,7 +13,7 @@ from backports. --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig -@@ -20,7 +20,7 @@ config CRYPTO_LIB_AESGCM +@@ -23,7 +23,7 @@ config CRYPTO_LIB_AESGCM select CRYPTO_LIB_UTILS config CRYPTO_LIB_ARC4 diff --git a/target/linux/generic/hack-6.18/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-6.18/402-mtd-blktrans-call-add-disks-after-mtd-device.patch index d5a68d681b..ecdfecee31 100644 --- a/target/linux/generic/hack-6.18/402-mtd-blktrans-call-add-disks-after-mtd-device.patch +++ b/target/linux/generic/hack-6.18/402-mtd-blktrans-call-add-disks-after-mtd-device.patch @@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle #include "mtdcore.h" -@@ -1109,6 +1110,8 @@ int mtd_device_parse_register(struct mtd +@@ -1162,6 +1163,8 @@ int mtd_device_parse_register(struct mtd register_reboot_notifier(&mtd->reboot_notifier); } diff --git a/target/linux/generic/hack-6.18/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch b/target/linux/generic/hack-6.18/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch index 1b17c2fe88..83919af28f 100644 --- a/target/linux/generic/hack-6.18/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch +++ b/target/linux/generic/hack-6.18/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c -@@ -780,7 +780,8 @@ int add_mtd_device(struct mtd_info *mtd) +@@ -832,7 +832,8 @@ int add_mtd_device(struct mtd_info *mtd) mutex_unlock(&mtd_table_mutex); diff --git a/target/linux/generic/hack-6.18/499-LEGACY-block-partitions-populate-fwnode.patch b/target/linux/generic/hack-6.18/499-LEGACY-block-partitions-populate-fwnode.patch index f7ec9efba7..951d0b24f2 100644 --- a/target/linux/generic/hack-6.18/499-LEGACY-block-partitions-populate-fwnode.patch +++ b/target/linux/generic/hack-6.18/499-LEGACY-block-partitions-populate-fwnode.patch @@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle #include "check.h" static int (*const check_part[])(struct parsed_partitions *) = { -@@ -285,6 +287,74 @@ static ssize_t whole_disk_show(struct de +@@ -287,6 +289,74 @@ static ssize_t whole_disk_show(struct de } static const DEVICE_ATTR(whole_disk, 0444, whole_disk_show, NULL); @@ -94,7 +94,7 @@ Signed-off-by: Daniel Golle /* * Must be called either with open_mutex held, before a disk can be opened or * after all disk users are gone. -@@ -361,6 +431,9 @@ static struct block_device *add_partitio +@@ -363,6 +433,9 @@ static struct block_device *add_partitio goto out_put; } @@ -106,7 +106,7 @@ Signed-off-by: Daniel Golle err = device_add(pdev); --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c -@@ -368,6 +368,8 @@ int mmc_add_card(struct mmc_card *card) +@@ -375,6 +375,8 @@ int mmc_add_card(struct mmc_card *card) mmc_add_card_debugfs(card); card->dev.of_node = mmc_of_find_child_device(card->host, 0); @@ -117,7 +117,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c -@@ -2679,6 +2679,10 @@ static struct mmc_blk_data *mmc_blk_allo +@@ -2642,6 +2642,10 @@ static struct mmc_blk_data *mmc_blk_allo if (area_type == MMC_BLK_DATA_AREA_MAIN) dev_set_drvdata(&card->dev, md); disk_fwnode = mmc_blk_get_partitions_node(parent, subname); diff --git a/target/linux/generic/hack-6.18/600-net-enable-fraglist-GRO-by-default.patch b/target/linux/generic/hack-6.18/600-net-enable-fraglist-GRO-by-default.patch index feed2cd2e0..8de39ccaaf 100644 --- a/target/linux/generic/hack-6.18/600-net-enable-fraglist-GRO-by-default.patch +++ b/target/linux/generic/hack-6.18/600-net-enable-fraglist-GRO-by-default.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h -@@ -235,10 +235,10 @@ static inline int find_next_netdev_featu +@@ -237,10 +237,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.18/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch b/target/linux/generic/hack-6.18/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch index 7f79e041df..308b3619dc 100644 --- a/target/linux/generic/hack-6.18/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch +++ b/target/linux/generic/hack-6.18/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/page_pool.c +++ b/net/core/page_pool.c -@@ -1155,8 +1155,9 @@ static void page_pool_release_retry(stru +@@ -1199,8 +1199,9 @@ static void page_pool_release_retry(stru { struct delayed_work *dwq = to_delayed_work(wq); struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw); @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau inflight = page_pool_release(pool); /* In rare cases, a driver bug may cause inflight to go negative. -@@ -1168,6 +1169,21 @@ static void page_pool_release_retry(stru +@@ -1212,6 +1213,21 @@ static void page_pool_release_retry(stru if (inflight <= 0) return; diff --git a/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch index 53093daa36..cdd4918909 100644 --- a/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch +++ b/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -729,7 +729,6 @@ config NF_FLOW_TABLE +@@ -725,7 +725,6 @@ config NF_FLOW_TABLE tristate "Netfilter flow table module" depends on NETFILTER_INGRESS depends on NF_CONNTRACK @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau help This option adds the flow table core infrastructure. -@@ -1025,6 +1024,15 @@ config NETFILTER_XT_TARGET_NOTRACK +@@ -1031,6 +1030,15 @@ config NETFILTER_XT_TARGET_NOTRACK depends on NETFILTER_ADVANCED select NETFILTER_XT_TARGET_CT @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -168,6 +168,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF +@@ -167,6 +167,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 @@ -758,7 +758,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -373,8 +372,7 @@ flow_offload_lookup(struct nf_flowtable +@@ -413,8 +412,7 @@ flow_offload_lookup(struct nf_flowtable } EXPORT_SYMBOL_GPL(flow_offload_lookup); @@ -768,7 +768,7 @@ Signed-off-by: Felix Fietkau void (*iter)(struct nf_flowtable *flowtable, struct flow_offload *flow, void *data), void *data) -@@ -435,6 +433,7 @@ static void nf_flow_offload_gc_step(stru +@@ -582,6 +580,7 @@ static void nf_flow_offload_gc_step(stru nf_flow_offload_stats(flow_table, flow); } } @@ -798,7 +798,7 @@ Signed-off-by: Felix Fietkau +#endif /* _XT_FLOWOFFLOAD_H */ --- a/include/net/netfilter/nf_flow_table.h +++ b/include/net/netfilter/nf_flow_table.h -@@ -294,6 +294,11 @@ void nf_flow_table_free(struct nf_flowta +@@ -295,6 +295,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.18/651-wireless_mesh_header.patch b/target/linux/generic/hack-6.18/651-wireless_mesh_header.patch index d3f85ea1d1..6ada585f0c 100644 --- a/target/linux/generic/hack-6.18/651-wireless_mesh_header.patch +++ b/target/linux/generic/hack-6.18/651-wireless_mesh_header.patch @@ -11,7 +11,7 @@ Signed-off-by: Imre Kaloz --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -159,8 +159,8 @@ static inline bool dev_xmit_complete(int +@@ -162,8 +162,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.18/660-fq_codel_defaults.patch b/target/linux/generic/hack-6.18/660-fq_codel_defaults.patch index 4d7b01d243..64201f9bdf 100644 --- a/target/linux/generic/hack-6.18/660-fq_codel_defaults.patch +++ b/target/linux/generic/hack-6.18/660-fq_codel_defaults.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -472,7 +472,11 @@ static int fq_codel_init(struct Qdisc *s +@@ -475,7 +475,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.18/661-kernel-ct-size-the-hashtable-more-adequately.patch b/target/linux/generic/hack-6.18/661-kernel-ct-size-the-hashtable-more-adequately.patch index b4bf160e82..d64a3eb9e7 100644 --- a/target/linux/generic/hack-6.18/661-kernel-ct-size-the-hashtable-more-adequately.patch +++ b/target/linux/generic/hack-6.18/661-kernel-ct-size-the-hashtable-more-adequately.patch @@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2648,7 +2648,7 @@ int nf_conntrack_init_start(void) +@@ -2640,7 +2640,7 @@ int nf_conntrack_init_start(void) if (!nf_conntrack_htable_size) { nf_conntrack_htable_size diff --git a/target/linux/generic/hack-6.18/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-6.18/700-swconfig_switch_drivers.patch index ff235dd252..60b3f3c7f0 100644 --- a/target/linux/generic/hack-6.18/700-swconfig_switch_drivers.patch +++ b/target/linux/generic/hack-6.18/700-swconfig_switch_drivers.patch @@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -77,6 +77,80 @@ config SFP +@@ -82,6 +82,80 @@ config SFP depends on HWMON || HWMON=n select MDIO_I2C @@ -95,9 +95,9 @@ Signed-off-by: Felix Fietkau config AS21XXX_PHY --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -27,6 +27,21 @@ libphy-$(CONFIG_OPEN_ALLIANCE_HELPERS) + - obj-$(CONFIG_PHYLINK) += phylink.o - obj-$(CONFIG_PHYLIB) += libphy.o +@@ -21,6 +21,21 @@ obj-$(CONFIG_PHYLIB) += libphy.o + obj-$(CONFIG_PHYLIB) += mdio_devres.o + obj-$(CONFIG_PHY_PACKAGE) += phy_package.o +obj-$(CONFIG_SWCONFIG) += swconfig.o +obj-$(CONFIG_ADM6996_PHY) += adm6996.o diff --git a/target/linux/generic/hack-6.18/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.18/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 29ac3e9734..3daa49b698 100644 --- a/target/linux/generic/hack-6.18/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-6.18/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 -@@ -3583,6 +3583,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -3532,6 +3532,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/hack-6.18/723-net-phy-aquantia-fix-system-side-protocol-mi.patch b/target/linux/generic/hack-6.18/723-net-phy-aquantia-fix-system-side-protocol-mi.patch index eaeb3b6a92..a6b3828b98 100644 --- a/target/linux/generic/hack-6.18/723-net-phy-aquantia-fix-system-side-protocol-mi.patch +++ b/target/linux/generic/hack-6.18/723-net-phy-aquantia-fix-system-side-protocol-mi.patch @@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c -@@ -259,10 +259,16 @@ static int aqr_config_aneg_set_prot(stru +@@ -306,10 +306,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.18/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch b/target/linux/generic/hack-6.18/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch index 39446f6bac..0febf9dff2 100644 --- a/target/linux/generic/hack-6.18/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch +++ b/target/linux/generic/hack-6.18/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch @@ -13,7 +13,7 @@ Signed-off-by: Bo-Cun Chen --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -74,6 +74,7 @@ static const struct mtk_reg_map mtk_reg_ +@@ -75,6 +75,7 @@ static const struct mtk_reg_map mtk_reg_ .rx_ptr = 0x1900, .rx_cnt_cfg = 0x1904, .qcrx_ptr = 0x1908, @@ -21,7 +21,7 @@ Signed-off-by: Bo-Cun Chen .glo_cfg = 0x1a04, .rst_idx = 0x1a08, .delay_irq = 0x1a0c, -@@ -140,6 +141,7 @@ static const struct mtk_reg_map mt7986_r +@@ -141,6 +142,7 @@ static const struct mtk_reg_map mt7986_r .rx_ptr = 0x4500, .rx_cnt_cfg = 0x4504, .qcrx_ptr = 0x4508, @@ -29,7 +29,7 @@ Signed-off-by: Bo-Cun Chen .glo_cfg = 0x4604, .rst_idx = 0x4608, .delay_irq = 0x460c, -@@ -191,6 +193,7 @@ static const struct mtk_reg_map mt7988_r +@@ -192,6 +194,7 @@ static const struct mtk_reg_map mt7988_r .rx_ptr = 0x4500, .rx_cnt_cfg = 0x4504, .qcrx_ptr = 0x4508, @@ -37,7 +37,7 @@ Signed-off-by: Bo-Cun Chen .glo_cfg = 0x4604, .rst_idx = 0x4608, .delay_irq = 0x460c, -@@ -4069,6 +4072,56 @@ static void mtk_set_mcr_max_rx(struct mt +@@ -4160,6 +4163,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 static void mtk_hw_reset(struct mtk_eth *eth) { u32 val; -@@ -4548,6 +4601,8 @@ static void mtk_pending_work(struct work +@@ -4639,6 +4692,8 @@ static void mtk_pending_work(struct work rtnl_lock(); set_bit(MTK_RESETTING, ð->state); @@ -105,7 +105,7 @@ Signed-off-by: Bo-Cun Chen /* Run again reset preliminary configuration in order to avoid any --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -@@ -1185,6 +1185,7 @@ struct mtk_reg_map { +@@ -1193,6 +1193,7 @@ struct mtk_reg_map { u32 rx_ptr; /* rx base pointer */ u32 rx_cnt_cfg; /* rx max count configuration */ u32 qcrx_ptr; /* rx cpu pointer */ diff --git a/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch b/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch index c9dc2508ac..91c9f305a9 100644 --- a/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch +++ b/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -431,6 +431,8 @@ config QSEMI_PHY +@@ -458,6 +458,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 -@@ -110,6 +110,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja +@@ -106,6 +106,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.18/755-net-phy-motorcomm-yt8821-bus-collision-workaround.patch b/target/linux/generic/hack-6.18/755-net-phy-motorcomm-yt8821-bus-collision-workaround.patch index 28c4c702b3..07836e7551 100644 --- a/target/linux/generic/hack-6.18/755-net-phy-motorcomm-yt8821-bus-collision-workaround.patch +++ b/target/linux/generic/hack-6.18/755-net-phy-motorcomm-yt8821-bus-collision-workaround.patch @@ -49,9 +49,9 @@ Signed-off-by: Jakub Vaněk --- a/drivers/net/phy/motorcomm.c +++ b/drivers/net/phy/motorcomm.c -@@ -214,6 +214,9 @@ - #define YT8521_RC1R_RGMII_2_100_NS 14 - #define YT8521_RC1R_RGMII_2_250_NS 15 +@@ -228,6 +228,9 @@ + #define YT8521_LED_100_ON_EN BIT(5) + #define YT8521_LED_10_ON_EN BIT(4) +#define YTPHY_MDIO_ADDRESS_CONTROL_REG 0xA005 +#define YTPHY_MACR_EN_PHY_ADDR_0 BIT(6) @@ -59,7 +59,7 @@ Signed-off-by: Jakub Vaněk #define YTPHY_MISC_CONFIG_REG 0xA006 #define YTPHY_MCR_FIBER_SPEED_MASK BIT(0) #define YTPHY_MCR_FIBER_1000BX (0x1 << 0) -@@ -2659,6 +2662,23 @@ static int yt8821_config_init(struct phy +@@ -2773,6 +2776,23 @@ static int yt8821_config_init(struct phy int ret; u16 set; diff --git a/target/linux/generic/hack-6.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-6.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch index 14024e07cd..1948457a1e 100644 --- a/target/linux/generic/hack-6.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/generic/hack-6.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -7049,6 +7050,22 @@ static void rtl_tally_reset(struct r8152 +@@ -7019,6 +7020,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -7090,6 +7107,8 @@ static void r8152b_init(struct r8152 *tp +@@ -7060,6 +7077,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -7230,6 +7249,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7200,6 +7219,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -7312,6 +7333,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7282,6 +7303,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/target/linux/generic/hack-6.18/770-r8169-LED-uses-original-network-port-name.patch b/target/linux/generic/hack-6.18/770-r8169-LED-uses-original-network-port-name.patch index 55d4b481a2..e875fe6633 100644 --- a/target/linux/generic/hack-6.18/770-r8169-LED-uses-original-network-port-name.patch +++ b/target/linux/generic/hack-6.18/770-r8169-LED-uses-original-network-port-name.patch @@ -58,7 +58,7 @@ Signed-off-by: Chukun Pan led_cdev->flags |= LED_RETAIN_AT_SHUTDOWN; --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -980,28 +980,6 @@ int rtl8125_get_led_mode(struct rtl8169_ +@@ -978,28 +978,6 @@ int rtl8125_get_led_mode(struct rtl8169_ return ret; } diff --git a/target/linux/generic/hack-6.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-6.18/773-bgmac-add-srab-switch.patch index 40634f9ed0..c41c3bf13d 100644 --- a/target/linux/generic/hack-6.18/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/hack-6.18/773-bgmac-add-srab-switch.patch @@ -32,7 +32,7 @@ Signed-off-by: Hauke Mehrtens #include #include #include -@@ -1408,6 +1409,17 @@ static const struct ethtool_ops bgmac_et +@@ -1407,6 +1408,17 @@ static const struct ethtool_ops bgmac_et .set_link_ksettings = phy_ethtool_set_link_ksettings, }; @@ -50,7 +50,7 @@ Signed-off-by: Hauke Mehrtens /************************************************** * MII **************************************************/ -@@ -1546,6 +1558,14 @@ int bgmac_enet_probe(struct bgmac *bgmac +@@ -1545,6 +1557,14 @@ int bgmac_enet_probe(struct bgmac *bgmac bgmac->in_init = false; @@ -65,7 +65,7 @@ Signed-off-by: Hauke Mehrtens err = register_netdev(bgmac->net_dev); if (err) { dev_err(bgmac->dev, "Cannot register net device\n"); -@@ -1568,6 +1588,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe); +@@ -1567,6 +1587,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe); void bgmac_enet_remove(struct bgmac *bgmac) { diff --git a/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch b/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch index 17a22d0528..1308c0d971 100644 --- a/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau --- a/net/Kconfig +++ b/net/Kconfig -@@ -138,6 +138,9 @@ source "net/mptcp/Kconfig" +@@ -147,6 +147,9 @@ source "net/mptcp/Kconfig" endif # if INET @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau +++ b/net/core/Makefile @@ -11,12 +11,13 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core. - obj-y += dev.o dev_addr_lists.o dst.o netevent.o \ + obj-y += dev.o dev_api.o dev_addr_lists.o dst.o netevent.o \ neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ - sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \ + dev_ioctl.o tso.o sock_reuseport.o \ @@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau #include -@@ -152,6 +153,7 @@ +@@ -154,6 +155,7 @@ static DEFINE_MUTEX(proto_list_mutex); static LIST_HEAD(proto_list); @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau static void sock_def_write_space_wfree(struct sock *sk); static void sock_def_write_space(struct sock *sk); -@@ -587,6 +589,21 @@ discard_and_relse: +@@ -600,6 +602,21 @@ discard_and_relse: } EXPORT_SYMBOL(__sk_receive_skb); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *, u32)); INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *, -@@ -2342,9 +2359,11 @@ static void __sk_free(struct sock *sk) +@@ -2406,9 +2423,11 @@ static void __sk_free(struct sock *sk) if (likely(sk->sk_net_refcnt)) sock_inuse_add(sock_net(sk), -1); @@ -138,7 +138,7 @@ Signed-off-by: Felix Fietkau + select SOCK_DIAG default y help - Support for INET (TCP, DCCP, etc) socket monitoring interface used by + Support for INET (TCP, UDP, etc) socket monitoring interface used by --- a/net/netlink/Kconfig +++ b/net/netlink/Kconfig @@ -5,6 +5,7 @@ @@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau Support for PF_PACKET sockets monitoring interface used by the ss tool. --- a/net/unix/Kconfig +++ b/net/unix/Kconfig -@@ -24,6 +24,7 @@ config AF_UNIX_OOB +@@ -26,6 +26,7 @@ config AF_UNIX_OOB config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX diff --git a/target/linux/generic/hack-6.18/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.18/920-device_tree_cmdline.patch index 4763e82421..8bc6704d48 100644 --- a/target/linux/generic/hack-6.18/920-device_tree_cmdline.patch +++ b/target/linux/generic/hack-6.18/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 -@@ -1049,6 +1049,9 @@ int __init early_init_dt_scan_chosen(cha +@@ -1116,6 +1116,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)); diff --git a/target/linux/generic/hack-6.18/930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch b/target/linux/generic/hack-6.18/930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch index a7c8a8efd2..1f0fb67a7f 100644 --- a/target/linux/generic/hack-6.18/930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch +++ b/target/linux/generic/hack-6.18/930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch @@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/base/core.c +++ b/drivers/base/core.c -@@ -1653,7 +1653,7 @@ static void device_links_purge(struct de +@@ -1652,7 +1652,7 @@ static void device_links_purge(struct de #define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \ DL_FLAG_PM_RUNTIME)