hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sysctl: remove broken netfilter binary sysctls 

No one has bothered to set strategy routine for the the netfilter sysctls that
return jiffies to be sysctl_jiffies.

So it appears the sys_sysctl path is unused and untested, so this patch
removes the binary sysctl numbers.

Which fixes the netfilter oops in 2.6.23-rc2-mm2 for me.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Eric W. Biederman 2007-10-18 03:05:32 -07:00 committed by Linus Torvalds
parent 35834ca1e4
commit 064b5bba0c
7 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
View File

@ -281,7 +281,6 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[],
static struct ctl_table_header *icmp_sysctl_header; static struct ctl_table_header *icmp_sysctl_header;
static struct ctl_table icmp_sysctl_table[] = { static struct ctl_table icmp_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_ICMP_TIMEOUT,
.procname = "nf_conntrack_icmp_timeout", .procname = "nf_conntrack_icmp_timeout",
.data = &nf_ct_icmp_timeout, .data = &nf_ct_icmp_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -295,7 +294,6 @@ static struct ctl_table icmp_sysctl_table[] = {
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
static struct ctl_table icmp_compat_sysctl_table[] = { static struct ctl_table icmp_compat_sysctl_table[] = {
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,
.procname = "ip_conntrack_icmp_timeout", .procname = "ip_conntrack_icmp_timeout",
.data = &nf_ct_icmp_timeout, .data = &nf_ct_icmp_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

1
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View File

@ -306,7 +306,6 @@ static struct nf_hook_ops ipv6_conntrack_ops[] = {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static ctl_table nf_ct_ipv6_sysctl_table[] = { static ctl_table nf_ct_ipv6_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_FRAG6_TIMEOUT,
.procname = "nf_conntrack_frag6_timeout", .procname = "nf_conntrack_frag6_timeout",
.data = &nf_frags_ctl.timeout, .data = &nf_frags_ctl.timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

1
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
View File

@ -260,7 +260,6 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[],
static struct ctl_table_header *icmpv6_sysctl_header; static struct ctl_table_header *icmpv6_sysctl_header;
static struct ctl_table icmpv6_sysctl_table[] = { static struct ctl_table icmpv6_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_ICMPV6_TIMEOUT,
.procname = "nf_conntrack_icmpv6_timeout", .procname = "nf_conntrack_icmpv6_timeout",
.data = &nf_ct_icmpv6_timeout, .data = &nf_ct_icmpv6_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

2
net/netfilter/nf_conntrack_proto_generic.c
View File

@ -70,7 +70,6 @@ static int new(struct nf_conn *conntrack, const struct sk_buff *skb,
static struct ctl_table_header *generic_sysctl_header; static struct ctl_table_header *generic_sysctl_header;
static struct ctl_table generic_sysctl_table[] = { static struct ctl_table generic_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_GENERIC_TIMEOUT,
.procname = "nf_conntrack_generic_timeout", .procname = "nf_conntrack_generic_timeout",
.data = &nf_ct_generic_timeout, .data = &nf_ct_generic_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -84,7 +83,6 @@ static struct ctl_table generic_sysctl_table[] = {
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
static struct ctl_table generic_compat_sysctl_table[] = { static struct ctl_table generic_compat_sysctl_table[] = {
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,
.procname = "ip_conntrack_generic_timeout", .procname = "ip_conntrack_generic_timeout",
.data = &nf_ct_generic_timeout, .data = &nf_ct_generic_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

14
net/netfilter/nf_conntrack_proto_sctp.c
View File

@ -476,7 +476,6 @@ static unsigned int sctp_sysctl_table_users;
static struct ctl_table_header *sctp_sysctl_header; static struct ctl_table_header *sctp_sysctl_header;
static struct ctl_table sctp_sysctl_table[] = { static struct ctl_table sctp_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
.procname = "nf_conntrack_sctp_timeout_closed", .procname = "nf_conntrack_sctp_timeout_closed",
.data = &nf_ct_sctp_timeout_closed, .data = &nf_ct_sctp_timeout_closed,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -484,7 +483,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
.procname = "nf_conntrack_sctp_timeout_cookie_wait", .procname = "nf_conntrack_sctp_timeout_cookie_wait",
.data = &nf_ct_sctp_timeout_cookie_wait, .data = &nf_ct_sctp_timeout_cookie_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -492,7 +490,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
.procname = "nf_conntrack_sctp_timeout_cookie_echoed", .procname = "nf_conntrack_sctp_timeout_cookie_echoed",
.data = &nf_ct_sctp_timeout_cookie_echoed, .data = &nf_ct_sctp_timeout_cookie_echoed,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -500,7 +497,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
.procname = "nf_conntrack_sctp_timeout_established", .procname = "nf_conntrack_sctp_timeout_established",
.data = &nf_ct_sctp_timeout_established, .data = &nf_ct_sctp_timeout_established,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -508,7 +504,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
.procname = "nf_conntrack_sctp_timeout_shutdown_sent", .procname = "nf_conntrack_sctp_timeout_shutdown_sent",
.data = &nf_ct_sctp_timeout_shutdown_sent, .data = &nf_ct_sctp_timeout_shutdown_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -516,7 +511,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
.procname = "nf_conntrack_sctp_timeout_shutdown_recd", .procname = "nf_conntrack_sctp_timeout_shutdown_recd",
.data = &nf_ct_sctp_timeout_shutdown_recd, .data = &nf_ct_sctp_timeout_shutdown_recd,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -524,7 +518,6 @@ static struct ctl_table sctp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
.procname = "nf_conntrack_sctp_timeout_shutdown_ack_sent", .procname = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
.data = &nf_ct_sctp_timeout_shutdown_ack_sent, .data = &nf_ct_sctp_timeout_shutdown_ack_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -539,7 +532,6 @@ static struct ctl_table sctp_sysctl_table[] = {
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
static struct ctl_table sctp_compat_sysctl_table[] = { static struct ctl_table sctp_compat_sysctl_table[] = {
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
.procname = "ip_conntrack_sctp_timeout_closed", .procname = "ip_conntrack_sctp_timeout_closed",
.data = &nf_ct_sctp_timeout_closed, .data = &nf_ct_sctp_timeout_closed,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -547,7 +539,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
.procname = "ip_conntrack_sctp_timeout_cookie_wait", .procname = "ip_conntrack_sctp_timeout_cookie_wait",
.data = &nf_ct_sctp_timeout_cookie_wait, .data = &nf_ct_sctp_timeout_cookie_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -555,7 +546,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
.procname = "ip_conntrack_sctp_timeout_cookie_echoed", .procname = "ip_conntrack_sctp_timeout_cookie_echoed",
.data = &nf_ct_sctp_timeout_cookie_echoed, .data = &nf_ct_sctp_timeout_cookie_echoed,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -563,7 +553,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
.procname = "ip_conntrack_sctp_timeout_established", .procname = "ip_conntrack_sctp_timeout_established",
.data = &nf_ct_sctp_timeout_established, .data = &nf_ct_sctp_timeout_established,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -571,7 +560,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
.procname = "ip_conntrack_sctp_timeout_shutdown_sent", .procname = "ip_conntrack_sctp_timeout_shutdown_sent",
.data = &nf_ct_sctp_timeout_shutdown_sent, .data = &nf_ct_sctp_timeout_shutdown_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -579,7 +567,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
.procname = "ip_conntrack_sctp_timeout_shutdown_recd", .procname = "ip_conntrack_sctp_timeout_shutdown_recd",
.data = &nf_ct_sctp_timeout_shutdown_recd, .data = &nf_ct_sctp_timeout_shutdown_recd,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -587,7 +574,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
.procname = "ip_conntrack_sctp_timeout_shutdown_ack_sent", .procname = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
.data = &nf_ct_sctp_timeout_shutdown_ack_sent, .data = &nf_ct_sctp_timeout_shutdown_ack_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

18
net/netfilter/nf_conntrack_proto_tcp.c
View File

@ -1162,7 +1162,6 @@ static unsigned int tcp_sysctl_table_users;
static struct ctl_table_header *tcp_sysctl_header; static struct ctl_table_header *tcp_sysctl_header;
static struct ctl_table tcp_sysctl_table[] = { static struct ctl_table tcp_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
.procname = "nf_conntrack_tcp_timeout_syn_sent", .procname = "nf_conntrack_tcp_timeout_syn_sent",
.data = &nf_ct_tcp_timeout_syn_sent, .data = &nf_ct_tcp_timeout_syn_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1170,7 +1169,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
.procname = "nf_conntrack_tcp_timeout_syn_recv", .procname = "nf_conntrack_tcp_timeout_syn_recv",
.data = &nf_ct_tcp_timeout_syn_recv, .data = &nf_ct_tcp_timeout_syn_recv,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1178,7 +1176,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
.procname = "nf_conntrack_tcp_timeout_established", .procname = "nf_conntrack_tcp_timeout_established",
.data = &nf_ct_tcp_timeout_established, .data = &nf_ct_tcp_timeout_established,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1186,7 +1183,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
.procname = "nf_conntrack_tcp_timeout_fin_wait", .procname = "nf_conntrack_tcp_timeout_fin_wait",
.data = &nf_ct_tcp_timeout_fin_wait, .data = &nf_ct_tcp_timeout_fin_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1194,7 +1190,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
.procname = "nf_conntrack_tcp_timeout_close_wait", .procname = "nf_conntrack_tcp_timeout_close_wait",
.data = &nf_ct_tcp_timeout_close_wait, .data = &nf_ct_tcp_timeout_close_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1202,7 +1197,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
.procname = "nf_conntrack_tcp_timeout_last_ack", .procname = "nf_conntrack_tcp_timeout_last_ack",
.data = &nf_ct_tcp_timeout_last_ack, .data = &nf_ct_tcp_timeout_last_ack,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1210,7 +1204,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
.procname = "nf_conntrack_tcp_timeout_time_wait", .procname = "nf_conntrack_tcp_timeout_time_wait",
.data = &nf_ct_tcp_timeout_time_wait, .data = &nf_ct_tcp_timeout_time_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1218,7 +1211,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
.procname = "nf_conntrack_tcp_timeout_close", .procname = "nf_conntrack_tcp_timeout_close",
.data = &nf_ct_tcp_timeout_close, .data = &nf_ct_tcp_timeout_close,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1226,7 +1218,6 @@ static struct ctl_table tcp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
.procname = "nf_conntrack_tcp_timeout_max_retrans", .procname = "nf_conntrack_tcp_timeout_max_retrans",
.data = &nf_ct_tcp_timeout_max_retrans, .data = &nf_ct_tcp_timeout_max_retrans,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1265,7 +1256,6 @@ static struct ctl_table tcp_sysctl_table[] = {
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
static struct ctl_table tcp_compat_sysctl_table[] = { static struct ctl_table tcp_compat_sysctl_table[] = {
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
.procname = "ip_conntrack_tcp_timeout_syn_sent", .procname = "ip_conntrack_tcp_timeout_syn_sent",
.data = &nf_ct_tcp_timeout_syn_sent, .data = &nf_ct_tcp_timeout_syn_sent,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1273,7 +1263,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
.procname = "ip_conntrack_tcp_timeout_syn_recv", .procname = "ip_conntrack_tcp_timeout_syn_recv",
.data = &nf_ct_tcp_timeout_syn_recv, .data = &nf_ct_tcp_timeout_syn_recv,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1281,7 +1270,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
.procname = "ip_conntrack_tcp_timeout_established", .procname = "ip_conntrack_tcp_timeout_established",
.data = &nf_ct_tcp_timeout_established, .data = &nf_ct_tcp_timeout_established,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1289,7 +1277,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
.procname = "ip_conntrack_tcp_timeout_fin_wait", .procname = "ip_conntrack_tcp_timeout_fin_wait",
.data = &nf_ct_tcp_timeout_fin_wait, .data = &nf_ct_tcp_timeout_fin_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1297,7 +1284,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
.procname = "ip_conntrack_tcp_timeout_close_wait", .procname = "ip_conntrack_tcp_timeout_close_wait",
.data = &nf_ct_tcp_timeout_close_wait, .data = &nf_ct_tcp_timeout_close_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1305,7 +1291,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
.procname = "ip_conntrack_tcp_timeout_last_ack", .procname = "ip_conntrack_tcp_timeout_last_ack",
.data = &nf_ct_tcp_timeout_last_ack, .data = &nf_ct_tcp_timeout_last_ack,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1313,7 +1298,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
.procname = "ip_conntrack_tcp_timeout_time_wait", .procname = "ip_conntrack_tcp_timeout_time_wait",
.data = &nf_ct_tcp_timeout_time_wait, .data = &nf_ct_tcp_timeout_time_wait,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1321,7 +1305,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
.procname = "ip_conntrack_tcp_timeout_close", .procname = "ip_conntrack_tcp_timeout_close",
.data = &nf_ct_tcp_timeout_close, .data = &nf_ct_tcp_timeout_close,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -1329,7 +1312,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
.procname = "ip_conntrack_tcp_timeout_max_retrans", .procname = "ip_conntrack_tcp_timeout_max_retrans",
.data = &nf_ct_tcp_timeout_max_retrans, .data = &nf_ct_tcp_timeout_max_retrans,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),

4
net/netfilter/nf_conntrack_proto_udp.c
View File

@ -146,7 +146,6 @@ static unsigned int udp_sysctl_table_users;
static struct ctl_table_header *udp_sysctl_header; static struct ctl_table_header *udp_sysctl_header;
static struct ctl_table udp_sysctl_table[] = { static struct ctl_table udp_sysctl_table[] = {
{ {
.ctl_name = NET_NF_CONNTRACK_UDP_TIMEOUT,
.procname = "nf_conntrack_udp_timeout", .procname = "nf_conntrack_udp_timeout",
.data = &nf_ct_udp_timeout, .data = &nf_ct_udp_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -154,7 +153,6 @@ static struct ctl_table udp_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
.procname = "nf_conntrack_udp_timeout_stream", .procname = "nf_conntrack_udp_timeout_stream",
.data = &nf_ct_udp_timeout_stream, .data = &nf_ct_udp_timeout_stream,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -168,7 +166,6 @@ static struct ctl_table udp_sysctl_table[] = {
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
static struct ctl_table udp_compat_sysctl_table[] = { static struct ctl_table udp_compat_sysctl_table[] = {
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,
.procname = "ip_conntrack_udp_timeout", .procname = "ip_conntrack_udp_timeout",
.data = &nf_ct_udp_timeout, .data = &nf_ct_udp_timeout,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
@ -176,7 +173,6 @@ static struct ctl_table udp_compat_sysctl_table[] = {
.proc_handler = &proc_dointvec_jiffies, .proc_handler = &proc_dointvec_jiffies,
}, },
{ {
.ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
.procname = "ip_conntrack_udp_timeout_stream", .procname = "ip_conntrack_udp_timeout_stream",
.data = &nf_ct_udp_timeout_stream, .data = &nf_ct_udp_timeout_stream,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),