From 20eadd027f0f7aa1d0e420195be7b7b511046790 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 16 Jun 2021 18:28:00 +0200 Subject: [PATCH 1/2] Update MPTCP --- .../linux/generic/hack-5.4/690-mptcp_trunk.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch b/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch index 8e3ee0228..e71925f85 100644 --- a/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch +++ b/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch @@ -11843,7 +11843,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_ctrl.c linux-5.4.64.mptcp/net/mptcp/mptc +#endif + } +drop: -+ __NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS); ++ NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS); + return 0; +} + @@ -14734,7 +14734,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_input.c linux-5.4.64.mptcp/net/mptcp/mpt + meta_tp->rcv_nxt))) { + mptcp_send_active_reset(meta_sk, GFP_ATOMIC); + tcp_done(meta_sk); -+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); ++ NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); + return -1; + } + @@ -14775,7 +14775,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_input.c linux-5.4.64.mptcp/net/mptcp/mpt + if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq && + after(TCP_SKB_CB(skb)->end_seq - th->fin, tp->rcv_nxt) && + !mptcp_is_data_fin2(skb, tp)) { -+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); ++ NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); + mptcp_send_active_reset(meta_sk, GFP_ATOMIC); + tcp_reset(meta_sk); + return -1; @@ -21440,7 +21440,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_output.c linux-5.4.64.mptcp/net/mptcp/mp + return 0; + +failed: -+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPRETRANSFAIL); ++ NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPRETRANSFAIL); + return err; +} + @@ -21499,7 +21499,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_output.c linux-5.4.64.mptcp/net/mptcp/mp + return; + + if (meta_icsk->icsk_retransmits == 0) -+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPTIMEOUTS); ++ NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPTIMEOUTS); + + meta_icsk->icsk_ca_state = TCP_CA_Loss; + From 5516435164d99d2dac3319b2b91f5cedce1d1265 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 17 Jun 2021 08:09:30 +0200 Subject: [PATCH 2/2] Try to add kmod-macremapper --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 8a234efa1..ac2c10081 100755 --- a/build.sh +++ b/build.sh @@ -487,6 +487,7 @@ else scripts/feeds install -a -d y -f -p openmptcprouter fi cp .config.keep .config +scripts/feeds install kmod-macremapper echo "Done" if [ ! -f "../../$OMR_TARGET_CONFIG" ]; then