[AX25]: Switch to using ctl_paths.
This one is almost the same as the hunks in the first patch, but ax25 tables are created dynamically. So this patch differs a bit to handle this case. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3151a9ab04
commit
c6995bdff0
|
@ -31,25 +31,11 @@ static struct ctl_table_header *ax25_table_header;
|
||||||
static ctl_table *ax25_table;
|
static ctl_table *ax25_table;
|
||||||
static int ax25_table_size;
|
static int ax25_table_size;
|
||||||
|
|
||||||
static ctl_table ax25_dir_table[] = {
|
static struct ctl_path ax25_path[] = {
|
||||||
{
|
{ .procname = "net", .ctl_name = CTL_NET, },
|
||||||
.ctl_name = NET_AX25,
|
{ .procname = "ax25", .ctl_name = NET_AX25, },
|
||||||
.procname = "ax25",
|
{ }
|
||||||
.mode = 0555,
|
|
||||||
},
|
|
||||||
{ .ctl_name = 0 }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static ctl_table ax25_root_table[] = {
|
|
||||||
{
|
|
||||||
.ctl_name = CTL_NET,
|
|
||||||
.procname = "net",
|
|
||||||
.mode = 0555,
|
|
||||||
.child = ax25_dir_table
|
|
||||||
},
|
|
||||||
{ .ctl_name = 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
static const ctl_table ax25_param_table[] = {
|
static const ctl_table ax25_param_table[] = {
|
||||||
{
|
{
|
||||||
.ctl_name = NET_AX25_IP_DEFAULT_MODE,
|
.ctl_name = NET_AX25_IP_DEFAULT_MODE,
|
||||||
|
@ -243,9 +229,7 @@ void ax25_register_sysctl(void)
|
||||||
}
|
}
|
||||||
spin_unlock_bh(&ax25_dev_lock);
|
spin_unlock_bh(&ax25_dev_lock);
|
||||||
|
|
||||||
ax25_dir_table[0].child = ax25_table;
|
ax25_table_header = register_sysctl_paths(ax25_path, ax25_table);
|
||||||
|
|
||||||
ax25_table_header = register_sysctl_table(ax25_root_table);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ax25_unregister_sysctl(void)
|
void ax25_unregister_sysctl(void)
|
||||||
|
@ -253,7 +237,6 @@ void ax25_unregister_sysctl(void)
|
||||||
ctl_table *p;
|
ctl_table *p;
|
||||||
unregister_sysctl_table(ax25_table_header);
|
unregister_sysctl_table(ax25_table_header);
|
||||||
|
|
||||||
ax25_dir_table[0].child = NULL;
|
|
||||||
for (p = ax25_table; p->ctl_name; p++)
|
for (p = ax25_table; p->ctl_name; p++)
|
||||||
kfree(p->child);
|
kfree(p->child);
|
||||||
kfree(ax25_table);
|
kfree(ax25_table);
|
||||||
|
|
Loading…
Reference in New Issue