2 files changed, 86 insertions, 20 deletions

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8e7794ee27ff..f5c22d77feab 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -277,6 +277,24 @@ struct sctp_sock {
         __u32 default_context;
         __u32 default_timetolive;
 
+        /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
+         * the destination address every heartbeat interval. This value
+         * will be inherited by all new associations.
+         */
+        __u32 hbinterval;
+
+        /* This is the max_retrans value for new associations. */
+        __u16 pathmaxrxt;
+
+        /* The initial Path MTU to use for new associations. */
+        __u32 pathmtu;
+
+        /* The default SACK delay timeout for new associations. */
+        __u32 sackdelay;
+
+        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        __u32 param_flags;
+
         struct sctp_initmsg initmsg;
         struct sctp_rtoinfo rtoinfo;
         struct sctp_paddrparams paddrparam;
@@ -845,9 +863,6 @@ struct sctp_transport {
         /* Data that has been sent, but not acknowledged. */
         __u32 flight_size;
 
-        /* PMTU       : The current known path MTU.  */
-        __u32 pmtu;
-
         /* Destination */
         struct dst_entry *dst;
         /* Source address. */
@@ -862,7 +877,22 @@ struct sctp_transport {
         /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
          * the destination address every heartbeat interval.
          */
-        int hb_interval;
+        __u32 hbinterval;
+
+        /* This is the max_retrans value for the transport and will
+         * be initialized from the assocs value.  This can be changed
+         * using SCTP_SET_PEER_ADDR_PARAMS socket option.
+         */
+        __u16 pathmaxrxt;
+
+        /* PMTU       : The current known path MTU.  */
+        __u32 pathmtu;
+
+        /* SACK delay timeout */
+        __u32 sackdelay;
+
+        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        __u32 param_flags;
 
         /* When was the last time (in jiffies) that we heard from this
          * transport?  We use this to pick new active and retran paths.
@@ -882,22 +912,11 @@ struct sctp_transport {
          */
         int state;
 
-        /* hb_allowed  : The current heartbeat state of this destination,
-         *             :  i.e. ALLOW-HB, NO-HEARTBEAT, etc.
-         */
-        int hb_allowed;
-
         /* These are the error stats for this destination.  */
 
         /* Error count : The current error count for this destination.  */
         unsigned short error_count;
 
-        /* This is the max_retrans value for the transport and will
-         * be initialized to proto.max_retrans.path.  This can be changed
-         * using SCTP_SET_PEER_ADDR_PARAMS socket option.
-         */
-        int max_retrans;
-
         /* Per         : A timer used by each destination.
          * Destination :
          * Timer       :
@@ -1502,6 +1521,28 @@ struct sctp_association {
         /* The largest timeout or RTO value to use in attempting an INIT */
         __u16 max_init_timeo;
 
+        /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
+         * the destination address every heartbeat interval. This value
+         * will be inherited by all new transports.
+         */
+        __u32 hbinterval;
+
+        /* This is the max_retrans value for new transports in the
+         * association.
+         */
+        __u16 pathmaxrxt;
+
+        /* Association : The smallest PMTU discovered for all of the
+         * PMTU        : peer's transport addresses.
+         */
+        __u32 pathmtu;
+
+        /* SACK delay timeout */
+        __u32 sackdelay;
+
+        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        __u32 param_flags;
+
         int timeouts[SCTP_NUM_TIMEOUT_TYPES];
         struct timer_list timers[SCTP_NUM_TIMEOUT_TYPES];
 
@@ -1571,11 +1612,6 @@ struct sctp_association {
          */
         wait_queue_head_t       wait;
 
-        /* Association : The smallest PMTU discovered for all of the
-         * PMTU        : peer's transport addresses.
-         */
-        __u32 pmtu;
-
         /* The message size at which SCTP fragmentation will occur. */
         __u32 frag_point;
 
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index f1c3bc54526a..8a6bef6f91eb 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -93,6 +93,8 @@ enum sctp_optname {
 #define SCTP_STATUS SCTP_STATUS
         SCTP_GET_PEER_ADDR_INFO,
 #define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO
+        SCTP_DELAYED_ACK_TIME,
+#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK_TIME
 
         /* Internal Socket Options. Some of the sctp library functions are 
          * implemented using these socket options.
@@ -503,13 +505,41 @@ struct sctp_setadaption {
  *   unreachable. The following structure is used to access and modify an
  *   address's parameters:
  */
+enum  sctp_spp_flags {
+        SPP_HB_ENABLE = 1,              /*Enable heartbeats*/
+        SPP_HB_DISABLE = 2,             /*Disable heartbeats*/
+        SPP_HB = SPP_HB_ENABLE | SPP_HB_DISABLE,
+        SPP_HB_DEMAND = 4,              /*Send heartbeat immediately*/
+        SPP_PMTUD_ENABLE = 8,           /*Enable PMTU discovery*/
+        SPP_PMTUD_DISABLE = 16,         /*Disable PMTU discovery*/
+        SPP_PMTUD = SPP_PMTUD_ENABLE | SPP_PMTUD_DISABLE,
+        SPP_SACKDELAY_ENABLE = 32,      /*Enable SACK*/
+        SPP_SACKDELAY_DISABLE = 64,     /*Disable SACK*/
+        SPP_SACKDELAY = SPP_SACKDELAY_ENABLE | SPP_SACKDELAY_DISABLE,
+};
+
 struct sctp_paddrparams {
         sctp_assoc_t            spp_assoc_id;
         struct sockaddr_storage spp_address;
         __u32                   spp_hbinterval;
         __u16                   spp_pathmaxrxt;
+        __u32                   spp_pathmtu;
+        __u32                   spp_sackdelay;
+        __u32                   spp_flags;
 } __attribute__((packed, aligned(4)));
 
+/* 7.1.24. Delayed Ack Timer (SCTP_DELAYED_ACK_TIME)
+ *
+ *   This options will get or set the delayed ack timer.  The time is set
+ *   in milliseconds.  If the assoc_id is 0, then this sets or gets the
+ *   endpoints default delayed ack timer value.  If the assoc_id field is
+ *   non-zero, then the set or get effects the specified association.
+ */
+struct sctp_assoc_value {
+    sctp_assoc_t            assoc_id;
+    uint32_t                assoc_value;
+};
+
 /*
  * 7.2.2 Peer Address Information
  *