View | Details | Raw Unified | Return to bug 264764 | Differences between
and this patch

Collapse All | Expand All

(-)b/documentation/content/en/articles/committers-guide/_index.adoc (-10 / +22 lines)
Lines 327-333 This primer is less ambitiously scoped than the old Subversion Primer, but shoul Link Here
327
If you want to download FreeBSD, compile it from sources, and generally keep up to date that way, this primer is for you.
327
If you want to download FreeBSD, compile it from sources, and generally keep up to date that way, this primer is for you.
328
It covers getting the sources, updating the sources, bisecting and touches briefly on how to cope with a few local changes.
328
It covers getting the sources, updating the sources, bisecting and touches briefly on how to cope with a few local changes.
329
It covers the basics, and tries to give good pointers to more in-depth treatment for when the reader finds the basics insufficient.
329
It covers the basics, and tries to give good pointers to more in-depth treatment for when the reader finds the basics insufficient.
330
Other sections of this guide cover more advanced topics related to contributing to the project.
330
Other sections of this guide cover more advanced topics related to contributing to the project.
331
The goal of this section is to highlight those bits of Git needed to track sources.
331
The goal of this section is to highlight those bits of Git needed to track sources.
332
They assume a basic understanding of Git.
332
They assume a basic understanding of Git.
Lines 1295-1301 Author: John Baldwin <jhb@FreeBSD.org> Link Here
1295
Date:   Thu Dec 3 22:01:13 2020 +0000
1295
Date:   Thu Dec 3 22:01:13 2020 +0000
1296
    Don't transmit mbufs that aren't yet ready on TOE sockets.
1296
    Don't transmit mbufs that aren't yet ready on TOE sockets.
1297
1297
1298
    This includes mbufs waiting for data from sendfile() I/O requests, or
1298
    This includes mbufs waiting for data from sendfile() I/O requests, or
1299
    mbufs awaiting encryption for KTLS.
1299
    mbufs awaiting encryption for KTLS.
Lines 1310-1323 index 8e8c2b8639e6..43861f10b689 100644 Link Here
1310
@@ -746,6 +746,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1310
@@ -746,6 +746,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1311
                for (m = sndptr; m != NULL; m = m->m_next) {
1311
                for (m = sndptr; m != NULL; m = m->m_next) {
1312
                        int n;
1312
                        int n;
1313
1313
1314
+                       if ((m->m_flags & M_NOTAVAIL) != 0)
1314
+                       if ((m->m_flags & M_NOTAVAIL) != 0)
1315
+                               break;
1315
+                               break;
1316
                        if (IS_AIOTX_MBUF(m))
1316
                        if (IS_AIOTX_MBUF(m))
1317
                                n = sglist_count_vmpages(aiotx_mbuf_pages(m),
1317
                                n = sglist_count_vmpages(aiotx_mbuf_pages(m),
1318
                                    aiotx_mbuf_pgoff(m), m->m_len);
1318
                                    aiotx_mbuf_pgoff(m), m->m_len);
1319
@@ -821,8 +823,9 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1319
@@ -821,8 +823,9 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1320
1320
1321
                /* nothing to send */
1321
                /* nothing to send */
1322
                if (plen == 0) {
1322
                if (plen == 0) {
1323
-                       KASSERT(m == NULL,
1323
-                       KASSERT(m == NULL,
Lines 1327-1340 index 8e8c2b8639e6..43861f10b689 100644 Link Here
1327
+                           __func__));
1327
+                           __func__));
1328
                        break;
1328
                        break;
1329
                }
1329
                }
1330
1330
1331
@@ -910,7 +913,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1331
@@ -910,7 +913,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
1332
                toep->txsd_avail--;
1332
                toep->txsd_avail--;
1333
1333
1334
                t4_l2t_send(sc, wr, toep->l2te);
1334
                t4_l2t_send(sc, wr, toep->l2te);
1335
-       } while (m != NULL);
1335
-       } while (m != NULL);
1336
+       } while (m != NULL && (m->m_flags & M_NOTAVAIL) == 0);
1336
+       } while (m != NULL && (m->m_flags & M_NOTAVAIL) == 0);
1337
1337
1338
        /* Send a FIN if requested, but only if there's no more data to send */
1338
        /* Send a FIN if requested, but only if there's no more data to send */
1339
        if (m == NULL && toep->flags & TPF_SEND_FIN)
1339
        if (m == NULL && toep->flags & TPF_SEND_FIN)
1340
....
1340
....
Lines 3196-3202 If a commit does results in controversy erupting, it may be advisable to conside Link Here
3196
Remember, with a version control system we can always change it back.
3196
Remember, with a version control system we can always change it back.
3197
Do not impugn the intentions of others.
3197
Do not impugn the intentions of others.
3198
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.
3198
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.
3199
Different is good.
3199
Different is good.
3200
Disagree honestly.
3200
Disagree honestly.
Lines 3977-3983 Full package builds will be done with the patches provided by the submitter, and Link Here
3977
== Issues Specific to Developers Who Are Not Committers
3977
== Issues Specific to Developers Who Are Not Committers
3978
A few people who have access to the FreeBSD machines do not have commit bits.
3978
A few people who have access to the FreeBSD machines do not have commit bits.
3979
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).
3979
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).
3980
In particular, we recommend that you read:
3980
In particular, we recommend that you read:
3981
* <<admin>>
3981
* <<admin>>
Lines 3994-4000 Get your mentor to add you to the "Additional Contributors" ([.filename]#doc/sha Link Here
3994
[[google-analytics]]
3994
[[google-analytics]]
3995
== Information About Google Analytics
3995
== Information About Google Analytics
3996
As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project website to collect anonymized usage statistics regarding usage of the site.
3996
As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project website to collect anonymized usage statistics regarding usage of the site.
3997
[NOTE]
3997
[NOTE]
3998
====
3998
====
Lines 4046-4048 Then send an mail to mailto:non-profit@gandi.net[non-profit@gandi.net] using you Link Here
4046
https://rsync.net[rsync.net] provides cloud storage for offsite backup that is optimized for UNIX users. Their service runs entirely on FreeBSD and ZFS.
4046
https://rsync.net[rsync.net] provides cloud storage for offsite backup that is optimized for UNIX users. Their service runs entirely on FreeBSD and ZFS.
4047
rsync.net offers a free-forever 500 GB account to FreeBSD developers. Simply sign up at https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd.html] using your `@freebsd.org` address to receive this free account.
4047
rsync.net offers a free-forever 500 GB account to FreeBSD developers. Simply sign up at https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd.html] using your `@freebsd.org` address to receive this free account.
4048
4049
[[benefits-jetbrains]]
4050
=== `JetBrains`
4051
4052
https://www.jetbrains.com[JetBrains] is a software development company which makes tools for software developers and project managers. The company offers many integrated development environments (IDEs) for different programming languages.
4053
4054
JetBrains offers 100 free yearly licenses for all https://www.jetbrains.com/products[JetBrains IDE products]. Simply sign up at https://account.jetbrains.com/a/322tl3z7[https://account.jetbrains.com/a/322tl3z7] using your `@freebsd.org` address and the account will have a license attached to it automatically. Once the account is active, use it in any of the products to activate them and you're done.
4055
4056
[IMPORTANT]
4057
====
4058
Please, only use these licences personally and do not share them with anyone outside of the FreeBSD project, as that would be a violation of the terms of the donation.
4059
====

Return to bug 264764