-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
xt_coova: fix compile with kernel>=5.17 #564
base: master
Are you sure you want to change the base?
Conversation
Linux kernel 5.17 removed PDE_DATA, and replaced it with pde_data [0] [0]: torvalds/linux@359745d Signed-off-by: John Thomson <[email protected]>
@sevan can you look at it, please? Would be nice to see it merged as we would not carry patch in OpenWrt. |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) | ||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) | ||
st->table = pde_data(inode); | ||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs an upper bound (before 5.17.0?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for taking a look sevan.
I thought the upper bound would be guarded by the else in #elif
, so any kernel at or after 5.17 would not reach this?
Cheers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's more to protect against future edits, rather than compiling/parsing (at a glance to the human they both apply to 5.17, one just more so :) )
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) | ||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) | ||
struct coova_table *t = pde_data(file_inode(file)); | ||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here, needs an upper bound (before 5.17.0?)
Linux kernel 5.17 removed PDE_DATA, and replaced it with pde_data 0
Signed-off-by: John Thomson [email protected]