This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / net / ip_vs.h

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 7fee4c0..9ba2479 100644 (file)
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -8,7 +8,7 @@
 
 #include <asm/types.h>         /* For __uXX types */
 
-#define IP_VS_VERSION_CODE     0x010201
+#define IP_VS_VERSION_CODE     0x010200
 #define NVERSION(version)                      \
        (version >> 16) & 0xFF,                 \
        (version >> 8) & 0xFF,                  \
@@ -358,7 +358,6 @@ enum {
        NET_IPV4_VS_EXPIRE_NODEST_CONN=23,
        NET_IPV4_VS_SYNC_THRESHOLD=24,
        NET_IPV4_VS_NAT_ICMP_SEND=25,
-       NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26,
        NET_IPV4_VS_LAST
 };
 
@@ -880,7 +879,6 @@ extern int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
  */
 extern int sysctl_ip_vs_cache_bypass;
 extern int sysctl_ip_vs_expire_nodest_conn;
-extern int sysctl_ip_vs_expire_quiescent_template;
 extern int sysctl_ip_vs_sync_threshold[2];
 extern int sysctl_ip_vs_nat_icmp_send;
 extern struct ip_vs_stats ip_vs_stats;