Date: Sun, 14 Aug 2011 16:30:20 GMT From: Catalin Nicutar <cnicutar@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 197643 for review Message-ID: <201108141630.p7EGUK7h036451@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@197643?ac=10 Change 197643 by cnicutar@cnicutar_cronos on 2011/08/14 16:29:39 Fix UTO inheritance bug introduced in @197422. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#4 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#4 (text+ko) ==== @@ -1052,7 +1052,7 @@ * we need to inherit the current disposition (i.e. will the resulting * socket accept suggestions?). */ - uint8_t rcv_uto_tf = 0; + uint16_t rcv_uto_tf; uint32_t rcv_uto = 0; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); @@ -1087,7 +1087,7 @@ } /* Remember received UTO regardless of disposition and clear it. */ - rcv_uto_tf = tp->t_flags & TF_RCV_UTO; + rcv_uto_tf = (tp->t_flags & TF_RCV_UTO) ? SCF_RCV_UTO : 0; rcv_uto = tp->rcv_uto; tp->rcv_uto = 0; @@ -1305,8 +1305,7 @@ } /* Inherit received UTO, regardless of disposition. */ - if (rcv_uto_tf) - sc->sc_flags |= SCF_RCV_UTO; + sc->sc_flags |= rcv_uto_tf; sc->sc_rcv_uto = rcv_uto; if (V_tcp_syncookies) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108141630.p7EGUK7h036451>