svn commit: r234802 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun Apr 29 16:35:55 2012
New Revision: 234802
URL: http://svn.freebsd.org/changeset/base/234802

Log:
  MFC r234699:
  Fix a type in an SCTP AUTH related notification. Keep the old name
  for backwards compatibility.
  Spotted by Irene Ruengeler.

Modified:
  stable/9/sys/netinet/sctp_auth.c
  stable/9/sys/netinet/sctp_uio.h
  stable/9/sys/netinet/sctputil.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_auth.c
==============================================================================
--- stable/9/sys/netinet/sctp_auth.c	Sun Apr 29 16:33:30 2012	(r234801)
+++ stable/9/sys/netinet/sctp_auth.c	Sun Apr 29 16:35:55 2012	(r234802)
@@ -1801,7 +1801,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, 
 			 * shared_key_id, (void
 			 * *)stcb->asoc.authinfo.recv_keyid);
 			 */
-			sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY,
+			sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY,
 			    shared_key_id, stcb->asoc.authinfo.recv_keyid,
 			    SCTP_SO_NOT_LOCKED);
 		/* compute a new recv assoc key and cache it */

Modified: stable/9/sys/netinet/sctp_uio.h
==============================================================================
--- stable/9/sys/netinet/sctp_uio.h	Sun Apr 29 16:33:30 2012	(r234801)
+++ stable/9/sys/netinet/sctp_uio.h	Sun Apr 29 16:35:55 2012	(r234802)
@@ -424,7 +424,8 @@ struct sctp_authkey_event {
 };
 
 /* indication values */
-#define SCTP_AUTH_NEWKEY	0x0001
+#define SCTP_AUTH_NEW_KEY	0x0001
+#define SCTP_AUTH_NEWKEY	SCTP_AUTH_NEW_KEY
 #define SCTP_AUTH_NO_AUTH	0x0002
 #define SCTP_AUTH_FREE_KEY	0x0003
 

Modified: stable/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c	Sun Apr 29 16:33:30 2012	(r234801)
+++ stable/9/sys/netinet/sctputil.c	Sun Apr 29 16:35:55 2012	(r234802)
@@ -3531,7 +3531,7 @@ sctp_ulp_notify(uint32_t notification, s
 		sctp_notify_shutdown_event(stcb);
 		break;
 	case SCTP_NOTIFY_AUTH_NEW_KEY:
-		sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error,
+		sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error,
 		    (uint16_t) (uintptr_t) data,
 		    so_locked);
 		break;