[backfire] merge r28223

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

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index 14c9f2227d1e50b0793a6ba464ff9d1d2c876a65..8cf66c0a28db008fecb16afb05b4934ac98e77c4 100644 (file)
--- 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 2fa96223987b3a9f57f1da3a2de08fd85bd807c9..ed74c23513f2cf629dfe36e86ff612840edff42b 100755 (executable)
--- 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)"