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

Merge branch 'testdevelop' into develop

Browse source
This commit is contained in:
suyuan 2020-11-20 11:02:23 +08:00
commit 1ef98d1a07
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.sh
View file

@ -78,9 +78,9 @@ fi
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
if [ "$OMR_OPENWRT" = "default" ]; then
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "a439f1bb478b4b8b4134dbed76266c0032625b6b"
_get_repo feeds/packages https://github.com/openwrt/packages "05769970213a5f9ffb81506b18da288890c05949"
_get_repo feeds/luci https://github.com/openwrt/luci "a805a3178f902fe609d3d4a6c7b6b5b1dad88838"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "7330348f2dbd9f01786041b726837aa393e3ce34"
_get_repo feeds/packages https://github.com/openwrt/packages "78dd3e05a8e4be0625bade05eb1831cb319df34c"
_get_repo feeds/luci https://github.com/openwrt/luci "ceae469a193d54103820d2bf1f599b8f0a26c363"
elif [ "$OMR_OPENWRT" = "master" ]; then
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master"
_get_repo feeds/packages https://github.com/openwrt/packages "master"

2
patches/luci-occitan.patch
View file

@ -1,9 +1,9 @@
--- a/feeds/luci/luci.mk 2020-10-13 09:58:19.887513368 +0200
+++ b/feeds/luci/luci.mk 2020-10-13 09:04:51.724277184 +0200
@@ -34,6 +34,7 @@
LUCI_LANG.mr=Marāṭhī (Marathi)
LUCI_LANG.ms=Bahasa Melayu (Malay)
LUCI_LANG.nb_NO=Norsk (Norwegian)
LUCI_LANG.nl=Nederlands (Dutch)
+LUCI_LANG.oc=Occitan
LUCI_LANG.pl=Polski (Polish)
LUCI_LANG.pt_BR=Português do Brasil (Brazilian Portuguese)

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

@ -4592,12 +4592,13 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
{
int eaten;
struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
@@ -4774,7 +4838,7 @@
@@ -4774,8 +4838,8 @@
int avail = tp->rcv_nxt - tp->copied_seq;
if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
- !sock_flag(sk, SOCK_DONE))
+ !sock_flag(sk, SOCK_DONE) && !mptcp(tp))
- !sock_flag(sk, SOCK_DONE) &&
+ !sock_flag(sk, SOCK_DONE) && !mptcp(tp) &&
tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
return;
sk->sk_data_ready(sk);