diff --git a/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch b/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch deleted file mode 100644 index a71edb7be6..0000000000 --- a/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 09eb1b9f73d677d10d18039305b9d974e52cc6d5 Mon Sep 17 00:00:00 2001 -From: Nicola Fontana -Date: Mon, 3 Jun 2024 12:45:48 +0200 -Subject: [PATCH] Remove dev_base_lock for linux >= 6.9.0 - -Kernel commit 1b3ef46cb7f2618cc0b507393220a69810f6da12 removed -`dev_base_lock` from v6.9 onward. - -Use the alternate iterator `for_each_netdev_rcu` introduced by commit -c6d14c84566d6b70ad9dc1618db0dec87cca9300 in 2.6.33+. - -Upstream: https://gitlab.com/etherlab.org/ethercat/-/commit/95c25b50711ca7e1f990bdcbca8fa713c942ab01 -Signed-off-by: Thomas Petazzoni ---- - devices/generic.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/devices/generic.c b/devices/generic.c -index 4d4d9bbd..f30f1e17 100644 ---- a/devices/generic.c -+++ b/devices/generic.c -@@ -420,14 +420,14 @@ int __init ec_gen_init_module(void) - INIT_LIST_HEAD(&generic_devices); - INIT_LIST_HEAD(&descs); - -- read_lock(&dev_base_lock); -- for_each_netdev(&init_net, netdev) { -+ rcu_read_lock(); -+ for_each_netdev_rcu(&init_net, netdev) { - if (netdev->type != ARPHRD_ETHER) - continue; - desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC); - if (!desc) { - ret = -ENOMEM; -- read_unlock(&dev_base_lock); -+ rcu_read_unlock(); - goto out_err; - } - strncpy(desc->name, netdev->name, IFNAMSIZ); -@@ -436,7 +436,7 @@ int __init ec_gen_init_module(void) - memcpy(desc->dev_addr, netdev->dev_addr, ETH_ALEN); - list_add_tail(&desc->list, &descs); - } -- read_unlock(&dev_base_lock); -+ rcu_read_unlock(); - - list_for_each_entry_safe(desc, next, &descs, list) { - ret = offer_device(desc); --- -2.45.2 - diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index 67a152c6ae..c655f9ac79 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 7e4d8f3497c0bc0b64a151c0d074349fe7614767563642d6fedb19567eafa1e1 igh-ethercat-f5dc109176400f540a8682a2c9ee20d411d14d61.tar.gz +sha256 6c8ce954f9c27de95ecce508fecfcc48767742f7cbbe967187dac6e817df2e70 igh-ethercat-1.6.2.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 5b618ab54a..374f8891e5 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = f5dc109176400f540a8682a2c9ee20d411d14d61 +IGH_ETHERCAT_VERSION = 1.6.2 IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER