Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / include / net / sctp / constants.h

diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index c29707d654c065c3b7470166c6318e06137580e6..ca50e0751e47aabda8beac5a8af9eeff07dc88db 100644 (file)
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -49,7 +49,6 @@
 
 #include <linux/sctp.h>
 #include <linux/ipv6.h> /* For ipv6hdr. */
-#include <net/sctp/user.h>
 #include <net/tcp_states.h>  /* For TCP states used in sctp_sock_state_t */
 
 /* Value used for stream negotiation. */
@@ -303,7 +302,7 @@ enum { SCTP_MAX_GABS = 16 };
                                          * to which we will raise the P-MTU.
                                         */
 #define SCTP_DEFAULT_MINSEGMENT 512    /* MTU size ... if no mtu disc */
-#define SCTP_HOW_MANY_SECRETS 2                /* How many secrets I keep */
+
 #define SCTP_SECRET_SIZE 32            /* Number of octets in a 256 bits. */
 
 #define SCTP_SIGNATURE_SIZE 20         /* size of a SLA-1 signature */