aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-02-09 20:59:55 +0100
committerHans Dedecker <dedeckeh@gmail.com>2019-02-09 21:04:36 +0100
commit630a3639360476b9aaeadc39f8e7636d11c8869b (patch)
treea5391ba5039968449881d4bd00f7822524e47e7e
parent7f33f3d7126f543e2d03276aa3508edbfed80a73 (diff)
downloadupstream-630a3639360476b9aaeadc39f8e7636d11c8869b.tar.gz
upstream-630a3639360476b9aaeadc39f8e7636d11c8869b.tar.bz2
upstream-630a3639360476b9aaeadc39f8e7636d11c8869b.zip
vti: remove setting default firewall zone to wan
Same reasoning as in bdedb798150a58ad7ce3c4741f2f31df97e84c3f; don't set default firewall zone to wan as the firewall zone for the vti interface can be configured in the firewall config or it makes it impossible not to specify a firewall zone for the vti interface. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/config/vti/Makefile2
-rwxr-xr-xpackage/network/config/vti/files/vti.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/package/network/config/vti/Makefile b/package/network/config/vti/Makefile
index 0a4657c94e..29b83ce234 100644
--- a/package/network/config/vti/Makefile
+++ b/package/network/config/vti/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vti
PKG_VERSION:=1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/vti/files/vti.sh b/package/network/config/vti/files/vti.sh
index 0443800a0c..ebfd9d41e1 100755
--- a/package/network/config/vti/files/vti.sh
+++ b/package/network/config/vti/files/vti.sh
@@ -16,8 +16,6 @@ vti_generic_setup() {
local mtu zone ikey
json_get_vars mtu zone ikey okey
- [ -z "$zone" ] && zone="wan"
-
proto_init_update "$link" 1
proto_add_tunnel