Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6
[linux-2.6.git] / net / core / sysctl_net_core.c
index 887c03c..2673146 100644 (file)
@@ -19,7 +19,6 @@
 static struct ctl_table net_core_table[] = {
 #ifdef CONFIG_NET
        {
-               .ctl_name       = NET_CORE_WMEM_MAX,
                .procname       = "wmem_max",
                .data           = &sysctl_wmem_max,
                .maxlen         = sizeof(int),
@@ -27,7 +26,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_RMEM_MAX,
                .procname       = "rmem_max",
                .data           = &sysctl_rmem_max,
                .maxlen         = sizeof(int),
@@ -35,7 +33,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_WMEM_DEFAULT,
                .procname       = "wmem_default",
                .data           = &sysctl_wmem_default,
                .maxlen         = sizeof(int),
@@ -43,7 +40,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_RMEM_DEFAULT,
                .procname       = "rmem_default",
                .data           = &sysctl_rmem_default,
                .maxlen         = sizeof(int),
@@ -51,7 +47,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_DEV_WEIGHT,
                .procname       = "dev_weight",
                .data           = &weight_p,
                .maxlen         = sizeof(int),
@@ -59,7 +54,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_MAX_BACKLOG,
                .procname       = "netdev_max_backlog",
                .data           = &netdev_max_backlog,
                .maxlen         = sizeof(int),
@@ -67,16 +61,13 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_MSG_COST,
                .procname       = "message_cost",
                .data           = &net_ratelimit_state.interval,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_jiffies,
-               .strategy       = sysctl_jiffies,
        },
        {
-               .ctl_name       = NET_CORE_MSG_BURST,
                .procname       = "message_burst",
                .data           = &net_ratelimit_state.burst,
                .maxlen         = sizeof(int),
@@ -84,7 +75,6 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_CORE_OPTMEM_MAX,
                .procname       = "optmem_max",
                .data           = &sysctl_optmem_max,
                .maxlen         = sizeof(int),
@@ -93,7 +83,6 @@ static struct ctl_table net_core_table[] = {
        },
 #endif /* CONFIG_NET */
        {
-               .ctl_name       = NET_CORE_BUDGET,
                .procname       = "netdev_budget",
                .data           = &netdev_budget,
                .maxlen         = sizeof(int),
@@ -101,31 +90,29 @@ static struct ctl_table net_core_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
-               .ctl_name       = NET_CORE_WARNINGS,
                .procname       = "warnings",
                .data           = &net_msg_warn,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 static struct ctl_table netns_core_table[] = {
        {
-               .ctl_name       = NET_CORE_SOMAXCONN,
                .procname       = "somaxconn",
                .data           = &init_net.core.sysctl_somaxconn,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 __net_initdata struct ctl_path net_core_path[] = {
-       { .procname = "net", .ctl_name = CTL_NET, },
-       { .procname = "core", .ctl_name = NET_CORE, },
+       { .procname = "net", },
+       { .procname = "core", },
        { },
 };