[SCTP] Mark as "unsafe" module. Some dead code removal.

include/net/sctp/constants.h

@@ -107,56 +107,37 @@ typedef enum {
  */
 
 typedef enum {
-
 	SCTP_EVENT_TIMEOUT_NONE = 0,
 	SCTP_EVENT_TIMEOUT_T1_COOKIE,
 	SCTP_EVENT_TIMEOUT_T1_INIT,
 	SCTP_EVENT_TIMEOUT_T2_SHUTDOWN,
 	SCTP_EVENT_TIMEOUT_T3_RTX,
-	SCTP_EVENT_TIMEOUT_T4_RTO,
 	SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD,
 	SCTP_EVENT_TIMEOUT_HEARTBEAT,
 	SCTP_EVENT_TIMEOUT_SACK,
 	SCTP_EVENT_TIMEOUT_AUTOCLOSE,
-
 } sctp_event_timeout_t;
 
 #define SCTP_EVENT_TIMEOUT_MAX		SCTP_EVENT_TIMEOUT_AUTOCLOSE
 #define SCTP_NUM_TIMEOUT_TYPES		(SCTP_EVENT_TIMEOUT_MAX + 1)
 
 typedef enum {
-
 	SCTP_EVENT_NO_PENDING_TSN = 0,
-	SCTP_EVENT_ICMP_UNREACHFRAG,
-
 } sctp_event_other_t;
 
-#define SCTP_EVENT_OTHER_MAX		SCTP_EVENT_ICMP_UNREACHFRAG
+#define SCTP_EVENT_OTHER_MAX		SCTP_EVENT_NO_PENDING_TSN
 #define SCTP_NUM_OTHER_TYPES		(SCTP_EVENT_OTHER_MAX + 1)
 
 /* These are primitive requests from the ULP.  */
 typedef enum {
-
-	SCTP_PRIMITIVE_INITIALIZE = 0,
-	SCTP_PRIMITIVE_ASSOCIATE,
+	SCTP_PRIMITIVE_ASSOCIATE = 0,
 	SCTP_PRIMITIVE_SHUTDOWN,
 	SCTP_PRIMITIVE_ABORT,
 	SCTP_PRIMITIVE_SEND,
-	SCTP_PRIMITIVE_SETPRIMARY,
-	SCTP_PRIMITIVE_RECEIVE,
-	SCTP_PRIMITIVE_STATUS,
-	SCTP_PRIMITIVE_CHANGEHEARTBEAT,
 	SCTP_PRIMITIVE_REQUESTHEARTBEAT,
-	SCTP_PRIMITIVE_GETSRTTREPORT,
-	SCTP_PRIMITIVE_SETFAILURETHRESHOLD,
-	SCTP_PRIMITIVE_SETPROTOPARAMETERS,
-	SCTP_PRIMITIVE_RECEIVE_UNSENT,
-	SCTP_PRIMITIVE_RECEIVE_UNACKED,
-	SCTP_PRIMITIVE_DESTROY,
-
 } sctp_event_primitive_t;
 
-#define SCTP_EVENT_PRIMITIVE_MAX	SCTP_PRIMITIVE_DESTROY
+#define SCTP_EVENT_PRIMITIVE_MAX	SCTP_PRIMITIVE_REQUESTHEARTBEAT
 #define SCTP_NUM_PRIMITIVE_TYPES	(SCTP_EVENT_PRIMITIVE_MAX + 1)
 
 /* We define here a utility type for manipulating subtypes.

net/sctp/debug.c

@@ -148,22 +148,11 @@ const char *sctp_status_tbl[] = {
 
 /* Printable forms of primitives */
 static const char *sctp_primitive_tbl[SCTP_NUM_PRIMITIVE_TYPES] = {
-	"PRIMITIVE_INITIALIZE",
 	"PRIMITIVE_ASSOCIATE",
 	"PRIMITIVE_SHUTDOWN",
 	"PRIMITIVE_ABORT",
 	"PRIMITIVE_SEND",
-	"PRIMITIVE_SETPRIMARY",
-	"PRIMITIVE_RECEIVE",
-	"PRIMITIVE_STATUS",
-	"PRIMITIVE_CHANGEHEARTBEAT",
 	"PRIMITIVE_REQUESTHEARTBEAT",
-	"PRIMITIVE_GETSRTTREPORT",
-	"PRIMITIVE_SETFAILURETHRESHOLD",
-	"PRIMITIVE_SETPROTOPARAMETERS",
-	"PRIMITIVE_RECEIVE_UNSENT",
-	"PRIMITIVE_RECEIVE_UNACKED",
-	"PRIMITIVE_DESTROY"
 };
 
 /* Lookup primitive debug name. */
@@ -178,7 +167,6 @@ const char *sctp_pname(const sctp_subtype_t id)
 
 static const char *sctp_other_tbl[] = {
 	"NO_PENDING_TSN",
-	"ICMP_UNREACHFRAG"
 };
 
 /* Lookup "other" debug name. */
@@ -197,7 +185,6 @@ static const char *sctp_timer_tbl[] = {
 	"TIMEOUT_T1_INIT",
 	"TIMEOUT_T2_SHUTDOWN",
 	"TIMEOUT_T3_RTX",
-	"TIMEOUT_T4_RTO",
 	"TIMEOUT_T5_SHUTDOWN_GUARD",
 	"TIMEOUT_HEARTBEAT",
 	"TIMEOUT_SACK",

net/sctp/endpointola.c

@@ -137,7 +137,6 @@ sctp_endpoint_t *sctp_endpoint_init(sctp_endpoint_t *ep, sctp_protocol_t *proto,
 	ep->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] = 
 		sp->rtoinfo.srto_initial;
 	ep->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] = 0;
-	ep->timeouts[SCTP_EVENT_TIMEOUT_T4_RTO] = 0;
 
 	/* sctpimpguide-05 Section 2.12.2
 	 * If the 'T5-shutdown-guard' timer is used, it SHOULD be set to the

net/sctp/primitive.c

@@ -203,23 +203,3 @@ DECLARE_PRIMITIVE(SEND);
  */
 
 DECLARE_PRIMITIVE(REQUESTHEARTBEAT);
-
-/* COMMENT BUG.  Find out where this is mentioned in the spec.  */
-int sctp_other_icmp_unreachfrag(sctp_association_t *asoc, void *arg)
-{
-	int error = 0;
-	sctp_event_t event_type;
-	sctp_subtype_t subtype;
-	sctp_state_t state;
-	sctp_endpoint_t *ep;
-
-	event_type = SCTP_EVENT_T_OTHER;
-	subtype = SCTP_ST_OTHER(SCTP_EVENT_ICMP_UNREACHFRAG);
-	state = asoc ? asoc->state : SCTP_STATE_CLOSED;
-	ep = asoc ? asoc->ep : NULL;
-
-	error = sctp_do_sm(event_type, subtype, state, ep,
-			   asoc, arg, GFP_ATOMIC);
-
-	return error;
-}

net/sctp/protocol.c

@@ -825,6 +825,7 @@ __init int sctp_init(void)
 
 	sctp_get_local_addr_list(&sctp_proto);
 
+	__unsafe(THIS_MODULE);
 	return 0;
 
 err_ctl_sock_init:

net/sctp/sm_sideeffect.c

@@ -966,7 +966,6 @@ sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
 	sctp_generate_t1_init_event,
 	sctp_generate_t2_shutdown_event,
 	NULL,
-	NULL,
 	sctp_generate_t5_shutdown_guard_event,
 	sctp_generate_heartbeat_event,
 	sctp_generate_sack_event,