svn commit: r235412 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun May 13 17:17:13 2012
New Revision: 235412
URL: http://svn.freebsd.org/changeset/base/235412

Log:
  Remove unused constants.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_constants.h
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctp_constants.h
==============================================================================
--- head/sys/netinet/sctp_constants.h	Sun May 13 17:15:30 2012	(r235411)
+++ head/sys/netinet/sctp_constants.h	Sun May 13 17:17:13 2012	(r235412)
@@ -756,34 +756,26 @@ __FBSDID("$FreeBSD$");
 #define SCTP_NOTIFY_INTERFACE_DOWN               3
 #define SCTP_NOTIFY_INTERFACE_UP                 4
 #define SCTP_NOTIFY_DG_FAIL                      5
-#define SCTP_NOTIFY_STRDATA_ERR                  6
+#define SCTP_NOTIFY_SPECIAL_SP_FAIL              6
 #define SCTP_NOTIFY_ASSOC_LOC_ABORTED            7
-#define SCTP_NOTIFY_PEER_OPENED_STREAM           8
-#define SCTP_NOTIFY_STREAM_OPENED_OK             9
-#define SCTP_NOTIFY_ASSOC_RESTART               10
-#define SCTP_NOTIFY_HB_RESP                     11
-#define SCTP_NOTIFY_ASCONF_SUCCESS              12
-#define SCTP_NOTIFY_ASCONF_FAILED               13
-#define SCTP_NOTIFY_PEER_SHUTDOWN               14
-#define SCTP_NOTIFY_ASCONF_ADD_IP               15
-#define SCTP_NOTIFY_ASCONF_DELETE_IP            16
-#define SCTP_NOTIFY_ASCONF_SET_PRIMARY          17
-#define SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION 18
-#define SCTP_NOTIFY_INTERFACE_CONFIRMED         20
-#define SCTP_NOTIFY_STR_RESET_RECV              21
-#define SCTP_NOTIFY_STR_RESET_SEND              22
-#define SCTP_NOTIFY_STR_RESET_FAILED_OUT        23
-#define SCTP_NOTIFY_STR_RESET_FAILED_IN         24
-#define SCTP_NOTIFY_AUTH_NEW_KEY                25
-#define SCTP_NOTIFY_AUTH_FREE_KEY               26
-#define SCTP_NOTIFY_SPECIAL_SP_FAIL             27
-#define SCTP_NOTIFY_NO_PEER_AUTH                28
-#define SCTP_NOTIFY_SENDER_DRY                  29
-#define SCTP_NOTIFY_STR_RESET_DENIED_OUT        30
-#define SCTP_NOTIFY_STR_RESET_DENIED_IN         31
-#define SCTP_NOTIFY_ASSOC_REM_ABORTED           32
-#define SCTP_NOTIFY_MAX                         32
-
+#define SCTP_NOTIFY_ASSOC_REM_ABORTED            8
+#define SCTP_NOTIFY_ASSOC_RESTART                9
+#define SCTP_NOTIFY_PEER_SHUTDOWN               10
+#define SCTP_NOTIFY_ASCONF_ADD_IP               11
+#define SCTP_NOTIFY_ASCONF_DELETE_IP            12
+#define SCTP_NOTIFY_ASCONF_SET_PRIMARY          13
+#define SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION 14
+#define SCTP_NOTIFY_INTERFACE_CONFIRMED         15
+#define SCTP_NOTIFY_STR_RESET_RECV              16
+#define SCTP_NOTIFY_STR_RESET_SEND              17
+#define SCTP_NOTIFY_STR_RESET_FAILED_OUT        18
+#define SCTP_NOTIFY_STR_RESET_FAILED_IN         19
+#define SCTP_NOTIFY_STR_RESET_DENIED_OUT        20
+#define SCTP_NOTIFY_STR_RESET_DENIED_IN         21
+#define SCTP_NOTIFY_AUTH_NEW_KEY                22
+#define SCTP_NOTIFY_AUTH_FREE_KEY               23
+#define SCTP_NOTIFY_NO_PEER_AUTH                24
+#define SCTP_NOTIFY_SENDER_DRY                  25
 
 /* This is the value for messages that are NOT completely
  * copied down where we will start to split the message.

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Sun May 13 17:15:30 2012	(r235411)
+++ head/sys/netinet/sctputil.c	Sun May 13 17:17:13 2012	(r235412)
@@ -3556,8 +3556,6 @@ sctp_ulp_notify(uint32_t notification, s
 			sctp_notify_partial_delivery_indication(stcb, error, val, so_locked);
 			break;
 		}
-	case SCTP_NOTIFY_STRDATA_ERR:
-		break;
 	case SCTP_NOTIFY_ASSOC_LOC_ABORTED:
 		if ((stcb) && (((stcb->asoc.state & SCTP_STATE_MASK) == SCTP_STATE_COOKIE_WAIT) ||
 		    ((stcb->asoc.state & SCTP_STATE_MASK) == SCTP_STATE_COOKIE_ECHOED))) {
@@ -3574,10 +3572,6 @@ sctp_ulp_notify(uint32_t notification, s
 			sctp_notify_assoc_change(SCTP_COMM_LOST, stcb, error, data, 1, so_locked);
 		}
 		break;
-	case SCTP_NOTIFY_PEER_OPENED_STREAM:
-		break;
-	case SCTP_NOTIFY_STREAM_OPENED_OK:
-		break;
 	case SCTP_NOTIFY_ASSOC_RESTART:
 		sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, 0, so_locked);
 		if (stcb->asoc.peer_supports_auth == 0) {
@@ -3585,8 +3579,6 @@ sctp_ulp_notify(uint32_t notification, s
 			    NULL, so_locked);
 		}
 		break;
-	case SCTP_NOTIFY_HB_RESP:
-		break;
 	case SCTP_NOTIFY_STR_RESET_SEND:
 		sctp_notify_stream_reset(stcb, error, ((uint16_t *) data), SCTP_STREAM_RESET_OUTGOING_SSN);
 		break;
@@ -3621,10 +3613,6 @@ sctp_ulp_notify(uint32_t notification, s
 		sctp_notify_peer_addr_change(stcb, SCTP_ADDR_MADE_PRIM, data,
 		    error);
 		break;
-	case SCTP_NOTIFY_ASCONF_SUCCESS:
-		break;
-	case SCTP_NOTIFY_ASCONF_FAILED:
-		break;
 	case SCTP_NOTIFY_PEER_SHUTDOWN:
 		sctp_notify_shutdown_event(stcb);
 		break;