vserver 2.0 rc7

[linux-2.6.git] / include / linux / sysctl.h

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index b0fd3cf..7364a13 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -135,7 +135,8 @@ enum
        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
        KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
        KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
-       KERN_VSHELPER=68,       /* string: path to vshelper policy agent */
+       KERN_RANDOMIZE=68, /* int: randomize virtual address space */
+       KERN_VSHELPER=69,       /* string: path to vshelper policy agent */
 };
 
 
@@ -346,6 +347,7 @@ enum
        NET_TCP_MODERATE_RCVBUF=106,
        NET_TCP_TSO_WIN_DIVISOR=107,
        NET_TCP_BIC_BETA=108,
+       NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109,
 };
 
 enum {
@@ -399,6 +401,8 @@ enum
        NET_IPV4_CONF_FORCE_IGMP_VERSION=17,
        NET_IPV4_CONF_ARP_ANNOUNCE=18,
        NET_IPV4_CONF_ARP_IGNORE=19,
+       NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
+       __NET_IPV4_CONF_MAX
 };
 
 /* /proc/sys/net/ipv4/netfilter */
@@ -456,7 +460,8 @@ enum {
        NET_IPV6_ROUTE_GC_INTERVAL=6,
        NET_IPV6_ROUTE_GC_ELASTICITY=7,
        NET_IPV6_ROUTE_MTU_EXPIRES=8,
-       NET_IPV6_ROUTE_MIN_ADVMSS=9
+       NET_IPV6_ROUTE_MIN_ADVMSS=9,
+       NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10
 };
 
 enum {
@@ -476,7 +481,8 @@ enum {
        NET_IPV6_REGEN_MAX_RETRY=14,
        NET_IPV6_MAX_DESYNC_FACTOR=15,
        NET_IPV6_MAX_ADDRESSES=16,
-       NET_IPV6_FORCE_MLD_VERSION=17
+       NET_IPV6_FORCE_MLD_VERSION=17,
+       __NET_IPV6_MAX
 };
 
 /* /proc/sys/net/ipv6/icmp */
@@ -501,7 +507,10 @@ enum {
        NET_NEIGH_GC_INTERVAL=13,
        NET_NEIGH_GC_THRESH1=14,
        NET_NEIGH_GC_THRESH2=15,
-       NET_NEIGH_GC_THRESH3=16
+       NET_NEIGH_GC_THRESH3=16,
+       NET_NEIGH_RETRANS_TIME_MS=17,
+       NET_NEIGH_REACHABLE_TIME_MS=18,
+       __NET_NEIGH_MAX
 };
 
 /* /proc/sys/net/ipx */
@@ -637,6 +646,7 @@ enum {
        NET_SCTP_MAX_BURST               = 12,
        NET_SCTP_ADDIP_ENABLE            = 13,
        NET_SCTP_PRSCTP_ENABLE           = 14,
+       NET_SCTP_SNDBUF_POLICY           = 15,
 };
 
 /* /proc/sys/net/bridge */