net: sctp: reorder sctp_globals to reduce cacheline usage

[mirror_ubuntu-zesty-kernel.git] / include / net / sctp / structs.h

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index e745c92a153241d6f261a646b40de71a82f2d98b..2174d8da0770a5285d3d937a1174eb9e52dd2a27 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -25,10 +25,7 @@
  *
  * Please send any bug reports or fixes you make to the
  * email addresses:
- *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- *
- * Or submit a bug report through the following website:
- *    http://www.sf.net/projects/lksctp
+ *    lksctp developers <linux-sctp@vger.kernel.org>
  *
  * Written or modified by:
  *    Randall Stewart      <randall@sctp.chicago.il.us>
@@ -46,9 +43,6 @@
  *    Ryan Layer           <rmlayer@us.ibm.com>
  *    Anup Pemmaiah        <pemmaiah@cc.usu.edu>
  *    Kevin Gao             <kevin.gao@intel.com>
- *
- * Any bugs reported given to us we will try to fix... any fixes shared will
- * be incorporated into the next SCTP release.
  */
 
 #ifndef __sctp_structs_h__
@@ -119,29 +113,27 @@ struct sctp_hashbucket {
 
 /* The SCTP globals structure. */
 extern struct sctp_globals {
-       /* The following variables are implementation specific.  */
-
-       /* Default initialization values to be applied to new associations. */
-       __u16 max_instreams;
-       __u16 max_outstreams;
-
        /* This is a list of groups of functions for each address
         * family that we support.
         */
        struct list_head address_families;
 
        /* This is the hash of all endpoints. */
-       int ep_hashsize;
        struct sctp_hashbucket *ep_hashtable;
-
        /* This is the hash of all associations. */
-       int assoc_hashsize;
        struct sctp_hashbucket *assoc_hashtable;
-
        /* This is the sctp port control hash.  */
-       int port_hashsize;
        struct sctp_bind_hashbucket *port_hashtable;
 
+       /* Sizes of above hashtables. */
+       int ep_hashsize;
+       int assoc_hashsize;
+       int port_hashsize;
+
+       /* Default initialization values to be applied to new associations. */
+       __u16 max_instreams;
+       __u16 max_outstreams;
+
        /* Flag to indicate whether computing and verifying checksum
         * is disabled. */
         bool checksum_disable;
@@ -782,6 +774,7 @@ struct sctp_transport {
 
        /* Has this transport moved the ctsn since we last sacked */
        __u32 sack_generation;
+       u32 dst_cookie;
 
        struct flowi fl;