From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 19 Aug 2010 00:59:48 +0000 (+0000)
Subject: [backfire] merge r22708
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=40e5eeb73a30b2f4ffda8f418fcf80c863d70135;hp=1d9a4a01b965df6d97836aaf23df0d940029c692;p=openwrt-10.03%2F.git

[backfire] merge r22708

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22709 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 289d28ee3..c56b9c57c 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=4
+PKG_VERSION:=5
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index a119138d0..bea2e82ea 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -28,8 +28,7 @@ setup_interface_6in4() {
 	local cfg="$2"
 	local link="6in4-$cfg"
 
-	local local4
-	config_get local4 "$cfg" ipaddr
+	local local4=$(uci_get network "$cfg" local4)
 
 	local remote4
 	config_get remote4 "$cfg" peeraddr
@@ -62,10 +61,9 @@ setup_interface_6in4() {
 		uci_set_state network "$cfg" ifname $link
 		uci_set_state network "$cfg" auto 0
 
-		ip tunnel add $link mode sit remote $remote4 local $local4 ttl 255
+		ip tunnel add $link mode sit remote $remote4 local $local4 ttl ${ttl:-64}
 		ip link set $link up
 		ip link set mtu ${mtu:-1280} dev $link
-		ip tunnel change $link ttl ${ttl:-64}
 		ip addr add $local6 dev $link
 
 		uci_set_state network "$cfg" ipaddr $local4