Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
  [NETFILTER]: Add H.323 conntrack/NAT helper
  [TG3]: Don't mark tg3_test_registers() as returning const.
  [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
  [IPV6]: Nearly complete kzalloc cleanup for net/ipv6
  [IPV6]: Cleanup of net/ipv6/reassambly.c
  [BRIDGE]: Remove duplicate const from is_link_local() argument type.
  [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
  [TG3]: make drivers/net/tg3.c:tg3_request_irq() static
  [BRIDGE]: use LLC to send STP
  [LLC]: llc_mac_hdr_init const arguments
  [BRIDGE]: allow show/store of group multicast address
  [BRIDGE]: use llc for receiving STP packets
  [BRIDGE]: stp timer to jiffies cleanup
  [BRIDGE]: forwarding remove unneeded preempt and bh diasables
  [BRIDGE]: netfilter inline cleanup
  [BRIDGE]: netfilter VLAN macro cleanup
  [BRIDGE]: netfilter dont use __constant_htons
  [BRIDGE]: netfilter whitespace
  [BRIDGE]: optimize frame pass up
  [BRIDGE]: use kzalloc
  ...

1 files changed, 124 insertions, 0 deletions

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
new file mode 100644
index 000000000000..64c89e9c229e
--- /dev/null
+++ b/net/dccp/sysctl.c
@@ -0,0 +1,124 @@
+/*
+ *  net/dccp/sysctl.c
+ *
+ *  An implementation of the DCCP protocol
+ *  Arnaldo Carvalho de Melo <acme@mandriva.com>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License v2
+ *      as published by the Free Software Foundation.
+ */
+
+#include <linux/config.h>
+#include <linux/mm.h>
+#include <linux/sysctl.h>
+
+#ifndef CONFIG_SYSCTL
+#error This file should not be compiled without CONFIG_SYSCTL defined
+#endif
+
+extern int dccp_feat_default_sequence_window;
+extern int dccp_feat_default_rx_ccid;
+extern int dccp_feat_default_tx_ccid;
+extern int dccp_feat_default_ack_ratio;
+extern int dccp_feat_default_send_ack_vector;
+extern int dccp_feat_default_send_ndp_count;
+
+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),
+                .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),
+                .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),
+                .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),
+                .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),
+                .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),
+                .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,
+        },
+        { .ctl_name = 0, },
+};
+
+static struct ctl_table dccp_dir_table[] = {
+        {
+                .ctl_name       = NET_DCCP,
+                .procname       = "dccp",
+                .mode           = 0555,
+                .child          = dccp_table,
+        },
+        { .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_table_header *dccp_table_header;
+
+int __init dccp_sysctl_init(void)
+{
+        dccp_table_header = register_sysctl_table(dccp_root_table, 1);
+
+        return dccp_table_header != NULL ? 0 : -ENOMEM;
+}
+
+void dccp_sysctl_exit(void)
+{
+        if (dccp_table_header != NULL) {
+                unregister_sysctl_table(dccp_table_header);
+                dccp_table_header = NULL;
+        }
+}