mac80211: Use queue_lock() in ieee80211_ht_agg_queue_remove().

[linux-2.6] / net / dccp / sysctl.c

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 4775ba3faa04aff1d473191abd49b282e85d4356..21295993fdb84f2dd53dea972b137eb95395aca2 100644 (file)
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -20,7 +20,6 @@
 
 static struct ctl_table dccp_default_table[] = {
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEQ_WINDOW,
                .procname       = "seq_window",
                .data           = &sysctl_dccp_feat_sequence_window,
                .maxlen         = sizeof(sysctl_dccp_feat_sequence_window),
@@ -28,7 +27,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_RX_CCID,
                .procname       = "rx_ccid",
                .data           = &sysctl_dccp_feat_rx_ccid,
                .maxlen         = sizeof(sysctl_dccp_feat_rx_ccid),
@@ -36,7 +34,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_TX_CCID,
                .procname       = "tx_ccid",
                .data           = &sysctl_dccp_feat_tx_ccid,
                .maxlen         = sizeof(sysctl_dccp_feat_tx_ccid),
@@ -44,7 +41,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_ACK_RATIO,
                .procname       = "ack_ratio",
                .data           = &sysctl_dccp_feat_ack_ratio,
                .maxlen         = sizeof(sysctl_dccp_feat_ack_ratio),
@@ -52,7 +48,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEND_ACKVEC,
                .procname       = "send_ackvec",
                .data           = &sysctl_dccp_feat_send_ack_vector,
                .maxlen         = sizeof(sysctl_dccp_feat_send_ack_vector),
@@ -60,7 +55,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEND_NDP,
                .procname       = "send_ndp",
                .data           = &sysctl_dccp_feat_send_ndp_count,
                .maxlen         = sizeof(sysctl_dccp_feat_send_ndp_count),
@@ -68,7 +62,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_REQ_RETRIES,
                .procname       = "request_retries",
                .data           = &sysctl_dccp_request_retries,
                .maxlen         = sizeof(sysctl_dccp_request_retries),
@@ -76,7 +69,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_RETRIES1,
                .procname       = "retries1",
                .data           = &sysctl_dccp_retries1,
                .maxlen         = sizeof(sysctl_dccp_retries1),
@@ -84,7 +76,6 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_RETRIES2,
                .procname       = "retries2",
                .data           = &sysctl_dccp_retries2,
                .maxlen         = sizeof(sysctl_dccp_retries2),
@@ -92,52 +83,36 @@ static struct ctl_table dccp_default_table[] = {
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_TX_QLEN,
                .procname       = "tx_qlen",
                .data           = &sysctl_dccp_tx_qlen,
                .maxlen         = sizeof(sysctl_dccp_tx_qlen),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
-
-       { .ctl_name = 0, }
-};
-
-static struct ctl_table dccp_table[] = {
        {
-               .ctl_name       = NET_DCCP_DEFAULT,
-               .procname       = "default",
-               .mode           = 0555,
-               .child          = dccp_default_table,
+               .procname       = "sync_ratelimit",
+               .data           = &sysctl_dccp_sync_ratelimit,
+               .maxlen         = sizeof(sysctl_dccp_sync_ratelimit),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_ms_jiffies,
        },
-       { .ctl_name = 0, },
-};
 
-static struct ctl_table dccp_dir_table[] = {
-       {
-               .ctl_name       = NET_DCCP,
-               .procname       = "dccp",
-               .mode           = 0555,
-               .child          = dccp_table,
-       },
-       { .ctl_name = 0, },
+       { .ctl_name = 0, }
 };
 
-static struct ctl_table dccp_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = dccp_dir_table,
-       },
-       { .ctl_name = 0, },
+static struct ctl_path dccp_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "dccp", .ctl_name = NET_DCCP, },
+       { .procname = "default", .ctl_name = NET_DCCP_DEFAULT, },
+       { }
 };
 
 static struct ctl_table_header *dccp_table_header;
 
 int __init dccp_sysctl_init(void)
 {
-       dccp_table_header = register_sysctl_table(dccp_root_table, 1);
+       dccp_table_header = register_sysctl_paths(dccp_path,
+                       dccp_default_table);
 
        return dccp_table_header != NULL ? 0 : -ENOMEM;
 }