hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ramips: use the mtd_get_mac_* helpers

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35613
master
Gabor Juhos 12 years ago
parent 70d40b2ddd
commit 753d713e92
3 changed files with 30 additions and 66 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      target/linux/ramips/base-files/etc/uci-defaults/02_network
  2. 17
      target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
  3. 37
      target/linux/ramips/base-files/lib/ramips.sh

42
target/linux/ramips/base-files/etc/uci-defaults/02_network
Unescape View File

@ -148,7 +148,7 @@ ramips_setup_macs()
all0256n | \ all0256n | \
all5002 | \ all5002 | \
dir-615-h1) dir-615-h1)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
;; ;;
3g-6200n | \ 3g-6200n | \
3g300m | \ 3g300m | \
@ -164,89 +164,89 @@ ramips_setup_macs()
rt-n15 | \ rt-n15 | \
sl-r7205 | \ sl-r7205 | \
wl-351) wl-351)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
w306r-v20) w306r-v20)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5)
;; ;;
rt-n13u | \ rt-n13u | \
fonera20n) fonera20n)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
dir-300-b1 |\ dir-300-b1 |\
dir-300-b2 |\ dir-300-b2 |\
dir-600-b1) dir-600-b1)
lan_mac=$(ramips_get_mac_binary devdata 16388) lan_mac=$(mtd_get_mac_binary devdata 16388)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
dir-620-a1) dir-620-a1)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00")
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
dir-645) dir-645)
lan_mac=$(ramips_get_mac_nvram nvram lanmac) lan_mac=$(mtd_get_mac_ascii nvram lanmac)
wan_mac=$(ramips_get_mac_nvram nvram wanmac) wan_mac=$(mtd_get_mac_ascii nvram wanmac)
;; ;;
esr-9753 | \ esr-9753 | \
ur-336un) ur-336un)
lan_mac=$(ramips_get_mac_binary devdata 16388) lan_mac=$(mtd_get_mac_binary devdata 16388)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
nbg-419n | \ nbg-419n | \
wcr-150gn) wcr-150gn)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(ramips_get_mac_binary factory 40) wan_mac=$(mtd_get_mac_binary factory 40)
;; ;;
omni-emb-hpm) omni-emb-hpm)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
;; ;;
f5d8235-v2) f5d8235-v2)
lan_mac=$(ramips_get_mac_binary "u-boot" 262148) lan_mac=$(mtd_get_mac_binary "u-boot" 262148)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
rt-n56u) rt-n56u)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(ramips_get_mac_binary factory 32772) wan_mac=$(mtd_get_mac_binary factory 32772)
;; ;;
tew-691gr) tew-691gr)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3)
;; ;;
tew-692gr) tew-692gr)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4)
;; ;;
all0239-3g | \ all0239-3g | \
carambola | \ carambola | \
w502u) w502u)
lan_mac=$(ramips_get_mac_binary factory 40) lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(ramips_get_mac_binary factory 46) wan_mac=$(mtd_get_mac_binary factory 46)
;; ;;
wl341v3) wl341v3)
lan_mac=$(ramips_get_mac_binary board-nvram 65440) lan_mac=$(mtd_get_mac_binary board-nvram 65440)
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;; ;;
wli-tx4-ag300n) wli-tx4-ag300n)
lan_mac=$(ramips_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
;; ;;
esac esac

17
target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
Unescape View File

@ -5,6 +5,7 @@
preinit_set_mac_address() { preinit_set_mac_address() {
local mac local mac
. /lib/functions.sh
. /lib/ramips.sh . /lib/ramips.sh
case $(ramips_board_name) in case $(ramips_board_name) in
@ -13,7 +14,7 @@ preinit_set_mac_address() {
mzk-w300nh2 |\ mzk-w300nh2 |\
wl-330n |\ wl-330n |\
wl-330n3g) wl-330n3g)
mac=$(ramips_get_mac_binary factory 4) mac=$(mtd_get_mac_binary factory 4)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
bc2 |\ bc2 |\
@ -25,23 +26,23 @@ preinit_set_mac_address() {
psr-680w |\ psr-680w |\
rt-n56u |\ rt-n56u |\
sl-r7205) sl-r7205)
mac=$(ramips_get_mac_binary factory 4) mac=$(mtd_get_mac_binary factory 4)
mac=$(maccalc or "$mac" "02:00:00:00:00:00") mac=$(maccalc or "$mac" "02:00:00:00:00:00")
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
dir-300-b1 |\ dir-300-b1 |\
dir-300-b2 |\ dir-300-b2 |\
dir-600-b1) dir-600-b1)
mac=$(ramips_get_mac_binary devdata 16388) mac=$(mtd_get_mac_binary devdata 16388)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
dir-645) dir-645)
mac=$(ramips_get_mac_nvram nvram lanmac) mac=$(mtd_get_mac_ascii nvram lanmac)
mac=$(maccalc or "$mac" "02:00:00:00:00:00") mac=$(maccalc or "$mac" "02:00:00:00:00:00")
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
dap-1350) dap-1350)
mac=$(ramips_get_mac_binary devdata 46) mac=$(mtd_get_mac_binary devdata 46)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
all0239-3g |\ all0239-3g |\
@ -61,15 +62,15 @@ preinit_set_mac_address() {
w502u |\ w502u |\
wr6202 |\ wr6202 |\
xdxrn502j) xdxrn502j)
mac=$(ramips_get_mac_binary factory 40) mac=$(mtd_get_mac_binary factory 40)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
wl341v3) wl341v3)
mac=$(ramips_get_mac_binary board-nvram 65440) mac=$(mtd_get_mac_binary board-nvram 65440)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
rt-n10-plus) rt-n10-plus)
mac=$(ramips_get_mac_binary devconf 4) mac=$(mtd_get_mac_binary devconf 4)
ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth0 hw ether $mac 2>/dev/null
;; ;;
esac esac

37
target/linux/ramips/base-files/lib/ramips.sh
Unescape View File

@ -3,43 +3,6 @@
# Copyright (C) 2010 OpenWrt.org # Copyright (C) 2010 OpenWrt.org
# #
ramips_get_mac_binary()
{
local mtdname="$1"
local seek="$2"
local part
. /lib/functions.sh
part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then
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
}
ramips_get_mac_nvram()
{
local mtdname="$1"
local key="$2"
local part
local mac_dirty
. /lib/functions.sh
part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then
echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
return
fi
mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
# "canonicalize" mac
/usr/sbin/maccalc add "$mac_dirty" 0
}
ramips_board_name() { ramips_board_name() {
local machine local machine
local name local name

Write Preview
Loading…
Cancel
Save