From 53e7f084423f30cf586b4deb02659cbe5d330010 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 13 Sep 2011 07:29:59 +0000 Subject: [PATCH 1/1] [backfire] merge r28223 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28224 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6to4/Makefile | 2 +- package/6to4/files/6to4.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/6to4/Makefile b/package/6to4/Makefile index 14c9f2227..8cf66c0a2 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 2fa962239..ed74c2351 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)" -- 2.35.1