From 53a0d54766e90b0263f268949979f730d42bec04 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Mon, 10 Aug 2026 08:19:58 +0800 Subject: [PATCH] kernel: bump 6.18 to 6.18.44 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.44 New kconfig symbol: - EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS[1] All patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.44&id=5aaa06dfc10f8398c8807453dbec738ea9af10e4 Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/24551 Signed-off-by: Hauke Mehrtens --- ...ve-Airoha-driver-to-dedicated-directory.patch | 2 +- ...ca953x-Add-ti-tca9554-compatible-string.patch | 2 +- ...70-hwmon-sht3x-Add-DT-compatible-string.patch | 2 +- ...h-hci_sync-Add-fallback-bd-address-prop.patch | 4 ++-- ...-Look-up-preferred-fbdev-node-number-fr.patch | 4 ++-- ...m-support-DS1-exit-firmware-re-download.patch | 12 ++++++------ ...tooth-hci_sync-Fix-crash-on-NULL-parent.patch | 2 +- ...onfig-Allow-MFD_RP1-as-well-as-MISC_RP1.patch | 2 +- ...ve-compatibility-with-old-Pi-5-firmware.patch | 2 +- ...-v7.3-net-dsa-mt7530-add-en7528-support.patch | 8 ++++---- ...ntroduce-helpers-for-replaying-link-cal.patch | 2 +- ...-mtk-lynxi-pass-SGMIISYS-OF-node-to-PCS.patch | 2 +- target/linux/generic/config-6.18 | 1 + ...l-ct-size-the-hashtable-more-adequately.patch | 2 +- target/linux/generic/kernel-6.18 | 4 ++-- ...tables-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +- ...late-host_interfaces-when-attaching-PHY.patch | 4 ++-- ...eep-and-use-MAC-supported_interfaces-in.patch | 8 ++++---- ...introduce-internal-phylink-PCS-handling.patch | 16 ++++++++-------- ...et-dsa-add-out-of-band-tagging-protocol.patch | 2 +- ...et-dsa-add-out-of-band-tagging-protocol.patch | 2 +- ...dd-RTL8231-pin-control-and-GPIO-support.patch | 2 +- 22 files changed, 44 insertions(+), 43 deletions(-) diff --git a/target/linux/airoha/patches-6.18/180-01-v7.2-pinctrl-Move-Airoha-driver-to-dedicated-directory.patch b/target/linux/airoha/patches-6.18/180-01-v7.2-pinctrl-Move-Airoha-driver-to-dedicated-directory.patch index 6780419f026..71eef4556dc 100644 --- a/target/linux/airoha/patches-6.18/180-01-v7.2-pinctrl-Move-Airoha-driver-to-dedicated-directory.patch +++ b/target/linux/airoha/patches-6.18/180-01-v7.2-pinctrl-Move-Airoha-driver-to-dedicated-directory.patch @@ -42,7 +42,7 @@ Signed-off-by: Linus Walleij M: Basavaraj Natikar --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -682,6 +682,7 @@ config PINCTRL_RP1 +@@ -684,6 +684,7 @@ config PINCTRL_RP1 multi function device. source "drivers/pinctrl/actions/Kconfig" diff --git a/target/linux/bcm27xx/patches-6.18/0266-gpio-pca953x-Add-ti-tca9554-compatible-string.patch b/target/linux/bcm27xx/patches-6.18/0266-gpio-pca953x-Add-ti-tca9554-compatible-string.patch index 3b56b369565..571f12eed43 100644 --- a/target/linux/bcm27xx/patches-6.18/0266-gpio-pca953x-Add-ti-tca9554-compatible-string.patch +++ b/target/linux/bcm27xx/patches-6.18/0266-gpio-pca953x-Add-ti-tca9554-compatible-string.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c -@@ -1468,6 +1468,7 @@ static const struct of_device_id pca953x +@@ -1479,6 +1479,7 @@ static const struct of_device_id pca953x { .compatible = "ti,tca9535", .data = OF_953X(16, PCA_INT), }, { .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), }, { .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), }, diff --git a/target/linux/bcm27xx/patches-6.18/0270-hwmon-sht3x-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.18/0270-hwmon-sht3x-Add-DT-compatible-string.patch index 5a72b449c54..c8cc410fbf7 100644 --- a/target/linux/bcm27xx/patches-6.18/0270-hwmon-sht3x-Add-DT-compatible-string.patch +++ b/target/linux/bcm27xx/patches-6.18/0270-hwmon-sht3x-Add-DT-compatible-string.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/hwmon/sht3x.c +++ b/drivers/hwmon/sht3x.c -@@ -933,13 +933,25 @@ static int sht3x_probe(struct i2c_client +@@ -934,13 +934,25 @@ static int sht3x_probe(struct i2c_client static const struct i2c_device_id sht3x_ids[] = { {"sht3x", sht3x}, {"sts3x", sts3x}, diff --git a/target/linux/bcm27xx/patches-6.18/0275-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch b/target/linux/bcm27xx/patches-6.18/0275-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch index 3187ffd1edd..4e123e45c93 100644 --- a/target/linux/bcm27xx/patches-6.18/0275-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch +++ b/target/linux/bcm27xx/patches-6.18/0275-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch @@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c -@@ -5015,6 +5015,7 @@ static const struct { +@@ -5081,6 +5081,7 @@ static const struct { */ static int hci_dev_setup_sync(struct hci_dev *hdev) { @@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell int ret = 0; bool invalid_bdaddr; size_t i; -@@ -5043,7 +5044,8 @@ static int hci_dev_setup_sync(struct hci +@@ -5109,7 +5110,8 @@ static int hci_dev_setup_sync(struct hci hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY); if (!ret) { if (hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) && diff --git a/target/linux/bcm27xx/patches-6.18/0326-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch b/target/linux/bcm27xx/patches-6.18/0326-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch index 4c5c0d70e15..4e6dd76d3a1 100644 --- a/target/linux/bcm27xx/patches-6.18/0326-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch +++ b/target/linux/bcm27xx/patches-6.18/0326-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch @@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -1807,7 +1807,7 @@ __drm_fb_helper_initial_config_and_unloc +@@ -1784,7 +1784,7 @@ __drm_fb_helper_initial_config_and_unloc struct drm_device *dev = fb_helper->dev; struct fb_info *info; unsigned int width, height; @@ -28,7 +28,7 @@ Signed-off-by: Dave Stevenson width = dev->mode_config.max_width; height = dev->mode_config.max_height; -@@ -1835,6 +1835,15 @@ __drm_fb_helper_initial_config_and_unloc +@@ -1818,6 +1818,15 @@ __drm_fb_helper_initial_config_and_unloc * register the fbdev emulation instance in kernel_fb_helper_list. */ mutex_unlock(&fb_helper->lock); diff --git a/target/linux/bcm27xx/patches-6.18/0350-non-upstream-support-DS1-exit-firmware-re-download.patch b/target/linux/bcm27xx/patches-6.18/0350-non-upstream-support-DS1-exit-firmware-re-download.patch index 98fc9ebe3ed..6d2cceadd18 100644 --- a/target/linux/bcm27xx/patches-6.18/0350-non-upstream-support-DS1-exit-firmware-re-download.patch +++ b/target/linux/bcm27xx/patches-6.18/0350-non-upstream-support-DS1-exit-firmware-re-download.patch @@ -39,7 +39,7 @@ JIRA: SWWLAN-136577 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h -@@ -298,7 +298,7 @@ void brcmf_rx_event(struct device *dev, +@@ -304,7 +304,7 @@ void brcmf_rx_event(struct device *dev, int brcmf_alloc(struct device *dev, struct brcmf_mp_device *settings); /* Indication from bus module regarding presence/insertion of dongle. */ @@ -112,7 +112,7 @@ JIRA: SWWLAN-136577 BRCMF_DEFAULT_SCAN_CHANNEL_TIME); --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1327,7 +1327,7 @@ int brcmf_alloc(struct device *dev, stru +@@ -1356,7 +1356,7 @@ int brcmf_alloc(struct device *dev, stru return 0; } @@ -121,7 +121,7 @@ JIRA: SWWLAN-136577 { struct brcmf_bus *bus_if = dev_get_drvdata(dev); struct brcmf_pub *drvr = bus_if->drvr; -@@ -1370,10 +1370,12 @@ int brcmf_attach(struct device *dev) +@@ -1399,10 +1399,12 @@ int brcmf_attach(struct device *dev) brcmf_fwvid_get_cfg80211_ops(drvr); @@ -517,7 +517,7 @@ JIRA: SWWLAN-136577 /* ready */ return; -@@ -4652,3 +4863,40 @@ int brcmf_sdio_sleep(struct brcmf_sdio * +@@ -4658,3 +4869,40 @@ int brcmf_sdio_sleep(struct brcmf_sdio * return ret; } @@ -605,7 +605,7 @@ JIRA: SWWLAN-136577 }; /* sdio core registers */ -@@ -367,4 +398,83 @@ void brcmf_sdio_wowl_config(struct devic +@@ -368,4 +399,83 @@ void brcmf_sdio_wowl_config(struct devic int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep); void brcmf_sdio_trigger_dpc(struct brcmf_sdio *bus); @@ -700,7 +700,7 @@ JIRA: SWWLAN-136577 if (ret) goto error; -@@ -1288,7 +1288,7 @@ static int brcmf_usb_probe_cb(struct brc +@@ -1289,7 +1289,7 @@ static int brcmf_usb_probe_cb(struct brc ret = brcmf_alloc(devinfo->dev, devinfo->settings); if (ret) goto fail; diff --git a/target/linux/bcm27xx/patches-6.18/0399-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch b/target/linux/bcm27xx/patches-6.18/0399-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch index 263f6a67cd1..67ffb831858 100644 --- a/target/linux/bcm27xx/patches-6.18/0399-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch +++ b/target/linux/bcm27xx/patches-6.18/0399-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c -@@ -5015,7 +5015,8 @@ static const struct { +@@ -5081,7 +5081,8 @@ static const struct { */ static int hci_dev_setup_sync(struct hci_dev *hdev) { diff --git a/target/linux/bcm27xx/patches-6.18/0578-config-Allow-MFD_RP1-as-well-as-MISC_RP1.patch b/target/linux/bcm27xx/patches-6.18/0578-config-Allow-MFD_RP1-as-well-as-MISC_RP1.patch index 907882ad973..58a9f287d51 100644 --- a/target/linux/bcm27xx/patches-6.18/0578-config-Allow-MFD_RP1-as-well-as-MISC_RP1.patch +++ b/target/linux/bcm27xx/patches-6.18/0578-config-Allow-MFD_RP1-as-well-as-MISC_RP1.patch @@ -25,7 +25,7 @@ Signed-off-by: Phil Elwell Enable common clock framework support for Raspberry Pi RP1. --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -672,7 +672,7 @@ config PINCTRL_MLXBF3 +@@ -674,7 +674,7 @@ config PINCTRL_MLXBF3 config PINCTRL_RP1 tristate "Pinctrl driver for RP1" diff --git a/target/linux/bcm27xx/patches-6.18/0757-of-Improve-compatibility-with-old-Pi-5-firmware.patch b/target/linux/bcm27xx/patches-6.18/0757-of-Improve-compatibility-with-old-Pi-5-firmware.patch index bffd69216a8..257dd24eaed 100644 --- a/target/linux/bcm27xx/patches-6.18/0757-of-Improve-compatibility-with-old-Pi-5-firmware.patch +++ b/target/linux/bcm27xx/patches-6.18/0757-of-Improve-compatibility-with-old-Pi-5-firmware.patch @@ -154,7 +154,7 @@ Signed-off-by: Phil Elwell base = b; size = s; -@@ -416,16 +443,24 @@ static int __init __reserved_mem_alloc_s +@@ -424,16 +451,24 @@ static int __init __reserved_mem_alloc_s const __be32 *prop; bool nomap, default_cma; int ret; diff --git a/target/linux/econet/patches-6.18/781-v7.3-net-dsa-mt7530-add-en7528-support.patch b/target/linux/econet/patches-6.18/781-v7.3-net-dsa-mt7530-add-en7528-support.patch index b6e673060d3..5e620661ea7 100644 --- a/target/linux/econet/patches-6.18/781-v7.3-net-dsa-mt7530-add-en7528-support.patch +++ b/target/linux/econet/patches-6.18/781-v7.3-net-dsa-mt7530-add-en7528-support.patch @@ -42,7 +42,7 @@ Signed-off-by: Ahmed Naseef }; --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2847,6 +2847,30 @@ static void en7581_mac_port_get_caps(str +@@ -2829,6 +2829,30 @@ static void en7581_mac_port_get_caps(str } } @@ -73,7 +73,7 @@ Signed-off-by: Ahmed Naseef static void mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) -@@ -3036,17 +3060,24 @@ static void mt753x_phylink_get_caps(stru +@@ -3018,17 +3042,24 @@ static void mt753x_phylink_get_caps(stru struct phylink_config *config) { struct mt7530_priv *priv = ds->priv; @@ -105,7 +105,7 @@ Signed-off-by: Ahmed Naseef priv->info->mac_port_get_caps(ds, port, config); } -@@ -3174,7 +3205,8 @@ mt753x_conduit_state_change(struct dsa_s +@@ -3156,7 +3187,8 @@ mt753x_conduit_state_change(struct dsa_s * forwarded to the numerically smallest CPU port whose conduit * interface is up. */ @@ -115,7 +115,7 @@ Signed-off-by: Ahmed Naseef return; mask = BIT(cpu_dp->index); -@@ -3377,6 +3409,16 @@ const struct mt753x_info mt753x_table[] +@@ -3359,6 +3391,16 @@ const struct mt753x_info mt753x_table[] .phy_write_c45 = mt7531_ind_c45_phy_write, .mac_port_get_caps = en7581_mac_port_get_caps, }, diff --git a/target/linux/generic/backport-6.18/703-02-v7.0-net-phylink-introduce-helpers-for-replaying-link-cal.patch b/target/linux/generic/backport-6.18/703-02-v7.0-net-phylink-introduce-helpers-for-replaying-link-cal.patch index ccf9a422c9e..a87b1010851 100644 --- a/target/linux/generic/backport-6.18/703-02-v7.0-net-phylink-introduce-helpers-for-replaying-link-cal.patch +++ b/target/linux/generic/backport-6.18/703-02-v7.0-net-phylink-introduce-helpers-for-replaying-link-cal.patch @@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski } /* If configuration of the interface failed, force the link down -@@ -4273,6 +4277,57 @@ void phylink_mii_c45_pcs_get_state(struc +@@ -4274,6 +4278,57 @@ void phylink_mii_c45_pcs_get_state(struc } EXPORT_SYMBOL_GPL(phylink_mii_c45_pcs_get_state); diff --git a/target/linux/generic/backport-6.18/785-v7.0-09-net-pcs-pcs-mtk-lynxi-pass-SGMIISYS-OF-node-to-PCS.patch b/target/linux/generic/backport-6.18/785-v7.0-09-net-pcs-pcs-mtk-lynxi-pass-SGMIISYS-OF-node-to-PCS.patch index 9d88ac8af8c..84652d01838 100644 --- a/target/linux/generic/backport-6.18/785-v7.0-09-net-pcs-pcs-mtk-lynxi-pass-SGMIISYS-OF-node-to-PCS.patch +++ b/target/linux/generic/backport-6.18/785-v7.0-09-net-pcs-pcs-mtk-lynxi-pass-SGMIISYS-OF-node-to-PCS.patch @@ -38,7 +38,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/mt7530-mdio.c +++ b/drivers/net/dsa/mt7530-mdio.c -@@ -113,8 +113,8 @@ mt7531_create_sgmii(struct mt7530_priv * +@@ -120,8 +120,8 @@ mt7531_create_sgmii(struct mt7530_priv * ret = PTR_ERR(regmap); break; } diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18 index 0c3d67b20ef..7c0d371e5db 100644 --- a/target/linux/generic/config-6.18 +++ b/target/linux/generic/config-6.18 @@ -2042,6 +2042,7 @@ CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y # CONFIG_EROFS_FS_ZIP is not set # CONFIG_EROFS_FS_ZIP_ACCEL is not set # CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS=16 # CONFIG_EROFS_FS_ZIP_ZSTD is not set # CONFIG_ERRATA_MIPS is not set # CONFIG_ET131X is not set 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 33649bc0baa..9d369df6d06 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 -@@ -2597,7 +2597,7 @@ int nf_conntrack_init_start(void) +@@ -2600,7 +2600,7 @@ int nf_conntrack_init_start(void) if (!nf_conntrack_htable_size) { nf_conntrack_htable_size diff --git a/target/linux/generic/kernel-6.18 b/target/linux/generic/kernel-6.18 index adb86b5cb48..93a41ed993b 100644 --- a/target/linux/generic/kernel-6.18 +++ b/target/linux/generic/kernel-6.18 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.18 = .43 -LINUX_KERNEL_HASH-6.18.43 = a1aeb926c7c4a1564368200b1082e45bb958007682d804aff88abbc3a7a47b5d +LINUX_VERSION-6.18 = .44 +LINUX_KERNEL_HASH-6.18.44 = 0f72d938f06828e82c90405174fe572287db7bfe089e2fc46572a99a7f240d43 diff --git a/target/linux/generic/pending-6.18/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.18/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 563c44598bb..b61675217a2 100644 --- a/target/linux/generic/pending-6.18/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.18/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8879,7 +8879,7 @@ static int nft_register_flowtable_ops(st +@@ -8884,7 +8884,7 @@ static int nft_register_flowtable_ops(st err = flowtable->data.type->setup(&flowtable->data, ops->dev, FLOW_BLOCK_BIND); diff --git a/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch b/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch index 8030af557f6..814ddb1ad64 100644 --- a/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch +++ b/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch @@ -20,7 +20,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -2282,7 +2282,7 @@ int phylink_fwnode_phy_connect(struct ph +@@ -2283,7 +2283,7 @@ int phylink_fwnode_phy_connect(struct ph { struct fwnode_handle *phy_fwnode; struct phy_device *phy_dev; @@ -29,7 +29,7 @@ Signed-off-by: Daniel Golle /* Fixed links and 802.3z are handled without needing a PHY */ if (pl->cfg_link_an_mode == MLO_AN_FIXED || -@@ -2312,6 +2312,25 @@ int phylink_fwnode_phy_connect(struct ph +@@ -2313,6 +2313,25 @@ int phylink_fwnode_phy_connect(struct ph if (pl->config->mac_requires_rxc) flags |= PHY_F_RXC_ALWAYS_ON; diff --git a/target/linux/generic/pending-6.18/737-01-net-phylink-keep-and-use-MAC-supported_interfaces-in.patch b/target/linux/generic/pending-6.18/737-01-net-phylink-keep-and-use-MAC-supported_interfaces-in.patch index 81c989028e2..fb96432fe55 100644 --- a/target/linux/generic/pending-6.18/737-01-net-phylink-keep-and-use-MAC-supported_interfaces-in.patch +++ b/target/linux/generic/pending-6.18/737-01-net-phylink-keep-and-use-MAC-supported_interfaces-in.patch @@ -51,7 +51,7 @@ Signed-off-by: Christian Marangi pl->config = config; if (config->type == PHYLINK_NETDEV) { pl->netdev = to_net_dev(config->dev); -@@ -2015,7 +2023,7 @@ static int phylink_validate_phy(struct p +@@ -2016,7 +2024,7 @@ static int phylink_validate_phy(struct p * those which the host supports. */ phy_interface_and(interfaces, phy->possible_interfaces, @@ -60,7 +60,7 @@ Signed-off-by: Christian Marangi if (phy_interface_empty(interfaces)) { phylink_err(pl, "PHY has no common interfaces\n"); -@@ -2757,12 +2765,12 @@ static phy_interface_t phylink_sfp_selec +@@ -2758,12 +2766,12 @@ static phy_interface_t phylink_sfp_selec return interface; } @@ -75,7 +75,7 @@ Signed-off-by: Christian Marangi return PHY_INTERFACE_MODE_NA; } -@@ -3690,14 +3698,14 @@ static int phylink_sfp_config_optical(st +@@ -3691,14 +3699,14 @@ static int phylink_sfp_config_optical(st phylink_dbg(pl, "optical SFP: interfaces=[mac=%*pbl, sfp=%*pbl]\n", (int)PHY_INTERFACE_MODE_MAX, @@ -92,7 +92,7 @@ Signed-off-by: Christian Marangi pl->sfp_interfaces); if (phy_interface_empty(pl->sfp_interfaces)) { phylink_err(pl, "unsupported SFP module: no common interface modes\n"); -@@ -3868,7 +3876,7 @@ static int phylink_sfp_connect_phy(void +@@ -3869,7 +3877,7 @@ static int phylink_sfp_connect_phy(void /* Set the PHY's host supported interfaces */ phy_interface_and(phy->host_interfaces, phylink_sfp_interfaces, diff --git a/target/linux/generic/pending-6.18/737-02-net-phylink-introduce-internal-phylink-PCS-handling.patch b/target/linux/generic/pending-6.18/737-02-net-phylink-introduce-internal-phylink-PCS-handling.patch index e3dc1db36c1..e5dd8433261 100644 --- a/target/linux/generic/pending-6.18/737-02-net-phylink-introduce-internal-phylink-PCS-handling.patch +++ b/target/linux/generic/pending-6.18/737-02-net-phylink-introduce-internal-phylink-PCS-handling.patch @@ -209,8 +209,7 @@ Signed-off-by: Christian Marangi + */ + } else if (test_bit(state->interface, pl->config->pcs_interfaces)) { + bool pcs_found = false; - -- pcs_changed = pl->pcs != pcs; ++ + list_for_each_entry(pcs, &pl->pcs_list, list) { + if (!phylink_validate_pcs_interface(pcs, + state->interface)) { @@ -218,7 +217,8 @@ Signed-off-by: Christian Marangi + break; + } + } -+ + +- pcs_changed = pl->pcs != pcs; + if (!pcs_found) { + phylink_err(pl, + "couldn't find a PCS for %s\n", @@ -327,7 +327,7 @@ Signed-off-by: Christian Marangi pl->config = config; if (config->type == PHYLINK_NETDEV) { -@@ -1942,10 +2070,16 @@ EXPORT_SYMBOL_GPL(phylink_create); +@@ -1943,10 +2071,16 @@ EXPORT_SYMBOL_GPL(phylink_create); */ void phylink_destroy(struct phylink *pl) { @@ -344,7 +344,7 @@ Signed-off-by: Christian Marangi cancel_work_sync(&pl->resolve); kfree(pl); } -@@ -2447,6 +2581,7 @@ static irqreturn_t phylink_link_handler( +@@ -2448,6 +2582,7 @@ static irqreturn_t phylink_link_handler( */ void phylink_start(struct phylink *pl) { @@ -352,7 +352,7 @@ Signed-off-by: Christian Marangi bool poll = false; ASSERT_RTNL(); -@@ -2473,6 +2608,10 @@ void phylink_start(struct phylink *pl) +@@ -2474,6 +2609,10 @@ void phylink_start(struct phylink *pl) pl->pcs_state = PCS_STATE_STARTED; @@ -363,7 +363,7 @@ Signed-off-by: Christian Marangi phylink_enable_and_run_resolve(pl, PHYLINK_DISABLE_STOPPED); if (pl->cfg_link_an_mode == MLO_AN_FIXED && pl->link_gpio) { -@@ -2517,6 +2656,8 @@ EXPORT_SYMBOL_GPL(phylink_start); +@@ -2518,6 +2657,8 @@ EXPORT_SYMBOL_GPL(phylink_start); */ void phylink_stop(struct phylink *pl) { @@ -372,7 +372,7 @@ Signed-off-by: Christian Marangi ASSERT_RTNL(); if (pl->sfp_bus) -@@ -2534,6 +2675,14 @@ void phylink_stop(struct phylink *pl) +@@ -2535,6 +2676,14 @@ void phylink_stop(struct phylink *pl) pl->pcs_state = PCS_STATE_DOWN; phylink_pcs_disable(pl->pcs); diff --git a/target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch index c4b26d2ae2f..edb9ae3931f 100644 --- a/target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch @@ -136,7 +136,7 @@ Signed-off-by: Maxime Chevallier #include #include #include -@@ -5112,6 +5116,9 @@ static const u8 skb_ext_type_len[] = { +@@ -5118,6 +5122,9 @@ static const u8 skb_ext_type_len[] = { #if IS_ENABLED(CONFIG_INET_PSP) [SKB_EXT_PSP] = SKB_EXT_CHUNKSIZEOF(struct psp_skb_ext), #endif diff --git a/target/linux/qualcommax/patches-6.18/0950-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/qualcommax/patches-6.18/0950-net-dsa-add-out-of-band-tagging-protocol.patch index 5e6ba0cf533..595f5a55e60 100644 --- a/target/linux/qualcommax/patches-6.18/0950-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/qualcommax/patches-6.18/0950-net-dsa-add-out-of-band-tagging-protocol.patch @@ -126,7 +126,7 @@ Signed-off-by: Maxime Chevallier #include #include #include -@@ -5112,6 +5116,9 @@ static const u8 skb_ext_type_len[] = { +@@ -5118,6 +5122,9 @@ static const u8 skb_ext_type_len[] = { #if IS_ENABLED(CONFIG_INET_PSP) [SKB_EXT_PSP] = SKB_EXT_CHUNKSIZEOF(struct psp_skb_ext), #endif diff --git a/target/linux/realtek/patches-6.18/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch b/target/linux/realtek/patches-6.18/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch index 2133bf6ac10..34c6c1aff26 100644 --- a/target/linux/realtek/patches-6.18/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch +++ b/target/linux/realtek/patches-6.18/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch @@ -23,7 +23,7 @@ Signed-off-by: Sander Vanheule --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -531,6 +531,17 @@ config PINCTRL_SCMI +@@ -533,6 +533,17 @@ config PINCTRL_SCMI It uses SCMI Message Protocol to interact with the firmware providing all the pinctrl controls. -- 2.47.3