1 files changed, 32 insertions, 47 deletions

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0a248b323d87..6ee76c804893 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -19,9 +19,8 @@
  * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU CC; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with GNU CC; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Please send any bug reports or fixes you make to the
  * email addresses:
@@ -650,7 +649,6 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len,
                           struct iovec *data);
 void sctp_chunk_free(struct sctp_chunk *);
 void  *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);
-void  *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, const void *data);
 struct sctp_chunk *sctp_chunkify(struct sk_buff *,
                                  const struct sctp_association *,
                                  struct sock *);
@@ -1358,12 +1356,6 @@ struct sctp_association {
 
         /* This is all information about our peer.  */
         struct {
-                /* rwnd
-                 *
-                 * Peer Rwnd   : Current calculated value of the peer's rwnd.
-                 */
-                __u32 rwnd;
-
                 /* transport_addr_list
                  *
                  * Peer        : A list of SCTP transport addresses that the
@@ -1381,6 +1373,12 @@ struct sctp_association {
                  */
                 struct list_head transport_addr_list;
 
+                /* rwnd
+                 *
+                 * Peer Rwnd   : Current calculated value of the peer's rwnd.
+                 */
+                __u32 rwnd;
+
                 /* transport_count
                  *
                  * Peer        : A count of the number of peer addresses
@@ -1463,6 +1461,20 @@ struct sctp_association {
                  */
                 struct sctp_tsnmap tsn_map;
 
+                /* This mask is used to disable sending the ASCONF chunk
+                 * with specified parameter to peer.
+                 */
+                __be16 addip_disabled_mask;
+
+                /* These are capabilities which our peer advertised.  */
+                __u8    ecn_capable:1,      /* Can peer do ECN? */
+                        ipv4_address:1,     /* Peer understands IPv4 addresses? */
+                        ipv6_address:1,     /* Peer understands IPv6 addresses? */
+                        hostname_address:1, /* Peer understands DNS addresses? */
+                        asconf_capable:1,   /* Does peer support ADDIP? */
+                        prsctp_capable:1,   /* Can peer do PR-SCTP? */
+                        auth_capable:1;     /* Is peer doing SCTP-AUTH? */
+
                 /* Ack State   : This flag indicates if the next received
                  *             : packet is to be responded to with a
                  *             : SACK. This is initializedto 0.  When a packet
@@ -1477,25 +1489,11 @@ struct sctp_association {
                 __u32   sack_cnt;
                 __u32   sack_generation;
 
-                /* These are capabilities which our peer advertised.  */
-                __u8    ecn_capable:1,      /* Can peer do ECN? */
-                        ipv4_address:1,     /* Peer understands IPv4 addresses? */
-                        ipv6_address:1,     /* Peer understands IPv6 addresses? */
-                        hostname_address:1, /* Peer understands DNS addresses? */
-                        asconf_capable:1,   /* Does peer support ADDIP? */
-                        prsctp_capable:1,   /* Can peer do PR-SCTP? */
-                        auth_capable:1;     /* Is peer doing SCTP-AUTH? */
-
                 __u32   adaptation_ind;  /* Adaptation Code point. */
 
-                /* This mask is used to disable sending the ASCONF chunk
-                 * with specified parameter to peer.
-                 */
-                __be16 addip_disabled_mask;
-
                 struct sctp_inithdr_host i;
-                int cookie_len;
                 void *cookie;
+                int cookie_len;
 
                 /* ADDIP Section 4.2 Upon reception of an ASCONF Chunk.
                  * C1) ... "Peer-Serial-Number'. This value MUST be initialized to the
@@ -1527,14 +1525,14 @@ struct sctp_association {
          */
         sctp_state_t state;
 
-        /* The cookie life I award for any cookie.  */
-        ktime_t cookie_life;
-
         /* Overall     : The overall association error count.
          * Error Count : [Clear this any time I get something.]
          */
         int overall_error_count;
 
+        /* The cookie life I award for any cookie.  */
+        ktime_t cookie_life;
+
         /* These are the association's initial, max, and min RTO values.
          * These values will be initialized by system defaults, but can
          * be modified via the SCTP_RTOINFO socket option.
@@ -1589,10 +1587,9 @@ struct sctp_association {
         /* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
         __u32 param_flags;
 
+        __u32 sackfreq;
         /* SACK delay timeout */
         unsigned long sackdelay;
-        __u32 sackfreq;
-
 
         unsigned long timeouts[SCTP_NUM_TIMEOUT_TYPES];
         struct timer_list timers[SCTP_NUM_TIMEOUT_TYPES];
@@ -1600,12 +1597,12 @@ struct sctp_association {
         /* Transport to which SHUTDOWN chunk was last sent.  */
         struct sctp_transport *shutdown_last_sent_to;
 
-        /* How many times have we resent a SHUTDOWN */
-        int shutdown_retries;
-
         /* Transport to which INIT chunk was last sent.  */
         struct sctp_transport *init_last_sent_to;
 
+        /* How many times have we resent a SHUTDOWN */
+        int shutdown_retries;
+
         /* Next TSN    : The next TSN number to be assigned to a new
          *             : DATA chunk.  This is sent in the INIT or INIT
          *             : ACK chunk to the peer and incremented each
@@ -1656,17 +1653,6 @@ struct sctp_association {
         /* This is the last advertised value of rwnd over a SACK chunk. */
         __u32 a_rwnd;
 
-        /* Number of bytes by which the rwnd has slopped.  The rwnd is allowed
-         * to slop over a maximum of the association's frag_point.
-         */
-        __u32 rwnd_over;
-
-        /* Keeps treack of rwnd pressure.  This happens when we have
-         * a window, but not recevie buffer (i.e small packets).  This one
-         * is releases slowly (1 PMTU at a time ).
-         */
-        __u32 rwnd_press;
-
         /* This is the sndbuf size in use for the association.
          * This corresponds to the sndbuf size for the association,
          * as specified in the sk->sndbuf.
@@ -1810,8 +1796,8 @@ struct sctp_association {
          * after reaching 4294967295.
          */
         __u32 addip_serial;
-        union sctp_addr *asconf_addr_del_pending;
         int src_out_of_asoc_ok;
+        union sctp_addr *asconf_addr_del_pending;
         struct sctp_transport *new_transport;
 
         /* SCTP AUTH: list of the endpoint shared keys.  These
@@ -1895,8 +1881,7 @@ void sctp_assoc_update(struct sctp_association *old,
 __u32 sctp_association_get_next_tsn(struct sctp_association *);
 
 void sctp_assoc_sync_pmtu(struct sock *, struct sctp_association *);
-void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);
-void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);
+void sctp_assoc_rwnd_update(struct sctp_association *, bool);
 void sctp_assoc_set_primary(struct sctp_association *,
                             struct sctp_transport *);
 void sctp_assoc_del_nonprimary_peers(struct sctp_association *,