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

Merge branch 'fix_get_ecdev' into 'stable-1.5' 

Fix igb backports from 1.6

See merge request etherlab.org/ethercat!131
This commit is contained in:
Florian Pose 2024-06-07 09:26:36 +00:00
parent 85ed1a08c5 f7d2c053bc
commit 131c468426
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/igb/igb_main-5.14-ethercat.c
View File

@ -8122,7 +8122,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
if (q_vector->adapter->ecdev) {
return -EBUSY;
}

2
devices/igb/igb_main-5.15-ethercat.c
View File

@ -8112,7 +8112,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
if (q_vector->adapter->ecdev) {
return -EBUSY;
}

2
devices/igb/igb_main-6.1-ethercat.c
View File

@ -8265,7 +8265,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
if (q_vector->adapter->ecdev) {
return -EBUSY;
}