From: Hans Dedecker Date: Sat, 9 Feb 2019 19:59:55 +0000 (+0100) Subject: vti: remove setting default firewall zone to wan X-Git-Tag: v19.07.0-rc1~1358 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=630a3639360476b9aaeadc39f8e7636d11c8869b;p=openwrt%2Fopenwrt.git 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 --- 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