Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / include / net / sctp / structs.h

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0a248b323d875c08ca456d62ed46c028781e9432..e9f732fda950556fd5fd0e2d6cc14ad4c7015e4d 100644 (file)
--- 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:
@@ -1358,12 +1357,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 +1374,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 +1462,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 +1490,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 +1526,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 +1588,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 +1598,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
@@ -1810,8 +1808,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