svn commit: r364605 - stable/12/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Mon Aug 24 07:42:53 UTC 2020
Author: tuexen
Date: Mon Aug 24 07:42:50 2020
New Revision: 364605
URL: https://svnweb.freebsd.org/changeset/base/364605
Log:
MFC r362054:
Non-functional changes due to upstream cleanup.
Modified:
stable/12/sys/netinet/sctp_asconf.c
stable/12/sys/netinet/sctp_auth.c
stable/12/sys/netinet/sctp_input.c
stable/12/sys/netinet/sctp_output.c
stable/12/sys/netinet/sctp_output.h
stable/12/sys/netinet/sctp_peeloff.c
stable/12/sys/netinet/sctp_timer.c
stable/12/sys/netinet/sctp_usrreq.c
stable/12/sys/netinet/sctputil.c
stable/12/sys/netinet/sctputil.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/12/sys/netinet/sctp_asconf.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_asconf.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
* SCTP_DEBUG_ASCONF2: detailed info
*/
-
/*
* RFC 5061
*
Modified: stable/12/sys/netinet/sctp_auth.c
==============================================================================
--- stable/12/sys/netinet/sctp_auth.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_auth.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -565,9 +565,7 @@ sctp_auth_key_acquire(struct sctp_tcb *stcb, uint16_t
}
void
-sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t key_id, int so_locked
- SCTP_UNUSED
-)
+sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t key_id, int so_locked)
{
sctp_sharedkey_t *skey;
@@ -1718,9 +1716,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_au
*/
void
sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication,
- uint16_t keyid, uint16_t alt_keyid, int so_locked
- SCTP_UNUSED
-)
+ uint16_t keyid, uint16_t alt_keyid, int so_locked)
{
struct mbuf *m_notify;
struct sctp_authkey_event *auth;
Modified: stable/12/sys/netinet/sctp_input.c
==============================================================================
--- stable/12/sys/netinet/sctp_input.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_input.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -55,8 +55,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <sys/smp.h>
-
-
static void
sctp_stop_all_cookie_timers(struct sctp_tcb *stcb)
{
@@ -213,9 +211,7 @@ outnow:
*/
int
-sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked
- SCTP_UNUSED
-)
+sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked)
{
int unsent_data;
unsigned int i;
Modified: stable/12/sys/netinet/sctp_output.c
==============================================================================
--- stable/12/sys/netinet/sctp_output.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_output.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <machine/in_cksum.h>
-
#define SCTP_MAX_GAPS_INARRAY 4
struct sack_track {
uint8_t right_edge; /* mergable on the right edge */
@@ -3990,8 +3989,7 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
uint16_t port,
union sctp_sockstore *over_addr,
uint8_t mflowtype, uint32_t mflowid,
- int so_locked SCTP_UNUSED
-)
+ int so_locked)
{
/* nofragment_flag to tell if IP_DF should be set (IPv4 only) */
/**
@@ -4642,9 +4640,7 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
void
-sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
- SCTP_UNUSED
-)
+sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked)
{
struct mbuf *m, *m_last;
struct sctp_nets *net;
@@ -6578,9 +6574,7 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
int *num_out,
int *reason_code,
int control_only, int from_where,
- struct timeval *now, int *now_filled, int frag_point, int so_locked
- SCTP_UNUSED
-);
+ struct timeval *now, int *now_filled, int frag_point, int so_locked);
static void
sctp_sendall_iterator(struct sctp_inpcb *inp, struct sctp_tcb *stcb, void *ptr,
@@ -7040,9 +7034,7 @@ all_done:
}
static void
-sctp_clean_up_ctl(struct sctp_tcb *stcb, struct sctp_association *asoc, int so_locked
- SCTP_UNUSED
-)
+sctp_clean_up_ctl(struct sctp_tcb *stcb, struct sctp_association *asoc, int so_locked)
{
struct sctp_tmit_chunk *chk, *nchk;
@@ -7147,9 +7139,7 @@ sctp_move_to_outqueue(struct sctp_tcb *stcb,
int *giveup,
int eeor_mode,
int *bail,
- int so_locked
- SCTP_UNUSED
-)
+ int so_locked)
{
/* Move from the stream to the send_queue keeping track of the total */
struct sctp_association *asoc;
@@ -7676,9 +7666,7 @@ out_of:
static void
sctp_fill_outqueue(struct sctp_tcb *stcb,
- struct sctp_nets *net, int frag_point, int eeor_mode, int *quit_now, int so_locked
- SCTP_UNUSED
-)
+ struct sctp_nets *net, int frag_point, int eeor_mode, int *quit_now, int so_locked)
{
struct sctp_association *asoc;
struct sctp_stream_out *strq;
@@ -7797,9 +7785,7 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
int *num_out,
int *reason_code,
int control_only, int from_where,
- struct timeval *now, int *now_filled, int frag_point, int so_locked
- SCTP_UNUSED
-)
+ struct timeval *now, int *now_filled, int frag_point, int so_locked)
{
/**
* Ok this is the generic chunk service queue. we must do the
@@ -9414,9 +9400,7 @@ static int
sctp_chunk_retransmission(struct sctp_inpcb *inp,
struct sctp_tcb *stcb,
struct sctp_association *asoc,
- int *cnt_out, struct timeval *now, int *now_filled, int *fr_done, int so_locked
- SCTP_UNUSED
-)
+ int *cnt_out, struct timeval *now, int *now_filled, int *fr_done, int so_locked)
{
/*-
* send out one MTU of retransmission. If fast_retransmit is
@@ -9965,9 +9949,7 @@ void
sctp_chunk_output(struct sctp_inpcb *inp,
struct sctp_tcb *stcb,
int from_where,
- int so_locked
- SCTP_UNUSED
-)
+ int so_locked)
{
/*-
* Ok this is the generic chunk service queue. we must do the
@@ -10484,9 +10466,7 @@ sctp_fill_in_rest:
}
void
-sctp_send_sack(struct sctp_tcb *stcb, int so_locked
- SCTP_UNUSED
-)
+sctp_send_sack(struct sctp_tcb *stcb, int so_locked)
{
/*-
* Queue up a SACK or NR-SACK in the control queue.
@@ -10880,9 +10860,7 @@ sctp_send_sack(struct sctp_tcb *stcb, int so_locked
}
void
-sctp_send_abort_tcb(struct sctp_tcb *stcb, struct mbuf *operr, int so_locked
- SCTP_UNUSED
-)
+sctp_send_abort_tcb(struct sctp_tcb *stcb, struct mbuf *operr, int so_locked)
{
struct mbuf *m_abort, *m, *m_last;
struct mbuf *m_out, *m_end = NULL;
@@ -11298,9 +11276,7 @@ sctp_send_shutdown_complete2(struct sockaddr *src, str
}
void
-sctp_send_hb(struct sctp_tcb *stcb, struct sctp_nets *net, int so_locked
- SCTP_UNUSED
-)
+sctp_send_hb(struct sctp_tcb *stcb, struct sctp_nets *net, int so_locked)
{
struct sctp_tmit_chunk *chk;
struct sctp_heartbeat_chunk *hb;
Modified: stable/12/sys/netinet/sctp_output.h
==============================================================================
--- stable/12/sys/netinet/sctp_output.h Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_output.h Mon Aug 24 07:42:50 2020 (r364605)
@@ -74,10 +74,7 @@ int
int
sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t *ro);
-void
-sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *, int
- SCTP_UNUSED
-);
+void sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *, int);
void
sctp_send_initiate_ack(struct sctp_inpcb *, struct sctp_tcb *,
@@ -144,15 +141,10 @@ int
sctp_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
struct mbuf *, struct thread *, int);
-void
-sctp_chunk_output(struct sctp_inpcb *, struct sctp_tcb *, int, int
- SCTP_UNUSED
-);
-void
-sctp_send_abort_tcb(struct sctp_tcb *, struct mbuf *, int
- SCTP_UNUSED
-);
+void sctp_chunk_output(struct sctp_inpcb *, struct sctp_tcb *, int, int);
+void sctp_send_abort_tcb(struct sctp_tcb *, struct mbuf *, int);
+
void send_forward_tsn(struct sctp_tcb *, struct sctp_association *);
void sctp_send_sack(struct sctp_tcb *, int);
@@ -160,7 +152,6 @@ void sctp_send_sack(struct sctp_tcb *, int);
void sctp_send_hb(struct sctp_tcb *, struct sctp_nets *, int);
void sctp_send_ecn_echo(struct sctp_tcb *, struct sctp_nets *, uint32_t);
-
void
sctp_send_packet_dropped(struct sctp_tcb *, struct sctp_nets *, struct mbuf *,
Modified: stable/12/sys/netinet/sctp_peeloff.c
==============================================================================
--- stable/12/sys/netinet/sctp_peeloff.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_peeloff.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/sctputil.h>
#include <netinet/sctp_auth.h>
-
int
sctp_can_peel_off(struct socket *head, sctp_assoc_t assoc_id)
{
Modified: stable/12/sys/netinet/sctp_timer.c
==============================================================================
--- stable/12/sys/netinet/sctp_timer.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_timer.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/udp.h>
#endif
-
void
sctp_audit_retranmission_queue(struct sctp_association *asoc)
{
Modified: stable/12/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/12/sys/netinet/sctp_usrreq.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctp_usrreq.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
-
extern const struct sctp_cc_functions sctp_cc_functions[];
extern const struct sctp_ss_functions sctp_ss_functions[];
Modified: stable/12/sys/netinet/sctputil.c
==============================================================================
--- stable/12/sys/netinet/sctputil.c Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctputil.c Mon Aug 24 07:42:50 2020 (r364605)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/icmp6.h>
#endif
-
#ifndef KTR_SCTP
#define KTR_SCTP KTR_SUBSYS
#endif
@@ -3112,9 +3111,7 @@ sctp_pad_lastmbuf(struct mbuf *m, int padval, struct m
static void
sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb,
- uint16_t error, struct sctp_abort_chunk *abort, uint8_t from_peer, int so_locked
- SCTP_UNUSED
-)
+ uint16_t error, struct sctp_abort_chunk *abort, uint8_t from_peer, int so_locked)
{
struct mbuf *m_notify;
struct sctp_assoc_change *sac;
@@ -3249,9 +3246,7 @@ set_error:
static void
sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state,
- struct sockaddr *sa, uint32_t error, int so_locked
- SCTP_UNUSED
-)
+ struct sockaddr *sa, uint32_t error, int so_locked)
{
struct mbuf *m_notify;
struct sctp_paddr_change *spc;
@@ -3340,9 +3335,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, ui
static void
sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error,
- struct sctp_tmit_chunk *chk, int so_locked
- SCTP_UNUSED
-)
+ struct sctp_tmit_chunk *chk, int so_locked)
{
struct mbuf *m_notify;
struct sctp_send_failed *ssf;
@@ -3474,9 +3467,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t
static void
sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error,
- struct sctp_stream_queue_pending *sp, int so_locked
- SCTP_UNUSED
-)
+ struct sctp_stream_queue_pending *sp, int so_locked)
{
struct mbuf *m_notify;
struct sctp_send_failed *ssf;
@@ -3622,9 +3613,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb)
/* This always must be called with the read-queue LOCKED in the INP */
static void
sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error,
- uint32_t val, int so_locked
- SCTP_UNUSED
-)
+ uint32_t val, int so_locked)
{
struct mbuf *m_notify;
struct sctp_pdapi_event *pdapi;
@@ -3745,9 +3734,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb)
static void
sctp_notify_sender_dry_event(struct sctp_tcb *stcb,
- int so_locked
- SCTP_UNUSED
-)
+ int so_locked)
{
struct mbuf *m_notify;
struct sctp_sender_dry_event *event;
@@ -4034,9 +4021,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16
void
sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb,
- uint32_t error, void *data, int so_locked
- SCTP_UNUSED
-)
+ uint32_t error, void *data, int so_locked)
{
if ((stcb == NULL) ||
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
@@ -4211,9 +4196,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb
}
void
-sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked
- SCTP_UNUSED
-)
+sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked)
{
struct sctp_association *asoc;
struct sctp_stream_out *outs;
@@ -4322,9 +4305,7 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16
void
sctp_abort_notification(struct sctp_tcb *stcb, uint8_t from_peer, uint16_t error,
- struct sctp_abort_chunk *abort, int so_locked
- SCTP_UNUSED
-)
+ struct sctp_abort_chunk *abort, int so_locked)
{
if (stcb == NULL) {
return;
@@ -4446,9 +4427,7 @@ none_in:
void
sctp_abort_an_association(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
struct mbuf *op_err,
- int so_locked
- SCTP_UNUSED
-)
+ int so_locked)
{
if (stcb == NULL) {
@@ -4826,9 +4805,7 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
struct sockbuf *sb,
int end,
int inp_read_lock_held,
- int so_locked
- SCTP_UNUSED
-)
+ int so_locked)
{
/*
* Here we must place the control on the end of the socket read
@@ -5006,9 +4983,7 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_
int
sctp_release_pr_sctp_chunk(struct sctp_tcb *stcb, struct sctp_tmit_chunk *tp1,
- uint8_t sent, int so_locked
- SCTP_UNUSED
-)
+ uint8_t sent, int so_locked)
{
struct sctp_stream_out *strq;
struct sctp_tmit_chunk *chk = NULL, *tp2;
Modified: stable/12/sys/netinet/sctputil.h
==============================================================================
--- stable/12/sys/netinet/sctputil.h Mon Aug 24 01:58:46 2020 (r364604)
+++ stable/12/sys/netinet/sctputil.h Mon Aug 24 07:42:50 2020 (r364605)
@@ -117,9 +117,7 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
struct sockbuf *sb,
int end,
int inpread_locked,
- int so_locked
- SCTP_UNUSED
-);
+ int so_locked);
void sctp_iterator_worker(void);
@@ -145,10 +143,7 @@ struct mbuf *sctp_add_pad_tombuf(struct mbuf *, int);
struct mbuf *sctp_pad_lastmbuf(struct mbuf *, int, struct mbuf *);
-void
-sctp_ulp_notify(uint32_t, struct sctp_tcb *, uint32_t, void *, int
- SCTP_UNUSED
-);
+void sctp_ulp_notify(uint32_t, struct sctp_tcb *, uint32_t, void *, int);
void
sctp_pull_off_control_to_new_inp(struct sctp_inpcb *old_inp,
@@ -161,18 +156,13 @@ void sctp_stop_timers_for_shutdown(struct sctp_tcb *);
/* Stop all timers for association and remote addresses. */
void sctp_stop_association_timers(struct sctp_tcb *, bool);
-void
-sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int
- SCTP_UNUSED
-);
+void sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int);
int sctp_expand_mapping_array(struct sctp_association *, uint32_t);
void
sctp_abort_notification(struct sctp_tcb *, uint8_t, uint16_t,
- struct sctp_abort_chunk *, int
- SCTP_UNUSED
-);
+ struct sctp_abort_chunk *, int);
/* We abort responding to an IP packet for some reason */
void
@@ -186,9 +176,7 @@ sctp_abort_association(struct sctp_inpcb *, struct sct
/* We choose to abort via user input */
void
sctp_abort_an_association(struct sctp_inpcb *, struct sctp_tcb *,
- struct mbuf *, int
- SCTP_UNUSED
-);
+ struct mbuf *, int);
void
sctp_handle_ootb(struct mbuf *, int, int,
@@ -234,9 +222,7 @@ void sctp_print_address(struct sockaddr *);
int
sctp_release_pr_sctp_chunk(struct sctp_tcb *, struct sctp_tmit_chunk *,
- uint8_t, int
- SCTP_UNUSED
-);
+ uint8_t, int);
struct mbuf *sctp_generate_cause(uint16_t, char *);
struct mbuf *sctp_generate_no_user_data_cause(uint32_t);
More information about the svn-src-all
mailing list