mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

MPTCP 0.95 for kernel 4.19

Browse source
This commit is contained in:
Ycarus 2019-04-22 17:10:49 +02:00
parent e253715ce5
commit 151facd559
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
root/target/linux/generic/config-4.19
View file

@ -1871,7 +1871,7 @@ CONFIG_HW_PERF_EVENTS=y
# CONFIG_HW_RANDOM_OMAP3_ROM is not set # CONFIG_HW_RANDOM_OMAP3_ROM is not set
# CONFIG_HW_RANDOM_PPC4XX is not set # CONFIG_HW_RANDOM_PPC4XX is not set
# CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_TIMERIOMEM is not set
CONFIG_HW_RANDOM_TPM=y # CONFIG_HW_RANDOM_TPM is not set
# CONFIG_HW_RANDOM_VIA is not set # CONFIG_HW_RANDOM_VIA is not set
# CONFIG_HW_RANDOM_VIRTIO is not set # CONFIG_HW_RANDOM_VIRTIO is not set
# CONFIG_HX711 is not set # CONFIG_HX711 is not set

20
root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch
View file

@ -4714,26 +4714,6 @@ diff -aurN linux-4.19.27/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp
req->cookie_ts = tmp_opt.tstamp_ok; req->cookie_ts = tmp_opt.tstamp_ok;
if (!tmp_opt.tstamp_ok) if (!tmp_opt.tstamp_ok)
inet_rsk(req)->ecn_ok = 0; inet_rsk(req)->ecn_ok = 0;
@@ -6511,12 +6707,18 @@
fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst);
}
if (fastopen_sk) {
+ struct sock *meta_sk = fastopen_sk;
+
+ if (mptcp(tcp_sk(fastopen_sk)))
+ meta_sk = mptcp_meta_sk(fastopen_sk);
af_ops->send_synack(fastopen_sk, dst, &fl, req,
&foc, TCP_SYNACK_FASTOPEN);
/* Add the child socket directly into the accept queue */
- inet_csk_reqsk_queue_add(sk, req, fastopen_sk);
+ inet_csk_reqsk_queue_add(sk, req, meta_sk);
sk->sk_data_ready(sk);
bh_unlock_sock(fastopen_sk);
+ if (meta_sk != fastopen_sk)
+ bh_unlock_sock(meta_sk);
sock_put(fastopen_sk);
} else {
tcp_rsk(req)->tfo_listener = false;
diff -aurN linux-4.19.27/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c diff -aurN linux-4.19.27/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c
--- linux-4.19.27/net/ipv4/tcp_ipv4.c 2019-03-05 17:58:54.000000000 +0100 --- linux-4.19.27/net/ipv4/tcp_ipv4.c 2019-03-05 17:58:54.000000000 +0100
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-04-05 23:12:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-04-05 23:12:06.000000000 +0200