xnu-4570.31.3.tar.gz

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

diff --git a/bsd/netinet/mptcp_var.h b/bsd/netinet/mptcp_var.h
index 2d1f99061048bf913bab4796a923a4c9b9de23be..1ff155f549e102c8706c14846baaef3d89dd6030 100644 (file)
--- a/bsd/netinet/mptcp_var.h
+++ b/bsd/netinet/mptcp_var.h
@@ -223,7 +223,7 @@ static inline int
 mptcp_subflow_cwnd_space(struct socket *so)
 {
        struct tcpcb *tp = sototcpcb(so);
 mptcp_subflow_cwnd_space(struct socket *so)
 {
        struct tcpcb *tp = sototcpcb(so);

-       int cwnd = min(tp->snd_wnd, tp->snd_cwnd) - (tp->snd_nxt - tp->snd_una);
+       int cwnd = min(tp->snd_wnd, tp->snd_cwnd) - (so->so_snd.sb_cc);

 
        return (min(cwnd, sbspace(&so->so_snd)));
 }
 
        return (min(cwnd, sbspace(&so->so_snd)));
 }


@@ -653,7 +653,8 @@ extern void mptcp_unset_cellicon(void);
 extern void mptcp_reset_rexmit_state(struct tcpcb *tp);
 extern void mptcp_reset_keepalive(struct tcpcb *tp);
 extern int mptcp_validate_csum(struct tcpcb *tp, struct mbuf *m, uint64_t dsn,
 extern void mptcp_reset_rexmit_state(struct tcpcb *tp);
 extern void mptcp_reset_keepalive(struct tcpcb *tp);
 extern int mptcp_validate_csum(struct tcpcb *tp, struct mbuf *m, uint64_t dsn,

-                              uint32_t sseq, uint16_t dlen, uint16_t csum);
+                              uint32_t sseq, uint16_t dlen, uint16_t csum,
+                              uint16_t dfin);

 __END_DECLS
 
 #endif /* BSD_KERNEL_PRIVATE */
 __END_DECLS
 
 #endif /* BSD_KERNEL_PRIVATE */