Skip to content

Fix compilation with kernel 6.4 due to register_sysctl_paths removal #221

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.

Sign up for GitHub

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

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

Fix compilation with kernel 6.4 due to register_sysctl_paths removal #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ipt_NETFLOW.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,7 @@ static ctl_table netflow_net_table[] = {
{ }
};
#else /* >= 2.6.25 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
static struct ctl_path netflow_sysctl_path[] = {
{
.procname = "net",
Expand All @@ -1939,6 +1940,7 @@ static struct ctl_path netflow_sysctl_path[] = {
{ .procname = "netflow" },
{ }
};
#endif /* 6.4.0 */
#endif /* 2.6.25 */
#endif /* CONFIG_SYSCTL */

Expand Down Expand Up @@ -5666,8 +5668,12 @@ static int __init ipt_netflow_init(void)
#endif
);
#else /* 2.6.25 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
netflow_sysctl_header = register_sysctl_paths(netflow_sysctl_path, netflow_sysctl_table);
#endif
#else
netflow_sysctl_header = register_sysctl("net/netflow", netflow_sysctl_table);
#endif /* 6.4.0 */
#endif /* 2.6.25 */
if (!netflow_sysctl_header) {
printk(KERN_ERR "netflow: can't register to sysctl\n");
goto err_free_proc_stat3;
Expand Down