summaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-21 18:54:58 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-21 18:54:58 +0000
commitaf83088d4355ae96152c9260844d7a9a6f28d58a (patch)
tree34f291f61e257ae34dea1fad1640cbe468742c08 /package/base-files
parentee5d875593b43e78a01fecfbd458acd83019339c (diff)
base-files: network.sh: simplify network_get_prefix6()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/files/lib/functions/network.sh11
1 files changed, 4 insertions, 7 deletions
diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
index 8f87d1d0b..86b6fc569 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 $?
}