Author: tuexen
Date: Sat Jun 6 18:20:09 2020
New Revision: 361872
URL: https://svnweb.freebsd.org/changeset/base/361872
Log:
Non-functional changes due to cleanup (upstream removing of Panda support)
of the code
MFC after: 1 week
Modified:
head/sys/netinet/sctp_constants.h
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_os.h
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
Modified: head/sys/netinet/sctp_constants.h
==============================================================================
--- head/sys/netinet/sctp_constants.h Sat Jun 6 17:48:55 2020
(r361871)
+++ head/sys/netinet/sctp_constants.h Sat Jun 6 18:20:09 2020
(r361872)
@@ -576,7 +576,6 @@ __FBSDID("$FreeBSD$");
*/
#define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512
-
/*
* Basically the minimum amount of time before I do a early FR. Making this
* value to low will cause duplicate retransmissions.
@@ -756,9 +755,8 @@ __FBSDID("$FreeBSD$");
#define SCTP_FROM_SCTP_ASCONF 0x80000000
#define SCTP_FROM_SCTP_OUTPUT 0x90000000
#define SCTP_FROM_SCTP_PEELOFF 0xa0000000
-#define SCTP_FROM_SCTP_PANDA 0xb0000000
-#define SCTP_FROM_SCTP_SYSCTL 0xc0000000
-#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000
+#define SCTP_FROM_SCTP_SYSCTL 0xb0000000
+#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xc0000000
/* Location ID's */
#define SCTP_LOC_1 0x00000001
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Sat Jun 6 17:48:55 2020
(r361871)
+++ head/sys/netinet/sctp_indata.c Sat Jun 6 18:20:09 2020
(r361872)
@@ -2721,8 +2721,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
* cluster... i.e. it is a small packet sent in and yet the driver
* underneath allocated a full cluster for it. If so we must copy it
* to a smaller mbuf and free up the cluster mbuf. This will help
- * with cluster starvation. Note for __Panda__ we don't do this
- * since it has clusters all the way down to 64 bytes.
+ * with cluster starvation.
*/
if (SCTP_BUF_LEN(m) < (long)MLEN && SCTP_BUF_NEXT(m) == NULL) {
/* we only handle mbufs that are singletons.. not chains */
Modified: head/sys/netinet/sctp_os.h
==============================================================================
--- head/sys/netinet/sctp_os.h Sat Jun 6 17:48:55 2020 (r361871)
+++ head/sys/netinet/sctp_os.h Sat Jun 6 18:20:09 2020 (r361872)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
-
/* All os's must implement this address gatherer. If
* no VRF's exist, then vrf 0 is the only one and all
* addresses and ifn's live here.
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Sat Jun 6 17:48:55 2020
(r361871)
+++ head/sys/netinet/sctp_output.c Sat Jun 6 18:20:09 2020
(r361872)
@@ -6475,8 +6475,7 @@ error_out:
appendchain = clonechain;
} else {
if (!copy_by_ref &&
- (sizeofcpy <=
(int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN)))
- ) {
+ (sizeofcpy <=
(int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN)))) {
/* Its not in a cluster */
if (*endofchain == NULL) {
/* lets get a mbuf cluster */
@@ -13526,12 +13525,6 @@ skip_preblock:
error = sctp_msg_append(stcb, net, top, srcv, 0);
top = NULL;
if (sinfo_flags & SCTP_EOF) {
- /*
- * This should only happen for Panda for the mbuf
- * send case, which does NOT yet support EEOR mode.
- * Thus, we can just set this flag to do the proper
- * EOF handling.
- */
got_all_of_the_send = 1;
}
}
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Sat Jun 6 17:48:55 2020 (r361871)
+++ head/sys/netinet/sctp_pcb.c Sat Jun 6 18:20:09 2020 (r361872)
@@ -749,8 +749,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockadd
/*-
* The name has priority over the ifn_index
- * if its given. We do this especially for
- * panda who might recycle indexes fast.
+ * if its given.
*/
if (if_name) {
if (strncmp(if_name,
sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) {
@@ -3157,8 +3156,7 @@ continue_anyway:
} else {
/*
* Note for BSD we hit here always other O/S's will
- * pass things in via the sctp_ifap argument
- * (Panda).
+ * pass things in via the sctp_ifap argument.
*/
ifa = sctp_find_ifa_by_addr(&store.sa,
vrf_id, SCTP_ADDR_NOT_LOCKED);
@@ -4302,11 +4300,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockadd
* If you have not performed a bind, then we need to do the
* ephemeral bind for you.
*/
- if ((err = sctp_inpcb_bind(inp->sctp_socket,
- (struct sockaddr *)NULL,
- (struct sctp_ifa *)NULL,
- p
- ))) {
+ if ((err = sctp_inpcb_bind(inp->sctp_socket, NULL, NULL, p))) {
/* bind error, probably perm */
*error = err;
return (NULL);
@@ -4674,7 +4668,6 @@ sctp_clean_up_stream(struct sctp_tcb *stcb, struct sct
}
}
}
-
/*-
* Free the association after un-hashing the remote port. This
Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Sat Jun 6 17:48:55 2020
(r361871)
+++ head/sys/netinet/sctp_usrreq.c Sat Jun 6 18:20:09 2020
(r361872)
@@ -71,7 +71,7 @@ sctp_init(void)
SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) = (nmbclusters / 8);
/*
* Allow a user to take no more than 1/2 the number of clusters or
- * the SB_MAX whichever is smaller for the send window.
+ * the SB_MAX, whichever is smaller, for the send window.
*/
sb_max_adj = (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE +
MCLBYTES));
SCTP_BASE_SYSCTL(sctp_sendspace) = min(sb_max_adj,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
