aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-05 17:27:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-05 17:27:02 +0000
commitf2e2c7bc03de14c9c6a15557f94fe02438fd30a1 (patch)
tree358f68ab0683795e79b938d5936bfc47a0893618 /target
parent68b5c56aeddd697c6db50a28f7ee0e40bff907a1 (diff)
downloadupstream-f2e2c7bc03de14c9c6a15557f94fe02438fd30a1.tar.gz
upstream-f2e2c7bc03de14c9c6a15557f94fe02438fd30a1.tar.bz2
upstream-f2e2c7bc03de14c9c6a15557f94fe02438fd30a1.zip
ramips: add ramips_ prefix to get_mac_{binary,nvram} functions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/ramips/base-files/etc/uci-defaults/network12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 6d1de3c408..5891b480c1 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,7 +9,7 @@ if [ ! -x /usr/sbin/maccalc ]; then
return
fi
-get_mac_binary()
+ramips_get_mac_binary()
{
local mtdname="$1"
local seek="$2"
@@ -17,14 +17,14 @@ get_mac_binary()
part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then
- echo "get_mac_binary: partition $mtdname not found!" >&2
+ echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
return
fi
dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
}
-get_mac_nvram()
+ramips_get_mac_nvram()
{
local mtdname="$1"
local key="$2"
@@ -33,7 +33,7 @@ get_mac_nvram()
part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then
- echo "get_mac_nvram: partition $mtdname not found!" >&2
+ echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
return
fi
@@ -82,7 +82,7 @@ ramips_setup_macs()
case $board in
f5d8235-v2)
- lan_mac=$(get_mac_nvram "u-boot" 262148)
+ lan_mac=$(ramips_get_mac_nvram "u-boot" 262148)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;;
@@ -90,7 +90,7 @@ ramips_setup_macs()
b2c | \
nw718 | \
rt-n15)
- lan_mac=$(get_mac_binary factory 4)
+ lan_mac=$(ramips_get_mac_binary factory 4)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;;
esac