1 files changed, 10 insertions, 144 deletions

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index fc5e60016e37..0fef00f5d3ce 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -102,6 +102,7 @@ struct sctp_bind_bucket {
         unsigned short  fastreuse;
         struct hlist_node       node;
         struct hlist_head       owner;
+        struct net      *net;
 };
 
 struct sctp_bind_hashbucket {
@@ -118,69 +119,6 @@ struct sctp_hashbucket {
 
 /* The SCTP globals structure. */
 extern struct sctp_globals {
-        /* RFC2960 Section 14. Suggested SCTP Protocol Parameter Values
-         *
-         * The following protocol parameters are RECOMMENDED:
-         *
-         * RTO.Initial              - 3  seconds
-         * RTO.Min                  - 1  second
-         * RTO.Max                 -  60 seconds
-         * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
-         * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
-         */
-        unsigned int rto_initial;
-        unsigned int rto_min;
-        unsigned int rto_max;
-
-        /* Note: rto_alpha and rto_beta are really defined as inverse
-         * powers of two to facilitate integer operations.
-         */
-        int rto_alpha;
-        int rto_beta;
-
-        /* Max.Burst                - 4 */
-        int max_burst;
-
-        /* Whether Cookie Preservative is enabled(1) or not(0) */
-        int cookie_preserve_enable;
-
-        /* Valid.Cookie.Life        - 60  seconds  */
-        unsigned int valid_cookie_life;
-
-        /* Delayed SACK timeout  200ms default*/
-        unsigned int sack_timeout;
-
-        /* HB.interval              - 30 seconds  */
-        unsigned int hb_interval;
-
-        /* Association.Max.Retrans  - 10 attempts
-         * Path.Max.Retrans         - 5  attempts (per destination address)
-         * Max.Init.Retransmits     - 8  attempts
-         */
-        int max_retrans_association;
-        int max_retrans_path;
-        int max_retrans_init;
-
-        /* Potentially-Failed.Max.Retrans sysctl value
-         * taken from:
-         * http://tools.ietf.org/html/draft-nishida-tsvwg-sctp-failover-05
-         */
-        int pf_retrans;
-
-        /*
-         * Policy for preforming sctp/socket accounting
-         * 0   - do socket level accounting, all assocs share sk_sndbuf
-         * 1   - do sctp accounting, each asoc may use sk_sndbuf bytes
-         */
-        int sndbuf_policy;
-
-        /*
-         * Policy for preforming sctp/socket accounting
-         * 0   - do socket level accounting, all assocs share sk_rcvbuf
-         * 1   - do sctp accounting, each asoc may use sk_rcvbuf bytes
-         */
-        int rcvbuf_policy;
-
         /* The following variables are implementation specific.  */
 
         /* Default initialization values to be applied to new associations. */
@@ -204,70 +142,11 @@ extern struct sctp_globals {
         int port_hashsize;
         struct sctp_bind_hashbucket *port_hashtable;
 
-        /* This is the global local address list.
-         * We actively maintain this complete list of addresses on
-         * the system by catching address add/delete events.
-         *
-         * It is a list of sctp_sockaddr_entry.
-         */
-        struct list_head local_addr_list;
-        int default_auto_asconf;
-        struct list_head addr_waitq;
-        struct timer_list addr_wq_timer;
-        struct list_head auto_asconf_splist;
-        spinlock_t addr_wq_lock;
-
-        /* Lock that protects the local_addr_list writers */
-        spinlock_t addr_list_lock;
-        
-        /* Flag to indicate if addip is enabled. */
-        int addip_enable;
-        int addip_noauth_enable;
-
-        /* Flag to indicate if PR-SCTP is enabled. */
-        int prsctp_enable;
-
-        /* Flag to idicate if SCTP-AUTH is enabled */
-        int auth_enable;
-
-        /*
-         * Policy to control SCTP IPv4 address scoping
-         * 0   - Disable IPv4 address scoping
-         * 1   - Enable IPv4 address scoping
-         * 2   - Selectively allow only IPv4 private addresses
-         * 3   - Selectively allow only IPv4 link local address
-         */
-        int ipv4_scope_policy;
-
         /* Flag to indicate whether computing and verifying checksum
          * is disabled. */
         bool checksum_disable;
-
-        /* Threshold for rwnd update SACKS.  Receive buffer shifted this many
-         * bits is an indicator of when to send and window update SACK.
-         */
-        int rwnd_update_shift;
-
-        /* Threshold for autoclose timeout, in seconds. */
-        unsigned long max_autoclose;
 } sctp_globals;
 
-#define sctp_rto_initial                (sctp_globals.rto_initial)
-#define sctp_rto_min                    (sctp_globals.rto_min)
-#define sctp_rto_max                    (sctp_globals.rto_max)
-#define sctp_rto_alpha                  (sctp_globals.rto_alpha)
-#define sctp_rto_beta                   (sctp_globals.rto_beta)
-#define sctp_max_burst                  (sctp_globals.max_burst)
-#define sctp_valid_cookie_life          (sctp_globals.valid_cookie_life)
-#define sctp_cookie_preserve_enable     (sctp_globals.cookie_preserve_enable)
-#define sctp_max_retrans_association    (sctp_globals.max_retrans_association)
-#define sctp_sndbuf_policy              (sctp_globals.sndbuf_policy)
-#define sctp_rcvbuf_policy              (sctp_globals.rcvbuf_policy)
-#define sctp_max_retrans_path           (sctp_globals.max_retrans_path)
-#define sctp_pf_retrans                 (sctp_globals.pf_retrans)
-#define sctp_max_retrans_init           (sctp_globals.max_retrans_init)
-#define sctp_sack_timeout               (sctp_globals.sack_timeout)
-#define sctp_hb_interval                (sctp_globals.hb_interval)
 #define sctp_max_instreams              (sctp_globals.max_instreams)
 #define sctp_max_outstreams             (sctp_globals.max_outstreams)
 #define sctp_address_families           (sctp_globals.address_families)
@@ -277,21 +156,7 @@ extern struct sctp_globals {
 #define sctp_assoc_hashtable            (sctp_globals.assoc_hashtable)
 #define sctp_port_hashsize              (sctp_globals.port_hashsize)
 #define sctp_port_hashtable             (sctp_globals.port_hashtable)
-#define sctp_local_addr_list            (sctp_globals.local_addr_list)
-#define sctp_local_addr_lock            (sctp_globals.addr_list_lock)
-#define sctp_auto_asconf_splist         (sctp_globals.auto_asconf_splist)
-#define sctp_addr_waitq                 (sctp_globals.addr_waitq)
-#define sctp_addr_wq_timer              (sctp_globals.addr_wq_timer)
-#define sctp_addr_wq_lock               (sctp_globals.addr_wq_lock)
-#define sctp_default_auto_asconf        (sctp_globals.default_auto_asconf)
-#define sctp_scope_policy               (sctp_globals.ipv4_scope_policy)
-#define sctp_addip_enable               (sctp_globals.addip_enable)
-#define sctp_addip_noauth               (sctp_globals.addip_noauth_enable)
-#define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
-#define sctp_auth_enable                (sctp_globals.auth_enable)
 #define sctp_checksum_disable           (sctp_globals.checksum_disable)
-#define sctp_rwnd_upd_shift             (sctp_globals.rwnd_update_shift)
-#define sctp_max_autoclose              (sctp_globals.max_autoclose)
 
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
@@ -1085,7 +950,7 @@ struct sctp_transport {
         __u64 hb_nonce;
 };
 
-struct sctp_transport *sctp_transport_new(const union sctp_addr *,
+struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
                                           gfp_t);
 void sctp_transport_set_owner(struct sctp_transport *,
                               struct sctp_association *);
@@ -1240,7 +1105,7 @@ struct sctp_bind_addr {
 
 void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port);
 void sctp_bind_addr_free(struct sctp_bind_addr *);
-int sctp_bind_addr_copy(struct sctp_bind_addr *dest,
+int sctp_bind_addr_copy(struct net *net, struct sctp_bind_addr *dest,
                         const struct sctp_bind_addr *src,
                         sctp_scope_t scope, gfp_t gfp,
                         int flags);
@@ -1267,7 +1132,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw, int len,
                            __u16 port, gfp_t gfp);
 
 sctp_scope_t sctp_scope(const union sctp_addr *);
-int sctp_in_scope(const union sctp_addr *addr, const sctp_scope_t scope);
+int sctp_in_scope(struct net *net, const union sctp_addr *addr, const sctp_scope_t scope);
 int sctp_is_any(struct sock *sk, const union sctp_addr *addr);
 int sctp_addr_is_valid(const union sctp_addr *addr);
 int sctp_is_ep_boundall(struct sock *sk);
@@ -1425,13 +1290,13 @@ struct sctp_association *sctp_endpoint_lookup_assoc(
 int sctp_endpoint_is_peeled_off(struct sctp_endpoint *,
                                 const union sctp_addr *);
 struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *,
-                                        const union sctp_addr *);
-int sctp_has_association(const union sctp_addr *laddr,
+                                        struct net *, const union sctp_addr *);
+int sctp_has_association(struct net *net, const union sctp_addr *laddr,
                          const union sctp_addr *paddr);
 
-int sctp_verify_init(const struct sctp_association *asoc, sctp_cid_t,
-                     sctp_init_chunk_t *peer_init, struct sctp_chunk *chunk,
-                     struct sctp_chunk **err_chunk);
+int sctp_verify_init(struct net *net, const struct sctp_association *asoc,
+                     sctp_cid_t, sctp_init_chunk_t *peer_init,
+                     struct sctp_chunk *chunk, struct sctp_chunk **err_chunk);
 int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,
                       const union sctp_addr *peer,
                       sctp_init_chunk_t *init, gfp_t gfp);
@@ -2013,6 +1878,7 @@ void sctp_assoc_control_transport(struct sctp_association *,
                                   sctp_transport_cmd_t, sctp_sn_error_t);
 struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *, __u32);
 struct sctp_transport *sctp_assoc_is_match(struct sctp_association *,
+                                           struct net *,
                                            const union sctp_addr *,
                                            const union sctp_addr *);
 void sctp_assoc_migrate(struct sctp_association *, struct sock *);