Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 28 insertions, 16 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 98978e73f666..fe82b1e10a29 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -26,6 +26,11 @@
 #include <linux/ipv6.h>                 /* for struct ipv6hdr */
 #include <net/ipv6.h>                   /* for ipv6_addr_copy */
 
+
+/* Connections' size value needed by ip_vs_ctl.c */
+extern int ip_vs_conn_tab_size;
+
+
 struct ip_vs_iphdr {
         int len;
         __u8 protocol;
@@ -220,6 +225,26 @@ enum {
 };
 
 /*
+ *      SCTP State Values
+ */
+enum ip_vs_sctp_states {
+        IP_VS_SCTP_S_NONE,
+        IP_VS_SCTP_S_INIT_CLI,
+        IP_VS_SCTP_S_INIT_SER,
+        IP_VS_SCTP_S_INIT_ACK_CLI,
+        IP_VS_SCTP_S_INIT_ACK_SER,
+        IP_VS_SCTP_S_ECHO_CLI,
+        IP_VS_SCTP_S_ECHO_SER,
+        IP_VS_SCTP_S_ESTABLISHED,
+        IP_VS_SCTP_S_SHUT_CLI,
+        IP_VS_SCTP_S_SHUT_SER,
+        IP_VS_SCTP_S_SHUT_ACK_CLI,
+        IP_VS_SCTP_S_SHUT_ACK_SER,
+        IP_VS_SCTP_S_CLOSED,
+        IP_VS_SCTP_S_LAST
+};
+
+/*
  *      Delta sequence info structure
  *      Each ip_vs_conn has 2 (output AND input seq. changes).
  *      Only used in the VS/NAT.
@@ -251,8 +276,7 @@ struct ip_vs_estimator {
         u32                     outbps;
 };
 
-struct ip_vs_stats
-{
+struct ip_vs_stats {
         struct ip_vs_stats_user ustats;         /* statistics */
         struct ip_vs_estimator  est;            /* estimator */
 
@@ -518,8 +542,7 @@ struct ip_vs_scheduler {
 /*
  *      The application module object (a.k.a. app incarnation)
  */
-struct ip_vs_app
-{
+struct ip_vs_app {
         struct list_head        a_list;         /* member in app list */
         int                     type;           /* IP_VS_APP_TYPE_xxx */
         char                    *name;          /* application module name */
@@ -594,17 +617,6 @@ extern void ip_vs_init_hash_table(struct list_head *table, int rows);
  *     (from ip_vs_conn.c)
  */
 
-/*
- *     IPVS connection entry hash table
- */
-#ifndef CONFIG_IP_VS_TAB_BITS
-#define CONFIG_IP_VS_TAB_BITS   12
-#endif
-
-#define IP_VS_CONN_TAB_BITS     CONFIG_IP_VS_TAB_BITS
-#define IP_VS_CONN_TAB_SIZE     (1 << IP_VS_CONN_TAB_BITS)
-#define IP_VS_CONN_TAB_MASK     (IP_VS_CONN_TAB_SIZE - 1)
-
 enum {
         IP_VS_DIR_INPUT = 0,
         IP_VS_DIR_OUTPUT,
@@ -749,7 +761,7 @@ extern struct ip_vs_protocol ip_vs_protocol_udp;
 extern struct ip_vs_protocol ip_vs_protocol_icmp;
 extern struct ip_vs_protocol ip_vs_protocol_esp;
 extern struct ip_vs_protocol ip_vs_protocol_ah;
-
+extern struct ip_vs_protocol ip_vs_protocol_sctp;
 
 /*
  *      Registering/unregistering scheduler functions