Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / net / ipv4 / sysctl_net_ipv4.c

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 6b6c3adfcf00954185c03c651c74cc911314122f..e82a5be894b51ca523697910daafb41c9a823e9d 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -10,7 +10,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/sysctl.h>
-#include <linux/config.h>
 #include <linux/igmp.h>
 #include <linux/inetdevice.h>
 #include <net/snmp.h>
@@ -18,6 +17,7 @@
 #include <net/ip.h>
 #include <net/route.h>
 #include <net/tcp.h>
+#include <net/cipso_ipv4.h>
 
 /* From af_inet.c */
 extern int sysctl_ip_nonlocal_bind;
@@ -129,6 +129,12 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name,
        return ret;
 }
 
+static int __init tcp_congestion_default(void)
+{
+       return tcp_set_default_congestion_control(CONFIG_DEFAULT_TCP_CONG);
+}
+
+late_initcall(tcp_congestion_default);
 
 ctl_table ipv4_table[] = {
         {
@@ -181,14 +187,6 @@ ctl_table ipv4_table[] = {
                .proc_handler   = &ipv4_doint_and_flush,
                .strategy       = &ipv4_doint_and_flush_strategy,
        },
-        {
-               .ctl_name       = NET_IPV4_AUTOCONFIG,
-               .procname       = "ip_autoconfig",
-               .data           = &ipv4_config.autoconfig,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
-       },
         {
                .ctl_name       = NET_IPV4_NO_PMTU_DISC,
                .procname       = "ip_no_pmtu_disc",
@@ -688,6 +686,58 @@ ctl_table ipv4_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
        },
+#ifdef CONFIG_NET_DMA
+       {
+               .ctl_name       = NET_TCP_DMA_COPYBREAK,
+               .procname       = "tcp_dma_copybreak",
+               .data           = &sysctl_tcp_dma_copybreak,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+#endif
+       {
+               .ctl_name       = NET_TCP_SLOW_START_AFTER_IDLE,
+               .procname       = "tcp_slow_start_after_idle",
+               .data           = &sysctl_tcp_slow_start_after_idle,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+#ifdef CONFIG_NETLABEL
+       {
+               .ctl_name       = NET_CIPSOV4_CACHE_ENABLE,
+               .procname       = "cipso_cache_enable",
+               .data           = &cipso_v4_cache_enabled,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               .ctl_name       = NET_CIPSOV4_CACHE_BUCKET_SIZE,
+               .procname       = "cipso_cache_bucket_size",
+               .data           = &cipso_v4_cache_bucketsize,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               .ctl_name       = NET_CIPSOV4_RBM_OPTFMT,
+               .procname       = "cipso_rbm_optfmt",
+               .data           = &cipso_v4_rbm_optfmt,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               .ctl_name       = NET_CIPSOV4_RBM_STRICTVALID,
+               .procname       = "cipso_rbm_strictvalid",
+               .data           = &cipso_v4_rbm_strictvalid,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+#endif /* CONFIG_NETLABEL */
        { .ctl_name = 0 }
 };