From: Steven Barth <cyrus@openwrt.org>
Date: Mon, 29 Sep 2014 18:00:02 +0000 (+0000)
Subject: GRE: Tos support
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6e2262898f1ce420be6156e806f3e4854209ac7e;p=openwrt%2Fstaging%2Fjow.git

GRE: Tos support

Tos support is added as a generic grev4/grev6 parameter which can have the following values :
     -inherit (outer header inherits the tos value of the inner header)
     -hex value

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

SVN-Revision: 42700
---

diff --git a/package/network/config/gre/Makefile b/package/network/config/gre/Makefile
index 9f5135e5a5..9c5c13f169 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:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index 1728b01fcc..4483a08787 100755
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -13,8 +13,8 @@ gre_generic_setup() {
 	local local="$3"
 	local remote="$4"
 	local link="$5"
-	local mtu ttl zone ikey okey icsum ocsum iseqno oseqno
-	json_get_vars mtu ttl zone ikey okey icsum ocsum iseqno oseqno
+	local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
+	json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
 
 	[ -z "$zone" ] && zone="wan"
 
@@ -25,6 +25,7 @@ gre_generic_setup() {
 	json_add_int mtu "${mtu:-1280}"
 	[ -n "$df" ] && json_add_boolean df "$df"
 	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
 	json_add_string local "$local"
 	json_add_string remote "$remote"
 	[ -n "$tunlink" ] && json_add_string link "$tunlink"
@@ -193,6 +194,7 @@ gre_generic_init_config() {
 
 	proto_config_add_int "mtu"
 	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
 	proto_config_add_string "tunlink"
 	proto_config_add_string "zone"
 	proto_config_add_int "ikey"