diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -327,7 +327,7 @@ If you want to download FreeBSD, compile it from sources, and generally keep up to date that way, this primer is for you. It covers getting the sources, updating the sources, bisecting and touches briefly on how to cope with a few local changes. It covers the basics, and tries to give good pointers to more in-depth treatment for when the reader finds the basics insufficient. -Other sections of this guide cover more advanced topics related to contributing to the project. +Other sections of this guide cover more advanced topics related to contributing to the project. The goal of this section is to highlight those bits of Git needed to track sources. They assume a basic understanding of Git. @@ -1295,7 +1295,7 @@ Date: Thu Dec 3 22:01:13 2020 +0000 Don't transmit mbufs that aren't yet ready on TOE sockets. - + This includes mbufs waiting for data from sendfile() I/O requests, or mbufs awaiting encryption for KTLS. @@ -1310,14 +1310,14 @@ @@ -746,6 +746,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) for (m = sndptr; m != NULL; m = m->m_next) { int n; - + + if ((m->m_flags & M_NOTAVAIL) != 0) + break; if (IS_AIOTX_MBUF(m)) n = sglist_count_vmpages(aiotx_mbuf_pages(m), aiotx_mbuf_pgoff(m), m->m_len); @@ -821,8 +823,9 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) - + /* nothing to send */ if (plen == 0) { - KASSERT(m == NULL, @@ -1327,14 +1327,14 @@ + __func__)); break; } - + @@ -910,7 +913,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) toep->txsd_avail--; - + t4_l2t_send(sc, wr, toep->l2te); - } while (m != NULL); + } while (m != NULL && (m->m_flags & M_NOTAVAIL) == 0); - + /* Send a FIN if requested, but only if there's no more data to send */ if (m == NULL && toep->flags & TPF_SEND_FIN) .... @@ -3152,7 +3152,7 @@ Remember, with a version control system we can always change it back. Do not impugn the intentions of others. -If they see a different solution to a problem, or even a different problem, it is probably not because they are stupid, because they have questionable parentage, or because they are trying to destroy hard work, personal image, or FreeBSD, but basically because they have a different outlook on the world. +If they see a different solution to a problem, or even a different problem, it is probably not because they are stupid, because they have questionable parentage, or because they are trying to destroy hard work, personal image, or FreeBSD, but basically because they have a different outlook on the world. Different is good. Disagree honestly. @@ -3687,7 +3687,7 @@ .... [TIP] ==== -Don't forget to setup git hooks for the ports tree, as explained <>, a specific hook has been developed to verify the category's [.filename]#Makefile# +Don't forget to <>; a specific hook has been developed to verify the category's [.filename]#Makefile# ==== [[ports-qa-add-new-extra]] @@ -3936,7 +3936,7 @@ == Issues Specific to Developers Who Are Not Committers A few people who have access to the FreeBSD machines do not have commit bits. -Almost all of this document will apply to these developers as well (except things specific to commits and the mailing list memberships that go with them). +Almost all of this document will apply to these developers as well (except things specific to commits and the mailing list memberships that go with them). In particular, we recommend that you read: * <> @@ -3953,7 +3953,7 @@ [[google-analytics]] == Information About Google Analytics -As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project website to collect anonymized usage statistics regarding usage of the site. +As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project website to collect anonymized usage statistics regarding usage of the site. [NOTE] ====