diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-12-17 19:20:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 22:28:17 -0500 |
commit | 64396accc2831fcbdc7d793edc25481a5ebc75b2 (patch) | |
tree | c8e4f3abbd51c20b502fa2e98c9a693673d8f979 | |
parent | 421d99193537a6522aac2148286f08792167d5fd (diff) |
sysctl: fix ax25 checks
Fix:
sysctl table check failed: /net/ax25/ax0/ax25_default_mode .3.9.1.2 Unknown
sysctl binary path
Pid: 2936, comm: kissattach Not tainted 2.6.24-rc5 #1
[<c012ca6a>] set_fail+0x3b/0x43
[<c012ce7a>] sysctl_check_table+0x408/0x456
[<c012ce8e>] sysctl_check_table+0x41c/0x456
[<c012ce8e>] sysctl_check_table+0x41c/0x456
...
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Bernard Pidoux <pidoux@ccr.jussieu.fr>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/sysctl_check.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index bed939f82c31..a68425a5cc1d 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c | |||
@@ -428,7 +428,7 @@ static struct trans_ctl_table trans_net_netrom_table[] = { | |||
428 | {} | 428 | {} |
429 | }; | 429 | }; |
430 | 430 | ||
431 | static struct trans_ctl_table trans_net_ax25_table[] = { | 431 | static struct trans_ctl_table trans_net_ax25_param_table[] = { |
432 | { NET_AX25_IP_DEFAULT_MODE, "ip_default_mode" }, | 432 | { NET_AX25_IP_DEFAULT_MODE, "ip_default_mode" }, |
433 | { NET_AX25_DEFAULT_MODE, "ax25_default_mode" }, | 433 | { NET_AX25_DEFAULT_MODE, "ax25_default_mode" }, |
434 | { NET_AX25_BACKOFF_TYPE, "backoff_type" }, | 434 | { NET_AX25_BACKOFF_TYPE, "backoff_type" }, |
@@ -446,6 +446,11 @@ static struct trans_ctl_table trans_net_ax25_table[] = { | |||
446 | {} | 446 | {} |
447 | }; | 447 | }; |
448 | 448 | ||
449 | static struct trans_ctl_table trans_net_ax25_table[] = { | ||
450 | { 0, NULL, trans_net_ax25_param_table }, | ||
451 | {} | ||
452 | }; | ||
453 | |||
449 | static struct trans_ctl_table trans_net_bridge_table[] = { | 454 | static struct trans_ctl_table trans_net_bridge_table[] = { |
450 | { NET_BRIDGE_NF_CALL_ARPTABLES, "bridge-nf-call-arptables" }, | 455 | { NET_BRIDGE_NF_CALL_ARPTABLES, "bridge-nf-call-arptables" }, |
451 | { NET_BRIDGE_NF_CALL_IPTABLES, "bridge-nf-call-iptables" }, | 456 | { NET_BRIDGE_NF_CALL_IPTABLES, "bridge-nf-call-iptables" }, |