summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2004-11-22 13:16:27 +0000
committerrwatson <rwatson@FreeBSD.org>2004-11-22 13:16:27 +0000
commitec333e65774b8e9afb4f56083218699f855be022 (patch)
treef8008c9baa2fe238933009d7ae3009ee9d1312b9 /sys
parenta4b5efda6e57a55e7ddf0b7a0f2790d8db4dccb4 (diff)
downloadFreeBSD-src-ec333e65774b8e9afb4f56083218699f855be022.zip
FreeBSD-src-ec333e65774b8e9afb4f56083218699f855be022.tar.gz
Remove "Unlocked read" annotations associated with previously unlocked
use of socket buffer fields in the TCP input code. These references are now protected by use of the receive socket buffer lock. MFC after: 1 week
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/tcp_input.c3
-rw-r--r--sys/netinet/tcp_reass.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 5771c65..0a76701 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -364,7 +364,6 @@ present:
flags = q->tqe_th->th_flags & TH_FIN;
nq = LIST_NEXT(q, tqe_q);
LIST_REMOVE(q, tqe_q);
- /* Unlocked read. */
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(q->tqe_m);
else
@@ -1269,7 +1268,6 @@ after_listen:
#endif
* Add data to socket buffer.
*/
- /* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
m_freem(m);
@@ -2283,7 +2281,6 @@ dodata: /* XXX */
tcpstat.tcps_rcvpack++;
tcpstat.tcps_rcvbyte += tlen;
ND6_HINT(tp);
- /* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(m);
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 5771c65..0a76701 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -364,7 +364,6 @@ present:
flags = q->tqe_th->th_flags & TH_FIN;
nq = LIST_NEXT(q, tqe_q);
LIST_REMOVE(q, tqe_q);
- /* Unlocked read. */
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(q->tqe_m);
else
@@ -1269,7 +1268,6 @@ after_listen:
#endif
* Add data to socket buffer.
*/
- /* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
m_freem(m);
@@ -2283,7 +2281,6 @@ dodata: /* XXX */
tcpstat.tcps_rcvpack++;
tcpstat.tcps_rcvbyte += tlen;
ND6_HINT(tp);
- /* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(m);
OpenPOWER on IntegriCloud