mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Update MPTCP
This commit is contained in:
parent
f890a36727
commit
0b21a298c6
1 changed files with 4 additions and 10 deletions
|
@ -3718,7 +3718,7 @@ diff -aurN linux-5.4/net/ipv4/tcp.c mptcp-mptcp_trunk/net/ipv4/tcp.c
|
||||||
|
|
||||||
seq = tp->write_seq + tp->max_window + 2;
|
seq = tp->write_seq + tp->max_window + 2;
|
||||||
if (!seq)
|
if (!seq)
|
||||||
@@ -2616,17 +2736,11 @@
|
@@ -2616,20 +2736,14 @@
|
||||||
icsk->icsk_backoff = 0;
|
icsk->icsk_backoff = 0;
|
||||||
tp->snd_cwnd = 2;
|
tp->snd_cwnd = 2;
|
||||||
icsk->icsk_probes_out = 0;
|
icsk->icsk_probes_out = 0;
|
||||||
|
@ -3732,6 +3732,9 @@ diff -aurN linux-5.4/net/ipv4/tcp.c mptcp-mptcp_trunk/net/ipv4/tcp.c
|
||||||
+
|
+
|
||||||
+ tcp_reset_vars(sk);
|
+ tcp_reset_vars(sk);
|
||||||
+
|
+
|
||||||
|
if (icsk->icsk_ca_ops->release)
|
||||||
|
icsk->icsk_ca_ops->release(sk);
|
||||||
|
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
|
||||||
tcp_set_ca_state(sk, TCP_CA_Open);
|
tcp_set_ca_state(sk, TCP_CA_Open);
|
||||||
- tp->is_sack_reneg = 0;
|
- tp->is_sack_reneg = 0;
|
||||||
- tcp_clear_retrans(tp);
|
- tcp_clear_retrans(tp);
|
||||||
|
@ -3856,15 +3859,6 @@ diff -aurN linux-5.4/net/ipv4/tcp.c mptcp-mptcp_trunk/net/ipv4/tcp.c
|
||||||
if (!(val & 1))
|
if (!(val & 1))
|
||||||
inet_csk_enter_pingpong_mode(sk);
|
inet_csk_enter_pingpong_mode(sk);
|
||||||
}
|
}
|
||||||
@@ -3069,7 +3240,7 @@
|
|
||||||
#ifdef CONFIG_TCP_MD5SIG
|
|
||||||
case TCP_MD5SIG:
|
|
||||||
case TCP_MD5SIG_EXT:
|
|
||||||
- if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN))
|
|
||||||
+ if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN) && !sock_flag(sk, SOCK_MPTCP))
|
|
||||||
err = tp->af_specific->md5_parse(sk, optname, optval, optlen);
|
|
||||||
else
|
|
||||||
err = -EINVAL;
|
|
||||||
@@ -3128,6 +3299,32 @@
|
@@ -3128,6 +3299,32 @@
|
||||||
tp->notsent_lowat = val;
|
tp->notsent_lowat = val;
|
||||||
sk->sk_write_space(sk);
|
sk->sk_write_space(sk);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue