From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 21 Jan 2013 18:54:58 +0000 (+0000)
Subject: base-files: network.sh: simplify network_get_prefix6()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b2db1838aa78a7c0ce22375dda5d730fd086035;p=openwrt%2Fstaging%2Fnbd.git

base-files: network.sh: simplify network_get_prefix6()

SVN-Revision: 35286
---

diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
index 8f87d1d0be..86b6fc5691 100644
--- a/package/base-files/files/lib/functions/network.sh
+++ b/package/base-files/files/lib/functions/network.sh
@@ -186,18 +186,15 @@ network_get_subnet6() { __network_ipaddr "$1" "$2" 6 1; }
 
 # determine IPv6 prefix
 network_get_prefix6() {
-	local __prefix="$1"
+	local __var="$1"
 	local __iface="$2"
 	local __address
 	local __mask
 
 	__network_parse_ifstatus "$__iface" || return 1
-	__network_export __address "${__iface}_prefix6_address"
-	local return="$?"
-	[ "$return" -eq 0 ] || return $?
-	__network_export __mask "${__iface}_prefix6_mask"
-	eval "$__prefix=$__address/$__mask"
-	return 0
+	__network_export __mask "${__iface}_prefix6_mask" || return 1
+	__network_export __var "${__iface}_prefix6_address" "$__mask"
+	return $?
 }