From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 13 Sep 2011 07:29:59 +0000 (+0000)
Subject: merge r28223
X-Git-Tag: backfire_10.03.1~121
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=42918e9dd9304d00c3bc091fc90e334c54b88d48;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r28223

SVN-Revision: 28224
---

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index 14c9f2227d..8cf66c0a28 100644
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
-PKG_VERSION:=6
+PKG_VERSION:=7
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 2fa9622398..ed74c23513 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -203,8 +203,8 @@ setup_interface_6to4() {
 
 				grep -qs "^ *$adv_ifname:" /proc/net/dev && {
 					local adv_valid_lifetime adv_preferred_lifetime
-					config_get adv_valid_lifetime     "${adv_interface:-lan}" adv_valid_lifetime
-					config_get adv_preferred_lifetime "${adv_interface:-lan}" adv_preferred_lifetime
+					config_get adv_valid_lifetime     "$cfg" adv_valid_lifetime
+					config_get adv_preferred_lifetime "$cfg" adv_preferred_lifetime
 
 					local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"