svn commit: r366114 - head/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Thu Sep 24 12:26:08 UTC 2020
Author: tuexen
Date: Thu Sep 24 12:26:06 2020
New Revision: 366114
URL: https://svnweb.freebsd.org/changeset/base/366114
Log:
Whitespace changes.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_cc_functions.c
head/sys/netinet/sctp_header.h
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_lock_bsd.h
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_output.h
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
Modified: head/sys/netinet/sctp_cc_functions.c
==============================================================================
--- head/sys/netinet/sctp_cc_functions.c Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_cc_functions.c Thu Sep 24 12:26:06 2020 (r366114)
@@ -1313,8 +1313,7 @@ sctp_cwnd_update_rtcc_after_ecn_echo(struct sctp_tcb *
sctp_cwnd_update_after_ecn_echo_common(stcb, net, in_window, num_pkt_lost, 1);
}
-static
-void
+static void
sctp_cwnd_update_rtcc_tsn_acknowledged(struct sctp_nets *net,
struct sctp_tmit_chunk *tp1)
{
@@ -1431,7 +1430,6 @@ sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb,
net->cc_mod.rtcc.use_dccc_ecn = SCTP_BASE_SYSCTL(sctp_use_dccc_ecn);
net->cc_mod.rtcc.step_cnt = 0;
net->cc_mod.rtcc.last_step_state = 0;
-
}
static int
@@ -2041,7 +2039,7 @@ htcp_cong_avoid(struct sctp_tcb *stcb, struct sctp_net
{
/*-
* How to handle these functions?
- * if (!tcp_is_cwnd_limited(sk, in_flight)) RRS - good question.
+ * if (!tcp_is_cwnd_limited(sk, in_flight)) RRS - good question.
* return;
*/
if (net->cwnd <= net->ssthresh) {
Modified: head/sys/netinet/sctp_header.h
==============================================================================
--- head/sys/netinet/sctp_header.h Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_header.h Thu Sep 24 12:26:06 2020 (r366114)
@@ -530,41 +530,41 @@ struct sctp_auth_chunk {
#ifndef SCTP_MAX_OVERHEAD
#ifdef INET6
#define SCTP_MAX_OVERHEAD (sizeof(struct sctp_data_chunk) + \
- sizeof(struct sctphdr) + \
- sizeof(struct sctp_ecne_chunk) + \
- sizeof(struct sctp_sack_chunk) + \
- sizeof(struct ip6_hdr))
+ sizeof(struct sctphdr) + \
+ sizeof(struct sctp_ecne_chunk) + \
+ sizeof(struct sctp_sack_chunk) + \
+ sizeof(struct ip6_hdr))
#define SCTP_MED_OVERHEAD (sizeof(struct sctp_data_chunk) + \
- sizeof(struct sctphdr) + \
- sizeof(struct ip6_hdr))
+ sizeof(struct sctphdr) + \
+ sizeof(struct ip6_hdr))
#define SCTP_MIN_OVERHEAD (sizeof(struct ip6_hdr) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#else
#define SCTP_MAX_OVERHEAD (sizeof(struct sctp_data_chunk) + \
- sizeof(struct sctphdr) + \
- sizeof(struct sctp_ecne_chunk) + \
- sizeof(struct sctp_sack_chunk) + \
- sizeof(struct ip))
+ sizeof(struct sctphdr) + \
+ sizeof(struct sctp_ecne_chunk) + \
+ sizeof(struct sctp_sack_chunk) + \
+ sizeof(struct ip))
#define SCTP_MED_OVERHEAD (sizeof(struct sctp_data_chunk) + \
- sizeof(struct sctphdr) + \
- sizeof(struct ip))
+ sizeof(struct sctphdr) + \
+ sizeof(struct ip))
#define SCTP_MIN_OVERHEAD (sizeof(struct ip) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#endif /* INET6 */
#endif /* !SCTP_MAX_OVERHEAD */
#define SCTP_MED_V4_OVERHEAD (sizeof(struct sctp_data_chunk) + \
- sizeof(struct sctphdr) + \
- sizeof(struct ip))
+ sizeof(struct sctphdr) + \
+ sizeof(struct ip))
#define SCTP_MIN_V4_OVERHEAD (sizeof(struct ip) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#undef SCTP_PACKED
#endif /* !__sctp_header_h__ */
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_indata.c Thu Sep 24 12:26:06 2020 (r366114)
@@ -2532,7 +2532,6 @@ sctp_slide_mapping_arrays(struct sctp_tcb *stcb)
* we will be able to slide it forward. Really I
* don't think this should happen :-0
*/
-
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MAP_LOGGING_ENABLE) {
sctp_log_map((uint32_t)distance, (uint32_t)slide_from,
(uint32_t)asoc->mapping_array_size,
@@ -2616,8 +2615,7 @@ sctp_sack_check(struct sctp_tcb *stcb, int was_a_gap)
(stcb->asoc.numduptsns) || /* we have dup's */
(is_a_gap) || /* is still a gap */
(stcb->asoc.delayed_ack == 0) || /* Delayed sack disabled */
- (stcb->asoc.data_pkts_seen >= stcb->asoc.sack_freq) /* hit limit of pkts */
- ) {
+ (stcb->asoc.data_pkts_seen >= stcb->asoc.sack_freq)) { /* hit limit of pkts */
if ((stcb->asoc.sctp_cmt_on_off > 0) &&
(SCTP_BASE_SYSCTL(sctp_cmt_use_dac)) &&
(stcb->asoc.send_sack == 0) &&
@@ -2626,14 +2624,13 @@ sctp_sack_check(struct sctp_tcb *stcb, int was_a_gap)
(!SCTP_OS_TIMER_PENDING(&stcb->asoc.dack_timer.timer))) {
/*
* CMT DAC algorithm: With CMT, delay acks
- * even in the face of
- *
- * reordering. Therefore, if acks that do
- * not have to be sent because of the above
- * reasons, will be delayed. That is, acks
- * that would have been sent due to gap
- * reports will be delayed with DAC. Start
- * the delayed ack timer.
+ * even in the face of reordering.
+ * Therefore, if acks that do not have to be
+ * sent because of the above reasons, will
+ * be delayed. That is, acks that would have
+ * been sent due to gap reports will be
+ * delayed with DAC. Start the delayed ack
+ * timer.
*/
sctp_timer_start(SCTP_TIMER_TYPE_RECV,
stcb->sctp_ep, stcb, NULL);
@@ -3689,9 +3686,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, stru
tp1->whoTo->find_pseudo_cumack = 1;
tp1->whoTo->find_rtx_pseudo_cumack = 1;
}
-
} else { /* CMT is OFF */
-
#ifdef SCTP_FR_TO_ALTERNATE
/* Can we find an alternate? */
alt = sctp_find_alternate_net(stcb, tp1->whoTo, 0);
@@ -4097,7 +4092,6 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32
tp1->whoTo->new_pseudo_cumack = 1;
tp1->whoTo->find_pseudo_cumack = 1;
tp1->whoTo->find_rtx_pseudo_cumack = 1;
-
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) {
/* sa_ignore NO_NULL_CHK */
sctp_log_cwnd(stcb, tp1->whoTo, tp1->rec.data.tsn, SCTP_CWND_LOG_FROM_SACK);
@@ -4696,7 +4690,6 @@ hopeless_peer:
tp1->whoTo->new_pseudo_cumack = 1;
tp1->whoTo->find_pseudo_cumack = 1;
tp1->whoTo->find_rtx_pseudo_cumack = 1;
-
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_SACK_LOGGING_ENABLE) {
sctp_log_sack(asoc->last_acked_seq,
cum_ack,
Modified: head/sys/netinet/sctp_lock_bsd.h
==============================================================================
--- head/sys/netinet/sctp_lock_bsd.h Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_lock_bsd.h Thu Sep 24 12:26:06 2020 (r366114)
@@ -156,7 +156,7 @@ __FBSDID("$FreeBSD$");
rw_wunlock(&SCTP_BASE_INFO(ipi_addr_mtx)); \
} \
rw_destroy(&SCTP_BASE_INFO(ipi_addr_mtx)); \
-} while (0)
+} while (0)
#define SCTP_IPI_ADDR_RLOCK() do { \
rw_rlock(&SCTP_BASE_INFO(ipi_addr_mtx)); \
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_output.c Thu Sep 24 12:26:06 2020 (r366114)
@@ -9813,7 +9813,6 @@ one_chunk_around:
*/
atomic_add_int(&((asoc)->total_output_queue_size), data_list[i]->book_size);
data_list[i]->book_size *= 2;
-
} else {
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOG_RWND_ENABLE) {
sctp_log_rwnd(SCTP_DECREASE_PEER_RWND,
Modified: head/sys/netinet/sctp_output.h
==============================================================================
--- head/sys/netinet/sctp_output.h Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_output.h Thu Sep 24 12:26:06 2020 (r366114)
@@ -66,11 +66,10 @@ sctp_source_address_selection(struct sctp_inpcb *inp,
sctp_route_t *ro, struct sctp_nets *net,
int non_asoc_addr_ok, uint32_t vrf_id);
-int
- sctp_v6src_match_nexthop(struct sockaddr_in6 *src6, sctp_route_t *ro);
-int
- sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t *ro);
+int sctp_v6src_match_nexthop(struct sockaddr_in6 *src6, sctp_route_t *ro);
+int sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t *ro);
+
void sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *, int);
void
@@ -129,8 +128,8 @@ void sctp_fix_ecn_echo(struct sctp_association *);
void sctp_move_chunks_from_net(struct sctp_tcb *stcb, struct sctp_nets *net);
#define SCTP_DATA_CHUNK_OVERHEAD(stcb) ((stcb)->asoc.idata_supported ? \
- sizeof(struct sctp_idata_chunk) : \
- sizeof(struct sctp_data_chunk))
+ sizeof(struct sctp_idata_chunk) : \
+ sizeof(struct sctp_data_chunk))
int
sctp_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_pcb.c Thu Sep 24 12:26:06 2020 (r366114)
@@ -3588,7 +3588,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate,
#ifdef SCTP_LOG_CLOSING
sctp_log_closing(inp, NULL, 5);
#endif
-
if ((inp->sctp_asocidhash) != NULL) {
SCTP_HASH_FREE(inp->sctp_asocidhash, inp->hashasocidmark);
inp->sctp_asocidhash = NULL;
@@ -3623,7 +3622,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate,
(void)sctp_m_free(ip_pcb->inp_options);
ip_pcb->inp_options = 0;
}
-
#ifdef INET6
if (ip_pcb->inp_vflag & INP_IPV6) {
ip6_freepcbopts(ip_pcb->in6p_outputopts);
@@ -5728,7 +5726,6 @@ sctp_pcb_init(void)
SCTP_BASE_INFO(sctp_tcpephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize),
&SCTP_BASE_INFO(hashtcpmark));
SCTP_BASE_INFO(hashtblsize) = SCTP_BASE_SYSCTL(sctp_hashtblsize);
-
SCTP_BASE_INFO(sctp_vrfhash) = SCTP_HASH_INIT(SCTP_SIZE_OF_VRF_HASH,
&SCTP_BASE_INFO(hashvrfmark));
Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Thu Sep 24 12:14:25 2020 (r366113)
+++ head/sys/netinet/sctp_usrreq.c Thu Sep 24 12:26:06 2020 (r366114)
@@ -2620,7 +2620,6 @@ flags_out:
*/
sstat->sstat_penddata = (stcb->asoc.cnt_on_reasm_queue +
stcb->asoc.cnt_on_all_streams);
-
sstat->sstat_instrms = stcb->asoc.streamincnt;
sstat->sstat_outstrms = stcb->asoc.streamoutcnt;
sstat->sstat_fragmentation_point = sctp_get_frag_point(stcb, &stcb->asoc);
More information about the svn-src-head
mailing list