qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-20 09:44:44 +02:00
Code

ramips: add ramips_ prefix to get_mac_{binary,nvram} functions

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29450 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-12-05 17:27:02 +00:00
parent 7a583f7854
commit 5db41b5518
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ramips/base-files/etc/uci-defaults/network
View File

@ -9,7 +9,7 @@ if [ ! -x /usr/sbin/maccalc ]; then
return return
fi fi
get_mac_binary() ramips_get_mac_binary()
{ {
local mtdname="$1" local mtdname="$1"
local seek="$2" local seek="$2"
@ -17,14 +17,14 @@ get_mac_binary()
part=$(find_mtd_part "$mtdname") part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then if [ -z "$part" ]; then
echo "get_mac_binary: partition $mtdname not found!" >&2 echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
return return
fi fi
dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac 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 mtdname="$1"
local key="$2" local key="$2"
@ -33,7 +33,7 @@ get_mac_nvram()
part=$(find_mtd_part "$mtdname") part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then if [ -z "$part" ]; then
echo "get_mac_nvram: partition $mtdname not found!" >&2 echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
return return
fi fi
@ -82,7 +82,7 @@ ramips_setup_macs()
case $board in case $board in
f5d8235-v2) 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) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
@ -90,7 +90,7 @@ ramips_setup_macs()
b2c | \ b2c | \
nw718 | \ nw718 | \
rt-n15) 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) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
esac esac