diff --git a/feeds.conf.default b/feeds.conf.default index c5ecc9ab3..933cb54fa 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,13 +1,13 @@ src-git packages https://github.com/coolsnowwolf/packages #src-git luci https://github.com/coolsnowwolf/luci -#src-git luci https://github.com/coolsnowwolf/luci.git;openwrt-23.05 -src-git luci https://github.com/coolsnowwolf/luci.git;openwrt-24.10 +src-git luci https://github.com/coolsnowwolf/luci.git;openwrt-23.05 +#src-git luci https://github.com/coolsnowwolf/luci.git;openwrt-24.10 src-git routing https://github.com/coolsnowwolf/routing src-git telephony https://github.com/coolsnowwolf/telephony.git -#src-git helloworld https://github.com/fw876/helloworld.git +src-git helloworld https://github.com/fw876/helloworld.git #src-git oui https://github.com/zhaojh329/oui.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git oldpackages http://git.openwrt.org/packages.git -src-git qmodem https://github.com/FUjr/modem_feeds.git +#src-git qmodem https://github.com/FUjr/modem_feeds.git #src-link custom /usr/src/openwrt/custom-feed diff --git a/include/kernel-6.12 b/include/kernel-6.12 index 51f0379fc..78b4d3933 100644 --- a/include/kernel-6.12 +++ b/include/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .42 -LINUX_KERNEL_HASH-6.12.42 = 4804528a29cd20309a0b41c30e5aeffc35fa21ee3358f4a706d4586d003bc1fb +LINUX_VERSION-6.12 = .43 +LINUX_KERNEL_HASH-6.12.43 = 0fcbbbbcd456e87bbbfc8bf37af541fda62ccfcce76903503424fd101ef7bdee diff --git a/target/linux/generic/backport-6.12/830-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch b/target/linux/generic/backport-6.12/830-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch deleted file mode 100644 index ba83b8e06..000000000 --- a/target/linux/generic/backport-6.12/830-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 26f732791f2bcab18f59c61915bbe35225f30136 Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Sat, 12 Jul 2025 16:39:21 +0100 -Subject: [PATCH] Revert "leds: trigger: netdev: Configure LED blink interval - for HW offload" - -This reverts commit c629c972b310af41e9e072febb6dae9a299edde6. - -While .led_blink_set() would previously put an LED into an unconditional -permanently blinking state, the offending commit now uses same operation -to (also?) set the blink timing of the netdev trigger when offloading. - -This breaks many if not all of the existing PHY drivers which offer -offloading LED operations, as those drivers would just put the LED into -blinking state after .led_blink_set() has been called. - -Unfortunately the change even made it into stable kernels for unknown -reasons, so it should be reverted there as well. - -Fixes: c629c972b310a ("leds: trigger: netdev: Configure LED blink interval for HW offload") -Link: https://lore.kernel.org/linux-leds/c6134e26-2e45-4121-aa15-58aaef327201@lunn.ch/T/#m9d6fe81bbcb273e59f12bbedbd633edd32118387 -Suggested-by: Andrew Lunn -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle -Reviewed-by: Andrew Lunn -Link: https://lore.kernel.org/r/6dcc77ee1c9676891d6250d8994850f521426a0f.1752334655.git.daniel@makrotopia.org -Signed-off-by: Lee Jones ---- - drivers/leds/trigger/ledtrig-netdev.c | 16 +++------------- - 1 file changed, 3 insertions(+), 13 deletions(-) - ---- a/drivers/leds/trigger/ledtrig-netdev.c -+++ b/drivers/leds/trigger/ledtrig-netdev.c -@@ -68,7 +68,6 @@ struct led_netdev_data { - unsigned int last_activity; - - unsigned long mode; -- unsigned long blink_delay; - int link_speed; - __ETHTOOL_DECLARE_LINK_MODE_MASK(supported_link_modes); - u8 duplex; -@@ -87,10 +86,6 @@ static void set_baseline_state(struct le - /* Already validated, hw control is possible with the requested mode */ - if (trigger_data->hw_control) { - led_cdev->hw_control_set(led_cdev, trigger_data->mode); -- if (led_cdev->blink_set) { -- led_cdev->blink_set(led_cdev, &trigger_data->blink_delay, -- &trigger_data->blink_delay); -- } - - return; - } -@@ -459,11 +454,10 @@ static ssize_t interval_store(struct dev - size_t size) - { - struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev); -- struct led_classdev *led_cdev = trigger_data->led_cdev; - unsigned long value; - int ret; - -- if (trigger_data->hw_control && !led_cdev->blink_set) -+ if (trigger_data->hw_control) - return -EINVAL; - - ret = kstrtoul(buf, 0, &value); -@@ -472,13 +466,9 @@ static ssize_t interval_store(struct dev - - /* impose some basic bounds on the timer interval */ - if (value >= 5 && value <= 10000) { -- if (trigger_data->hw_control) { -- trigger_data->blink_delay = value; -- } else { -- cancel_delayed_work_sync(&trigger_data->work); -+ cancel_delayed_work_sync(&trigger_data->work); - -- atomic_set(&trigger_data->interval, msecs_to_jiffies(value)); -- } -+ atomic_set(&trigger_data->interval, msecs_to_jiffies(value)); - set_baseline_state(trigger_data); /* resets timer */ - } -