Merge remote-tracking branch 'rth/tcg-next' into staging

[qemu.git] / slirp / tcp_timer.h

diff --git a/slirp/tcp_timer.h b/slirp/tcp_timer.h
index f251846b4427a31e45624178c9fe4f3d25adc46c..ff17914f4198d0bfbb8f03dae4fb3a89717487ae 100644 (file)
--- a/slirp/tcp_timer.h
+++ b/slirp/tcp_timer.h
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -102,7 +98,6 @@
 #define        TCPTV_KEEPCNT   8                       /* max probes before drop */
 
 #define        TCPTV_MIN       (  1*PR_SLOWHZ)         /* minimum allowable value */
-/* #define     TCPTV_REXMTMAX  ( 64*PR_SLOWHZ) */      /* max allowable REXMT value */
 #define TCPTV_REXMTMAX  ( 12*PR_SLOWHZ)                /* max allowable REXMT value */
 
 #define        TCP_LINGERTIME  120                     /* linger at most 2 minutes */
@@ -110,11 +105,6 @@
 #define TCP_MAXRXTSHIFT 12                      /* maximum retransmits */
 
 
-#ifdef TCPTIMERS
-char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
 /*
  * Force a time value to be in a certain range.
  */
@@ -130,8 +120,8 @@ extern const int tcp_backoff[];
 
 struct tcpcb;
 
-void tcp_fasttimo _P((void));
-void tcp_slowtimo _P((void));
-void tcp_canceltimers _P((struct tcpcb *));
+void tcp_fasttimo(Slirp *);
+void tcp_slowtimo(Slirp *);
+void tcp_canceltimers(struct tcpcb *);
 
 #endif