bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-base-lock' into 'devel-1.6' 

Linux >= 6.9.0 support

See merge request etherlab.org/ethercat!129
This commit is contained in:
Florian Pose 2024-06-06 12:10:51 +00:00
parent 495dbc1aa6 95c25b5071
commit d22a450aae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/generic.c
View File

@ -423,14 +423,14 @@ int __init ec_gen_init_module(void)
INIT_LIST_HEAD(&generic_devices); INIT_LIST_HEAD(&generic_devices);
INIT_LIST_HEAD(&descs); INIT_LIST_HEAD(&descs);
read_lock(&dev_base_lock); rcu_read_lock();
for_each_netdev(&init_net, netdev) { for_each_netdev_rcu(&init_net, netdev) {
if (netdev->type != ARPHRD_ETHER) if (netdev->type != ARPHRD_ETHER)
continue; continue;
desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC); desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC);
if (!desc) { if (!desc) {
ret = -ENOMEM; ret = -ENOMEM;
read_unlock(&dev_base_lock); rcu_read_unlock();
goto out_err; goto out_err;
} }
strncpy(desc->name, netdev->name, IFNAMSIZ); strncpy(desc->name, netdev->name, IFNAMSIZ);
@ -439,7 +439,7 @@ int __init ec_gen_init_module(void)
memcpy(desc->dev_addr, netdev->dev_addr, ETH_ALEN); memcpy(desc->dev_addr, netdev->dev_addr, ETH_ALEN);
list_add_tail(&desc->list, &descs); list_add_tail(&desc->list, &descs);
} }
read_unlock(&dev_base_lock); rcu_read_unlock();
list_for_each_entry_safe(desc, next, &descs, list) { list_for_each_entry_safe(desc, next, &descs, list) {
ret = offer_device(desc); ret = offer_device(desc);