3 files changed, 73 insertions, 27 deletions

diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index c51541ee0247..6c632e26f72d 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -264,10 +264,10 @@ enum { SCTP_MAX_DUP_TSNS = 16 };
 enum { SCTP_MAX_GABS = 16 };
 
 /* Heartbeat interval - 30 secs */
-#define SCTP_DEFAULT_TIMEOUT_HEARTBEAT  (30 * HZ)
+#define SCTP_DEFAULT_TIMEOUT_HEARTBEAT  (30*1000)
 
 /* Delayed sack timer - 200ms */
-#define SCTP_DEFAULT_TIMEOUT_SACK       ((200 * HZ) / 1000)
+#define SCTP_DEFAULT_TIMEOUT_SACK       (200)
 
 /* RTO.Initial              - 3  seconds
  * RTO.Min                  - 1  second
@@ -275,9 +275,9 @@ enum { SCTP_MAX_GABS = 16 };
  * RTO.Alpha                - 1/8
  * RTO.Beta                 - 1/4
  */
-#define SCTP_RTO_INITIAL        (3 * HZ)
-#define SCTP_RTO_MIN            (1 * HZ)
-#define SCTP_RTO_MAX            (60 * HZ)
+#define SCTP_RTO_INITIAL        (3 * 1000)
+#define SCTP_RTO_MIN            (1 * 1000)
+#define SCTP_RTO_MAX            (60 * 1000)
 
 #define SCTP_RTO_ALPHA          3   /* 1/8 when converted to right shifts. */
 #define SCTP_RTO_BETA           2   /* 1/4 when converted to right shifts. */
@@ -290,8 +290,7 @@ enum { SCTP_MAX_GABS = 16 };
 #define SCTP_DEF_MAX_INIT 6
 #define SCTP_DEF_MAX_SEND 10
 
-#define SCTP_DEFAULT_COOKIE_LIFE_SEC    60 /* seconds */
-#define SCTP_DEFAULT_COOKIE_LIFE_USEC   0  /* microseconds */
+#define SCTP_DEFAULT_COOKIE_LIFE        (60 * 1000) /* 60 seconds */
 
 #define SCTP_DEFAULT_MINWINDOW  1500    /* default minimum rwnd size */
 #define SCTP_DEFAULT_MAXWINDOW  65535   /* default rwnd size */
@@ -312,9 +311,9 @@ enum { SCTP_MAX_GABS = 16 };
                                  */
 
 #if defined (CONFIG_SCTP_HMAC_MD5)
-#define SCTP_COOKIE_HMAC_ALG "md5"
+#define SCTP_COOKIE_HMAC_ALG "hmac(md5)"
 #elif defined (CONFIG_SCTP_HMAC_SHA1)
-#define SCTP_COOKIE_HMAC_ALG "sha1"
+#define SCTP_COOKIE_HMAC_ALG "hmac(sha1)"
 #else
 #define SCTP_COOKIE_HMAC_ALG NULL
 #endif
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 92eae0e0f3f1..ee68a3124076 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -128,6 +128,8 @@ extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
                                      int flags);
 extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);
 extern int sctp_register_pf(struct sctp_pf *, sa_family_t);
+int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
+                        void *ptr);
 
 /*
  * sctp/socket.c
@@ -178,6 +180,17 @@ void sctp_backlog_migrate(struct sctp_association *assoc,
                           struct sock *oldsk, struct sock *newsk);
 
 /*
+ * sctp/proc.c
+ */
+int sctp_snmp_proc_init(void);
+void sctp_snmp_proc_exit(void);
+int sctp_eps_proc_init(void);
+void sctp_eps_proc_exit(void);
+int sctp_assocs_proc_init(void);
+void sctp_assocs_proc_exit(void);
+
+
+/*
  *  Section:  Macros, externs, and inlines
  */
 
@@ -216,6 +229,50 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
 
 #endif /* !TEST_FRAME */
 
+/* sctp mib definitions */
+enum
+{
+        SCTP_MIB_NUM = 0,
+        SCTP_MIB_CURRESTAB,                     /* CurrEstab */
+        SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
+        SCTP_MIB_PASSIVEESTABS,                 /* PassiveEstabs */
+        SCTP_MIB_ABORTEDS,                      /* Aborteds */
+        SCTP_MIB_SHUTDOWNS,                     /* Shutdowns */
+        SCTP_MIB_OUTOFBLUES,                    /* OutOfBlues */
+        SCTP_MIB_CHECKSUMERRORS,                /* ChecksumErrors */
+        SCTP_MIB_OUTCTRLCHUNKS,                 /* OutCtrlChunks */
+        SCTP_MIB_OUTORDERCHUNKS,                /* OutOrderChunks */
+        SCTP_MIB_OUTUNORDERCHUNKS,              /* OutUnorderChunks */
+        SCTP_MIB_INCTRLCHUNKS,                  /* InCtrlChunks */
+        SCTP_MIB_INORDERCHUNKS,                 /* InOrderChunks */
+        SCTP_MIB_INUNORDERCHUNKS,               /* InUnorderChunks */
+        SCTP_MIB_FRAGUSRMSGS,                   /* FragUsrMsgs */
+        SCTP_MIB_REASMUSRMSGS,                  /* ReasmUsrMsgs */
+        SCTP_MIB_OUTSCTPPACKS,                  /* OutSCTPPacks */
+        SCTP_MIB_INSCTPPACKS,                   /* InSCTPPacks */
+        SCTP_MIB_T1_INIT_EXPIREDS,
+        SCTP_MIB_T1_COOKIE_EXPIREDS,
+        SCTP_MIB_T2_SHUTDOWN_EXPIREDS,
+        SCTP_MIB_T3_RTX_EXPIREDS,
+        SCTP_MIB_T4_RTO_EXPIREDS,
+        SCTP_MIB_T5_SHUTDOWN_GUARD_EXPIREDS,
+        SCTP_MIB_DELAY_SACK_EXPIREDS,
+        SCTP_MIB_AUTOCLOSE_EXPIREDS,
+        SCTP_MIB_T3_RETRANSMITS,
+        SCTP_MIB_PMTUD_RETRANSMITS,
+        SCTP_MIB_FAST_RETRANSMITS,
+        SCTP_MIB_IN_PKT_SOFTIRQ,
+        SCTP_MIB_IN_PKT_BACKLOG,
+        SCTP_MIB_IN_PKT_DISCARDS,
+        SCTP_MIB_IN_DATA_CHUNK_DISCARDS,
+        __SCTP_MIB_MAX
+};
+
+#define SCTP_MIB_MAX    __SCTP_MIB_MAX
+struct sctp_mib {
+        unsigned long   mibs[SCTP_MIB_MAX];
+} __SNMP_MIB_ALIGN__;
+
 
 /* Print debugging messages.  */
 #if SCTP_DEBUG
@@ -330,17 +387,6 @@ static inline void sctp_v6_exit(void) { return; }
 
 #endif /* #if defined(CONFIG_IPV6) */
 
-/* Some wrappers, in case crypto not available. */
-#if defined (CONFIG_CRYPTO_HMAC)
-#define sctp_crypto_alloc_tfm crypto_alloc_tfm
-#define sctp_crypto_free_tfm crypto_free_tfm
-#define sctp_crypto_hmac crypto_hmac
-#else
-#define sctp_crypto_alloc_tfm(x...) NULL
-#define sctp_crypto_free_tfm(x...)
-#define sctp_crypto_hmac(x...)
-#endif
-
 
 /* Map an association to an assoc_id. */
 static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index e5aa7ff1f5b5..c6d93bb0dcd2 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -87,6 +87,7 @@ struct sctp_bind_addr;
 struct sctp_ulpq;
 struct sctp_ep_common;
 struct sctp_ssnmap;
+struct crypto_hash;
 
 
 #include <net/sctp/tsnmap.h>
@@ -127,9 +128,9 @@ extern struct sctp_globals {
          * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
          * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
          */
-        unsigned long rto_initial;
-        unsigned long rto_min;
-        unsigned long rto_max;
+        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.
@@ -144,13 +145,13 @@ extern struct sctp_globals {
         int cookie_preserve_enable;
 
         /* Valid.Cookie.Life        - 60  seconds  */
-        unsigned long valid_cookie_life;
+        unsigned int valid_cookie_life;
 
         /* Delayed SACK timeout  200ms default*/
-        unsigned long sack_timeout;
+        unsigned int sack_timeout;
 
         /* HB.interval              - 30 seconds  */
-        unsigned long hb_interval;
+        unsigned int hb_interval;
 
         /* Association.Max.Retrans  - 10 attempts
          * Path.Max.Retrans         - 5  attempts (per destination address)
@@ -264,7 +265,7 @@ struct sctp_sock {
         struct sctp_pf *pf;
 
         /* Access to HMAC transform. */
-        struct crypto_tfm *hmac;
+        struct crypto_hash *hmac;
 
         /* What is our base endpointer? */
         struct sctp_endpoint *ep;