X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2F6in4%2Ffiles%2F6in4.sh;h=bea2e82ea36e93a709df2a2b9c15fd81ae56d206;hb=40e5eeb73a30b2f4ffda8f418fcf80c863d70135;hp=a119138d0f78cd899239bd7778336ed649834177;hpb=1d9a4a01b965df6d97836aaf23df0d940029c692;p=openwrt-10.03%2F.git

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