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-12-09 09:12:09 +08:00
commit 5cbe24bf9b
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
build.sh
View file

@ -237,13 +237,10 @@ fi
echo "Done"
# Add BBR2 patch, only working on 64bits images for now
if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then
echo "Checking if BBRv2 patch is set or not"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
echo "apply..."
patch -N -p1 -s < ../../patches/bbr2.patch
fi
echo "Done"
echo "Checking if BBRv2 patch is set or not"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
echo "apply..."
patch -N -p1 -s < ../../patches/bbr2.patch
fi
echo "Checking if smsc75xx patch is set or not"

2
root/rules.mk
View file

@ -77,7 +77,7 @@ IS_PACKAGE_BUILD := $(if $(filter package/%,$(BUILD_SUBDIR)),1)
OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH))
ifeq ($(ARCH),powerpc)
ifneq (,$(findstring $(ARCH) , aarch64 aarch64_be powerpc ))
FPIC:=-fPIC
else
FPIC:=-fpic

4
root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch
View file

@ -282,7 +282,7 @@ index 32772d6ded4e..2d6677521575 100644
+ u32 gso_max_size)
+{
+ u32 segs;
+ u64 bytes;
+ u32 bytes;
+
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;
@ -345,7 +345,7 @@ index 32772d6ded4e..2d6677521575 100644
+ u32 gso_max_size)
+{
+ u32 segs;
+ u64 bytes;
+ u32 bytes;
+
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;