File tree 2 files changed +10
-2
lines changed
2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -127,6 +127,8 @@ kbuild_test_symbol totalram_pages linux/mm.h
127
127
kbuild_test_ref totalram_pages linux/mm.h
128
128
# b86c0e6429da ("netfilter: ecache: prepare for event notifier merge")
129
129
kbuild_test_member nf_ct_event_notifier.ct_event net/netfilter/nf_conntrack_ecache.h
130
+ # 6.4: 0199849acd07 ("sysctl: remove register_sysctl_paths()")
131
+ kbuild_test_symbol register_sysctl_paths linux/sysctl.h
130
132
131
133
echo " // End of compat_def.h"
132
134
Original file line number Diff line number Diff line change @@ -1929,16 +1929,18 @@ static ctl_table netflow_net_table[] = {
1929
1929
{ }
1930
1930
};
1931
1931
#else /* >= 2.6.25 */
1932
+ # ifdef HAVE_REGISTER_SYSCTL_PATHS
1932
1933
static struct ctl_path netflow_sysctl_path [] = {
1933
1934
{
1934
1935
.procname = "net" ,
1935
- #if LINUX_VERSION_CODE < KERNEL_VERSION (2 ,6 ,33 )
1936
+ # if LINUX_VERSION_CODE < KERNEL_VERSION (2 ,6 ,33 )
1936
1937
.ctl_name = CTL_NET
1937
- #endif
1938
+ # endif
1938
1939
},
1939
1940
{ .procname = "netflow" },
1940
1941
{ }
1941
1942
};
1943
+ # endif
1942
1944
#endif /* 2.6.25 */
1943
1945
#endif /* CONFIG_SYSCTL */
1944
1946
@@ -5666,7 +5668,11 @@ static int __init ipt_netflow_init(void)
5666
5668
#endif
5667
5669
);
5668
5670
#else /* 2.6.25 */
5671
+ # ifdef HAVE_REGISTER_SYSCTL_PATHS
5669
5672
netflow_sysctl_header = register_sysctl_paths (netflow_sysctl_path , netflow_sysctl_table );
5673
+ # else
5674
+ netflow_sysctl_header = register_sysctl ("net/netflow" , netflow_sysctl_table );
5675
+ # endif
5670
5676
#endif
5671
5677
if (!netflow_sysctl_header ) {
5672
5678
printk (KERN_ERR "netflow: can't register to sysctl\n" );
You can’t perform that action at this time.
0 commit comments