mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Merge branch 'pr/25' into testdevelop
This commit is contained in:
commit
bdecb27093
3 changed files with 7 additions and 10 deletions
11
build.sh
11
build.sh
|
@ -237,13 +237,10 @@ fi
|
||||||
echo "Done"
|
echo "Done"
|
||||||
|
|
||||||
# Add BBR2 patch, only working on 64bits images for now
|
# 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"
|
||||||
echo "Checking if BBRv2 patch is set or not"
|
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
|
||||||
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
|
echo "apply..."
|
||||||
echo "apply..."
|
patch -N -p1 -s < ../../patches/bbr2.patch
|
||||||
patch -N -p1 -s < ../../patches/bbr2.patch
|
|
||||||
fi
|
|
||||||
echo "Done"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Checking if smsc75xx patch is set or not"
|
echo "Checking if smsc75xx patch is set or not"
|
||||||
|
|
|
@ -77,7 +77,7 @@ IS_PACKAGE_BUILD := $(if $(filter package/%,$(BUILD_SUBDIR)),1)
|
||||||
|
|
||||||
OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH))
|
OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH))
|
||||||
|
|
||||||
ifeq ($(ARCH),powerpc)
|
ifneq (,$(findstring $(ARCH) , aarch64 aarch64_be powerpc ))
|
||||||
FPIC:=-fPIC
|
FPIC:=-fPIC
|
||||||
else
|
else
|
||||||
FPIC:=-fpic
|
FPIC:=-fpic
|
||||||
|
|
|
@ -282,7 +282,7 @@ index 32772d6ded4e..2d6677521575 100644
|
||||||
+ u32 gso_max_size)
|
+ u32 gso_max_size)
|
||||||
+{
|
+{
|
||||||
+ u32 segs;
|
+ u32 segs;
|
||||||
+ u64 bytes;
|
+ u32 bytes;
|
||||||
+
|
+
|
||||||
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
|
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
|
||||||
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;
|
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;
|
||||||
|
@ -345,7 +345,7 @@ index 32772d6ded4e..2d6677521575 100644
|
||||||
+ u32 gso_max_size)
|
+ u32 gso_max_size)
|
||||||
+{
|
+{
|
||||||
+ u32 segs;
|
+ u32 segs;
|
||||||
+ u64 bytes;
|
+ u32 bytes;
|
||||||
+
|
+
|
||||||
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
|
+ /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
|
||||||
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;
|
+ bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue