svn commit: r361145 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun May 17 22:31:38 2020
New Revision: 361145
URL: https://svnweb.freebsd.org/changeset/base/361145

Log:
  Non-functional changes, cleanups.
  
  MFC after:		3 days

Modified:
  head/sys/netinet/sctp_asconf.c
  head/sys/netinet/sctp_os_bsd.h
  head/sys/netinet/sctp_output.c
  head/sys/netinet/sctp_pcb.c

Modified: head/sys/netinet/sctp_asconf.c
==============================================================================
--- head/sys/netinet/sctp_asconf.c	Sun May 17 22:05:25 2020	(r361144)
+++ head/sys/netinet/sctp_asconf.c	Sun May 17 22:31:38 2020	(r361145)
@@ -2212,7 +2212,6 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, stru
 			struct sctp_nets *net;
 
 			TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
-
 				/* delete this address if cached */
 				if (net->ro._s_addr == ifa) {
 					sctp_free_ifa(net->ro._s_addr);

Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h	Sun May 17 22:05:25 2020	(r361144)
+++ head/sys/netinet/sctp_os_bsd.h	Sun May 17 22:31:38 2020	(r361145)
@@ -309,8 +309,6 @@ typedef struct callout sctp_os_timer_t;
 #define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index, af) ((struct ifnet *)ifn)->if_mtu
 #define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, nh) ((uint32_t)((nh != NULL) ? nh->nh_mtu : 0))
 #define SCTP_GATHER_MTU_FROM_INTFC(sctp_ifn) ((sctp_ifn->ifn_p != NULL) ? ((struct ifnet *)(sctp_ifn->ifn_p))->if_mtu : 0)
-/* XXX: Setting MTU from the protocol in this way is simply incorrect */
-#define SCTP_SET_MTU_OF_ROUTE(sa, rt, mtu)
 
 /* (de-)register interface event notifications */
 #define SCTP_REGISTER_INTERFACE(ifhandle, af)

Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c	Sun May 17 22:05:25 2020	(r361144)
+++ head/sys/netinet/sctp_output.c	Sun May 17 22:31:38 2020	(r361145)
@@ -6202,10 +6202,10 @@ sctp_prune_prsctp(struct sctp_tcb *stcb,
 				if (chk->rec.data.timetodrop.tv_sec > (long)srcv->sinfo_timetolive) {
 					/*
 					 * Lower numbers equates to higher
-					 * priority so if the one we are
-					 * looking at has a larger
-					 * priority we want to drop the data
-					 * and NOT retransmit it.
+					 * priority. So if the one we are
+					 * looking at has a larger priority,
+					 * we want to drop the data and NOT
+					 * retransmit it.
 					 */
 					if (chk->data) {
 						/*

Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c	Sun May 17 22:05:25 2020	(r361144)
+++ head/sys/netinet/sctp_pcb.c	Sun May 17 22:31:38 2020	(r361145)
@@ -5451,8 +5451,6 @@ sctp_del_local_addr_ep(struct sctp_inpcb *inp, struct 
 			TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
 				if (net->ro._s_addr == laddr->ifa) {
 					/* Yep, purge src address selected */
-
-					/* delete this address if cached */
 					RO_NHFREE(&net->ro);
 					sctp_free_ifa(net->ro._s_addr);
 					net->ro._s_addr = NULL;