xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / netinet / tcp_timer.h

diff --git a/bsd/netinet/tcp_timer.h b/bsd/netinet/tcp_timer.h
index e09f01de90d4f3cc3b916ee55e60d06ffb4f2908..8d09d9cb627280dc73c344c41625c7a30b4382ae 100644 (file)
--- a/bsd/netinet/tcp_timer.h
+++ b/bsd/netinet/tcp_timer.h
@@ -134,7 +134,8 @@
 #define TCPT_2MSL       6       /* 2*msl quiet time timer */
 #if MPTCP
 #define TCPT_JACK_RXMT  7       /* retransmit timer for join ack */
-#define TCPT_MAX        7
+#define TCPT_CELLICON   8       /* Timer to check for cell-activity */
+#define TCPT_MAX        8
 #else /* MPTCP */
 #define TCPT_MAX        6
 #endif /* !MPTCP */
@@ -204,8 +205,6 @@ extern int tcptv_persmin_val;
  */
 #define TCP_RCV_SS_PKTCOUNT     512
 
-/* Receiver idle time, for rcv socket buffer resizing */
-#define TCPTV_RCVBUFIDLE (TCP_RETRANSHZ/2)
 #define TCPTV_TWTRUNC   8               /* RTO factor to truncate TW */
 
 #define TCP_LINGERTIME  120             /* linger at most 2 minutes */
@@ -302,13 +301,13 @@ struct tcptimerlist {
 #define TCP_CONN_KEEPIDLE(tp) \
        ((tp)->t_keepidle && \
        ((tp)->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) ? \
-               (tp)->t_keepidle : tcp_keepidle)
+               (tp)->t_keepidle : (uint32_t)tcp_keepidle)
 #define TCP_CONN_KEEPINIT(tp) \
-       (((tp)->t_keepinit > 0) ? (tp)->t_keepinit : tcp_keepinit)
+       (((tp)->t_keepinit > 0) ? (tp)->t_keepinit : (uint32_t)tcp_keepinit)
 #define TCP_CONN_KEEPCNT(tp) \
-       (((tp)->t_keepcnt > 0) ? (tp)->t_keepcnt : tcp_keepcnt)
+       (((tp)->t_keepcnt > 0) ? (tp)->t_keepcnt : (uint32_t)tcp_keepcnt)
 #define TCP_CONN_KEEPINTVL(tp) \
-       (((tp)->t_keepintvl > 0) ? (tp)->t_keepintvl : tcp_keepintvl)
+       (((tp)->t_keepintvl > 0) ? (tp)->t_keepintvl : (uint32_t)tcp_keepintvl)
 #define TCP_CONN_MAXIDLE(tp) \
        (TCP_CONN_KEEPCNT(tp) * TCP_CONN_KEEPINTVL(tp))