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

Revert "huitui"

Browse source 
This reverts commit 208159358c.
This commit is contained in:
suyuan 2020-12-24 15:26:19 +08:00
parent 208159358c
commit 4e3a116ce4
5 changed files with 0 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

25
root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
View file

@ -3289,7 +3289,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
*/
@@ -387,15 +421,15 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
/* Try to redo what tcp_v4_send_synack did. */
req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);
@ -3301,8 +3300,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
+ tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
=======
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
(req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
req->rsk_window_clamp = full_space;
@ -3313,9 +3310,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
- dst_metric(&rt->dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, full_space, req->mss,
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@ -4053,7 +4047,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
struct tcp_zerocopy_receive zc;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -3862,7 +4143,9 @@
if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
@ -4068,8 +4061,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@@ -3878,6 +4161,8 @@
int tcp_abort(struct sock *sk, int err)
@ -4626,7 +4617,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -4774,7 +4838,7 @@
int avail = tp->rcv_nxt - tp->copied_seq;
@ -4636,8 +4626,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
=======
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@@ -4774,8 +4838,8 @@
int avail = tp->rcv_nxt - tp->copied_seq;
@ -4646,9 +4634,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
+ !sock_flag(sk, SOCK_DONE) && !mptcp(tp) &&
tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@ -6769,7 +6754,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
@@ -241,15 +259,15 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
}
@ -6781,8 +6765,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
+ tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
=======
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
(req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
req->rsk_window_clamp = full_space;
@ -6793,9 +6775,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
- dst_metric(dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, full_space, req->mss,
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@ -23737,7 +23716,6 @@ diff -aurN linux-5.4.64/tools/include/uapi/linux/bpf.h linux-5.4.64.mptcp/tools/
BPF_TCP_MAX_STATES /* Leave at the end! */
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
};
=======
@ -23746,6 +23724,3 @@ diff -aurN linux-5.4.64/tools/include/uapi/linux/bpf.h linux-5.4.64.mptcp/tools/
=======
};
>>>>>>> parent of 602cd0b... fixomr
=======
};
>>>>>>> parent of 602cd0b... fixomr