aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/base-files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-07-26 20:36:09 +0000
committerJohn Crispin <john@openwrt.org>2014-07-26 20:36:09 +0000
commitb77e92e020c17b5530ec5c1b37cf66ae0cf717e6 (patch)
tree53f5d2138b2c9370a373339a219108a48c849aec /target/linux/ramips/base-files
parent443aee86bfa06cdc6c8169086e637f75b49d967e (diff)
downloadupstream-b77e92e020c17b5530ec5c1b37cf66ae0cf717e6.tar.gz
upstream-b77e92e020c17b5530ec5c1b37cf66ae0cf717e6.tar.bz2
upstream-b77e92e020c17b5530ec5c1b37cf66ae0cf717e6.zip
ramips: ethernet mac cleanup
Compile tested all subtargets and profiles. Unfortunately I don't own any board affected by these changes, so no run tests. Signed-off-by: Roman Yeryomin <roman@advem.lv> SVN-Revision: 41839
Diffstat (limited to 'target/linux/ramips/base-files')
-rwxr-xr-xtarget/linux/ramips/base-files/etc/uci-defaults/02_network36
-rw-r--r--target/linux/ramips/base-files/lib/preinit/06_set_iface_mac109
2 files changed, 22 insertions, 123 deletions
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network
index 85337c238b..f65388f613 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network
@@ -199,19 +199,22 @@ ramips_setup_macs()
case $board in
br-6475nd)
- lan_mac=$(mtd_get_mac_binary devdata 13)
+ lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(mtd_get_mac_binary devdata 7)
;;
w306r-v20)
+ lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 5)
;;
tew-691gr)
+ lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 3)
;;
tew-692gr)
+ lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 4)
;;
@@ -219,10 +222,24 @@ ramips_setup_macs()
m4 |\
x5 |\
x8)
- lan_mac=$(macaddr_add "$lan_mac" -1)
+ lan_mac=$(cat /sys/class/net/eth0/address)
+ lan_mac=$(macaddr_add "$lan_mac" -2)
;;
- dir-620-a1)
+ bc2 |\
+ broadway |\
+ d105 |\
+ dir-620-a1 |\
+ esr-9753 |\
+ freestation5 |\
+ hlk-rm04 | \
+ mpr-a1 | \
+ mpr-a2 | \
+ dir-300-b7 | \
+ dir-320-b1 | \
+ psr-680w |\
+ sl-r7205)
+ lan_mac=$(cat /sys/class/net/eth0/address)
lan_mac=$(macaddr_setbit_la "$lan_mac")
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
@@ -233,12 +250,13 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_ascii nvram wanmac)
;;
- nbg-419n | \
wcr-150gn)
wan_mac=$(mtd_get_mac_binary factory 40)
;;
rt-n56u)
+ lan_mac=$(cat /sys/class/net/eth0/address)
+ lan_mac=$(macaddr_setbit_la "$lan_mac")
wan_mac=$(mtd_get_mac_binary factory 32772)
;;
@@ -250,16 +268,6 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_binary factory 46)
;;
- wl341v3)
- lan_mac=$(mtd_get_mac_binary board-nvram 65440)
- wan_mac=$(macaddr_add "$lan_mac" 1)
- ;;
-
- wr8305rt)
- lan_mac=$(mtd_get_mac_binary factory 4)
- wan_mac=$(macaddr_add "$lan_mac" 1)
- ;;
-
*)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 1)
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
deleted file mode 100644
index 2a0a4fdc76..0000000000
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-preinit_set_mac_address() {
- local mac
-
- . /lib/functions.sh
- . /lib/ramips.sh
-
- case $(ramips_board_name) in
- 3g-6200n |\
- 3g-6200nl |\
- 3g300m | \
- dir-620-d1 |\
- dir-300-b7 | \
- w150m | \
- mzk-w300nh2 |\
- wl-330n |\
- wl-330n3g |\
- wr8305rt)
- mac=$(mtd_get_mac_binary factory 4)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- bc2 |\
- broadway |\
- d105 |\
- dir-620-a1 |\
- esr-9753 |\
- freestation5 |\
- hlk-rm04 | \
- mpr-a1 | \
- mpr-a2 | \
- dir-300-b7 | \
- dir-320-b1 | \
- psr-680w |\
- rt-n56u |\
- sl-r7205)
- mac=$(mtd_get_mac_binary factory 4)
- mac=$(macaddr_setbit_la "$mac")
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- br-6475nd)
- mac=$(mtd_get_mac_binary devdata 13)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- asl26555 |\
- dir-300-b1 |\
- dir-300-b2 |\
- dir-600-b1 |\
- dir-610-a1)
- mac=$(mtd_get_mac_binary devdata 16388)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- cy-swr1100 |\
- dir-645)
- mac=$(mtd_get_mac_ascii nvram lanmac)
- mac=$(macaddr_setbit_la "$mac")
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- dap-1350)
- mac=$(mtd_get_mac_binary devdata 46)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- all0239-3g |\
- all0256n |\
- all5002 |\
- all5003 |\
- awm002-evb |\
- carambola |\
- dir-615-h1 |\
- fonera20n |\
- ip2202 |\
- rt-n13u |\
- hw550-3g |\
- nbg-419n |\
- omni-emb |\
- omni-emb-hpm |\
- px4885 |\
- tew-691gr |\
- tew-692gr |\
- w306r-v20 |\
- w502u |\
- wr6202 |\
- wnce2001 |\
- xdxrn502j)
- mac=$(mtd_get_mac_binary factory 40)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- m3 |\
- m4 |\
- x5 |\
- x8)
- mac=$(mtd_get_mac_binary factory 4)
- mac=$(macaddr_add "$mac" -1)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- wl341v3)
- mac=$(mtd_get_mac_binary board-nvram 65440)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- rt-n10-plus)
- mac=$(mtd_get_mac_binary devconf 4)
- ifconfig eth0 hw ether $mac 2>/dev/null
- ;;
- esac
-}
-
-boot_hook_add preinit_main preinit_set_mac_address