Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 29 Jun 2009 03:35:56 GMT
From:      Fang Wang <fangwang@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 165364 for review
Message-ID:  <200906290335.n5T3Zup4039187@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=165364

Change 165364 by fangwang@fangwang_utobsd on 2009/06/29 03:34:56

	Fix compile error.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#8 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#4 edit

Differences ...

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#8 (text+ko) ====

@@ -776,10 +776,6 @@
 			tp->uto_flags |= TCPUTO_RCVD;
 			tp->rcv_uto = sc->sc_peer_uto;
 		}
-		if (sc->sc_flags & SCF_SENT_UTO) {
-			tp->uto_flags |= TCPUTO_SENT;
-			tp->snd_uto = sc->sc_uto;
-		}
 	}
 
 	if (sc->sc_flags & SCF_ECN)

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#4 (text+ko) ====

@@ -1374,8 +1374,15 @@
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
-			if (tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
-				if (optval > 0x8FFF) {
+			if (tu.flags & ENABLE_UTO)
+				tp->uto_flags |= TCPUTO_ENABLE;
+			if (tu.flags & STORE_UTO)
+				tp->uto_flags |= TCPUTO_NEED;
+			if ( tu.flags & ENABLE_CHANGE)
+				tp->uto_flags |= TCPUTO_CHANGEABLE;
+			if (tu.flags & STORE_UTO &&
+			    tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
+				if (tu.uto > 0x8FFF) {
 					tp->snd_uto = tu.uto / 60;
 					tp->snd_uto <<= 1;
 					tp->snd_uto |= 1;
@@ -1383,10 +1390,6 @@
 					tp->snd_uto = tu.uto;
 					tp->snd_uto <<= 1;
 				}
-				if (tu.flags & ENABLE_UTO)
-					tp->uto_flags |= TCPUTO_ENABLE;
-				if (tu.flags & STORE_UTO)
-					tp->uto_flags |= TCPUTO_NEED;
 				if (tp->uto_flags & TCPUTO_ENABLE &&
 				    tp->uto_flags & TCPUTO_NEED) {
 					tp->t_uto_impl = min(tcp_uto_max, 
@@ -1395,8 +1398,7 @@
 					tp->uto_flags &= ~TCPUTO_CHANGEABLE;
 					tp->uto_flags |= TCPUTO_IMPL;
 				}
-				if (tu.flags & ENABLE_CHANGE)
-					tp->uto_flags |= TCPUTO_CHANGEABLE;
+			}
 			else
 				error = EINVAL;
 			INP_WUNLOCK(inp);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906290335.n5T3Zup4039187>