net: Convert all sysctl registrations to register_net_sysctl

[~andy/linux] / net / 802 / tr.c

diff --git a/net/802/tr.c b/net/802/tr.c
index 103e0201b0abe4fbf331ca4337bf6add48072e3e..30a352ed09b1bfc9ecd95d26ccfa5f28db8b9d47 100644 (file)
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -643,12 +643,6 @@ static struct ctl_table tr_table[] = {
        },
        { },
 };
-
-static __initdata struct ctl_path tr_path[] = {
-       { .procname = "net", },
-       { .procname = "token-ring", },
-       { }
-};
 #endif
 
 /*
@@ -662,7 +656,7 @@ static int __init rif_init(void)
        setup_timer(&rif_timer, rif_check_expire, 0);
        add_timer(&rif_timer);
 #ifdef CONFIG_SYSCTL
-       register_net_sysctl_table(&init_net, tr_path, tr_table);
+       register_net_sysctl(&init_net, "net/token-ring", tr_table);
 #endif
        proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);
        return 0;