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 38bc157876f3b29104b858b1d122193f31573cd3..21295993fdb84f2dd53dea972b137eb95395aca2 100644 (file)
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -11,6 +11,7 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include "dccp.h"
 #include "feat.h"
 
 #ifndef CONFIG_SYSCTL
@@ -19,91 +20,99 @@
 
 static struct ctl_table dccp_default_table[] = {
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEQ_WINDOW,
                .procname       = "seq_window",
-               .data           = &dccp_feat_default_sequence_window,
-               .maxlen         = sizeof(dccp_feat_default_sequence_window),
+               .data           = &sysctl_dccp_feat_sequence_window,
+               .maxlen         = sizeof(sysctl_dccp_feat_sequence_window),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_RX_CCID,
                .procname       = "rx_ccid",
-               .data           = &dccp_feat_default_rx_ccid,
-               .maxlen         = sizeof(dccp_feat_default_rx_ccid),
+               .data           = &sysctl_dccp_feat_rx_ccid,
+               .maxlen         = sizeof(sysctl_dccp_feat_rx_ccid),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_TX_CCID,
                .procname       = "tx_ccid",
-               .data           = &dccp_feat_default_tx_ccid,
-               .maxlen         = sizeof(dccp_feat_default_tx_ccid),
+               .data           = &sysctl_dccp_feat_tx_ccid,
+               .maxlen         = sizeof(sysctl_dccp_feat_tx_ccid),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_ACK_RATIO,
                .procname       = "ack_ratio",
-               .data           = &dccp_feat_default_ack_ratio,
-               .maxlen         = sizeof(dccp_feat_default_ack_ratio),
+               .data           = &sysctl_dccp_feat_ack_ratio,
+               .maxlen         = sizeof(sysctl_dccp_feat_ack_ratio),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEND_ACKVEC,
                .procname       = "send_ackvec",
-               .data           = &dccp_feat_default_send_ack_vector,
-               .maxlen         = sizeof(dccp_feat_default_send_ack_vector),
+               .data           = &sysctl_dccp_feat_send_ack_vector,
+               .maxlen         = sizeof(sysctl_dccp_feat_send_ack_vector),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_DCCP_DEFAULT_SEND_NDP,
                .procname       = "send_ndp",
-               .data           = &dccp_feat_default_send_ndp_count,
-               .maxlen         = sizeof(dccp_feat_default_send_ndp_count),
+               .data           = &sysctl_dccp_feat_send_ndp_count,
+               .maxlen         = sizeof(sysctl_dccp_feat_send_ndp_count),
                .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       = "request_retries",
+               .data           = &sysctl_dccp_request_retries,
+               .maxlen         = sizeof(sysctl_dccp_request_retries),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
        },
-       { .ctl_name = 0, },
-};
-
-static struct ctl_table dccp_dir_table[] = {
        {
-               .ctl_name       = NET_DCCP,
-               .procname       = "dccp",
-               .mode           = 0555,
-               .child          = dccp_table,
+               .procname       = "retries1",
+               .data           = &sysctl_dccp_retries1,
+               .maxlen         = sizeof(sysctl_dccp_retries1),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
+       {
+               .procname       = "retries2",
+               .data           = &sysctl_dccp_retries2,
+               .maxlen         = sizeof(sysctl_dccp_retries2),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
+       {
+               .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_root_table[] = {
        {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = dccp_dir_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, },
+
+       { .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;
 }