netfilter: nf_conntrack: pass template to l4proto ->error() handler

[safe/jmp/linux-2.6] / include / linux / sctp.h

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index c2731bf..c20d3ce 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -242,6 +242,7 @@ enum {
        SCTP_DATA_FIRST_FRAG    = 0x02,
        SCTP_DATA_NOT_FRAG      = 0x03,
        SCTP_DATA_UNORDERED     = 0x04,
+       SCTP_DATA_SACK_IMM      = 0x08,
 };
 enum { SCTP_DATA_FRAG_MASK = 0x03, };
 
@@ -487,17 +488,17 @@ typedef enum {
         *
         * Value          Cause Code
         * ---------      ----------------
-        * 0x0100          Request to Delete Last Remaining IP Address.
-        * 0x0101          Operation Refused Due to Resource Shortage.
-        * 0x0102          Request to Delete Source IP Address.
-        * 0x0103          Association Aborted due to illegal ASCONF-ACK
-        * 0x0104          Request refused - no authorization.
+        * 0x00A0          Request to Delete Last Remaining IP Address.
+        * 0x00A1          Operation Refused Due to Resource Shortage.
+        * 0x00A2          Request to Delete Source IP Address.
+        * 0x00A3          Association Aborted due to illegal ASCONF-ACK
+        * 0x00A4          Request refused - no authorization.
         */
-       SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x0100),
-       SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x0101),
-       SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x0102),
-       SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x0103),
-       SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x0104),
+       SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x00A0),
+       SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x00A1),
+       SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x00A2),
+       SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x00A3),
+       SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x00A4),
 
        /* AUTH Section 4.  New Error Cause
         *