aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2016-12-23 16:29:34 +0100
committerHans Dedecker <dedeckeh@gmail.com>2016-12-25 21:00:44 +0100
commit4c9d2c04bae3042007b1314785c0e35049e067d6 (patch)
tree208cdc3ce57ada3bcf46ea89d4952148af49db51
parent4af4f214926b3e8ebdd1830010ccdc8d0fb6c3ff (diff)
downloadupstream-4c9d2c04bae3042007b1314785c0e35049e067d6.tar.gz
upstream-4c9d2c04bae3042007b1314785c0e35049e067d6.tar.bz2
upstream-4c9d2c04bae3042007b1314785c0e35049e067d6.zip
gre: Remove ttl default value assignment (FS#312)
Don't assign a default ttl of 64 for gre tunnels as netifd takes care of the default ttl assignment Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/config/gre/Makefile2
-rwxr-xr-xpackage/network/config/gre/files/gre.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/config/gre/Makefile b/package/network/config/gre/Makefile
index 4511620941..a6b4cac559 100644
--- a/package/network/config/gre/Makefile
+++ b/package/network/config/gre/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gre
PKG_VERSION:=1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index 3f472c4473..58db1d1381 100755
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -25,7 +25,7 @@ gre_generic_setup() {
json_add_string mode "$mode"
json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df"
- json_add_int ttl "${ttl:-64}"
+ [ -n "ttl" ] && json_add_int ttl "$ttl"
[ -n "$tos" ] && json_add_string tos "$tos"
json_add_boolean multicast "$multicast"
json_add_string local "$local"