xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / netinet / mptcp_timer.c

diff --git a/bsd/netinet/mptcp_timer.c b/bsd/netinet/mptcp_timer.c
index ac7595aead653fda613e8d6cc77e10e7ab9bb646..b1fba1579e19f6577f2d0994e23f2b625e9d5913 100644 (file)
--- a/bsd/netinet/mptcp_timer.c
+++ b/bsd/netinet/mptcp_timer.c
@@ -69,7 +69,7 @@ SYSCTL_INT(_net_inet_mptcp, OID_AUTO, tw, CTLFLAG_RW | CTLFLAG_LOCKED,
 static int mptcp_cancel_urgency_timer(struct mptses *mpte);
 
 static int
 static int mptcp_cancel_urgency_timer(struct mptses *mpte);
 
 static int

-mptcp_timer_demux(struct mptses *mpte, uint32_t now_msecs)
+mptcp_timer_demux(struct mptses *mpte, uint64_t now_msecs)

 {
        struct mptcb *mp_tp = NULL;
        mp_tp = mpte->mpte_mptcb;
 {
        struct mptcb *mp_tp = NULL;
        mp_tp = mpte->mpte_mptcb;


@@ -82,8 +82,7 @@ mptcp_timer_demux(struct mptses *mpte, uint32_t now_msecs)
                if (mp_tp->mpt_rxtstart == 0) {
                        break;
                }
                if (mp_tp->mpt_rxtstart == 0) {
                        break;
                }

-               if ((now_msecs - mp_tp->mpt_rxtstart) >
-                   (mptcp_rto * hz)) {
+               if ((now_msecs - mp_tp->mpt_rxtstart) > (mptcp_rto * hz)) {

                        if (MPTCP_SEQ_GT(mp_tp->mpt_snduna, mp_tp->mpt_rtseq)) {
                                mp_tp->mpt_timer_vals = 0;
                                mp_tp->mpt_rtseq = 0;
                        if (MPTCP_SEQ_GT(mp_tp->mpt_snduna, mp_tp->mpt_rtseq)) {
                                mp_tp->mpt_timer_vals = 0;
                                mp_tp->mpt_rtseq = 0;


@@ -133,8 +132,8 @@ mptcp_timer(struct mppcbinfo *mppi)
 {
        struct mppcb *mpp, *tmpp;
        struct timeval now;
 {
        struct mppcb *mpp, *tmpp;
        struct timeval now;

-       u_int32_t now_msecs;

        uint32_t resched_timer = 0;
        uint32_t resched_timer = 0;

+       uint64_t now_msecs;

 
        LCK_MTX_ASSERT(&mppi->mppi_lock, LCK_MTX_ASSERT_OWNED);
 
 
        LCK_MTX_ASSERT(&mppi->mppi_lock, LCK_MTX_ASSERT_OWNED);