From 78f2804527fbf6af772ce2526ede9efedf6971f6 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Thu, 26 Apr 2012 11:07:15 +0000 Subject: [PATCH] Fix a type in an SCTP AUTH related notification. Keep the old name for backwards compatibility. Spotted by Irene Ruengeler. MFC after: 3 days --- sys/netinet/sctp_auth.c | 2 +- sys/netinet/sctp_uio.h | 3 ++- sys/netinet/sctputil.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index b5bae4dfee4d..bae310bdb2e9 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -1801,7 +1801,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, * 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 */ diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h index 31b0136954bd..5356ec84f860 100644 --- a/sys/netinet/sctp_uio.h +++ b/sys/netinet/sctp_uio.h @@ -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 diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index b3fe72889b59..2ce2eafee7cf 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3531,7 +3531,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, 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;