base-files: network.sh: simplify network_get_prefix6()
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 21 Jan 2013 18:54:58 +0000 (18:54 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 21 Jan 2013 18:54:58 +0000 (18:54 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35286 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/base-files/files/lib/functions/network.sh

index 8f87d1d..86b6fc5 100644 (file)
@@ -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 $?
 }