Skip to content
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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

john-tho
Copy link

@john-tho john-tho commented Jan 3, 2023

Linux kernel 5.17 removed PDE_DATA, and replaced it with pde_data 0

Signed-off-by: John Thomson [email protected]

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]>
@BKPepe
Copy link

BKPepe commented Jun 30, 2023

@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)
Copy link
Member

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?)

Copy link
Author

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

Copy link
Member

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)
Copy link
Member

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?)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants