Merge branch 'test' into develop

suyuan168 · Jun 17, 2021 · 853b7f0 · 853b7f0
2 parents 892a7e8 + 0f5def0
commit 853b7f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -484,6 +484,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

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
@@ -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;
 +