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

Fix mtpcp patch for kernel 4.14

Browse source
This commit is contained in:
Ycarus 2019-05-04 15:40:12 +02:00
parent c95f1d7534
commit d462b962ea
1 changed files with 0 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch
View file

@ -3835,43 +3835,6 @@ diff -aurN linux-4.14.109/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_in
}
/* 2. Tuning advertised window (window_clamp, rcv_ssthresh)
@@ -389,10 +382,15 @@
static void tcp_grow_window(struct sock *sk, const struct sk_buff *skb)
{
struct tcp_sock *tp = tcp_sk(sk);
+ struct sock *meta_sk = mptcp(tp) ? mptcp_meta_sk(sk) : sk;
+ struct tcp_sock *meta_tp = tcp_sk(meta_sk);
+
+ if (is_meta_sk(sk))
+ return;
/* Check #1 */
- if (tp->rcv_ssthresh < tp->window_clamp &&
- (int)tp->rcv_ssthresh < tcp_space(sk) &&
+ if (meta_tp->rcv_ssthresh < meta_tp->window_clamp &&
+ (int)meta_tp->rcv_ssthresh < tcp_space(meta_sk) &&
!tcp_under_memory_pressure(sk)) {
int incr;
@@ -400,14 +398,14 @@
* will fit to rcvbuf in future.
*/
if (tcp_win_from_space(skb->truesize) <= skb->len)
- incr = 2 * tp->advmss;
+ incr = 2 * meta_tp->advmss;
else
- incr = __tcp_grow_window(sk, skb);
+ incr = __tcp_grow_window(meta_sk, skb);
if (incr) {
incr = max_t(int, incr, 2 * skb->len);
- tp->rcv_ssthresh = min(tp->rcv_ssthresh + incr,
- tp->window_clamp);
+ meta_tp->rcv_ssthresh = min(meta_tp->rcv_ssthresh + incr,
+ meta_tp->window_clamp);
inet_csk(sk)->icsk_ack.quick |= 1;
}
}
@@ -601,7 +599,10 @@
tcp_mstamp_refresh(tp);