This arranges the code in 02_network to resemble the structure using
lan_macaddr and wan_macaddr variables like in other targets as close
as possible (without becoming non-cosmetic).
Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
Cc: Rafał Miłecki <ra...@milecki.pl>
---
.../bcm53xx/base-files/etc/board.d/02_network | 27 ++++++++-----------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network
b/target/linux/bcm53xx/base-files/etc/board.d/02_network
index f86f12407f..8492ec3277 100755
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -71,37 +71,32 @@ bcm53xx_setup_interfaces()
bcm53xx_setup_macs()
{
local board="$1"
+ local lan_macaddr
+ local wan_macaddr="$(nvram get wan_hwaddr)"
+ local etX_macaddr
- case "$board" in
- dlink,dir-885l | \
- netgear,r7900 | \
- netgear,r8000 | \
- netgear,r8500)
- # As vendor doesn't use eth0 its MAC may be missing. Use one
from eth2.
- et2macaddr="$(nvram get et2macaddr)"
- [ -n "$et2macaddr" ] && ucidef_set_interface_macaddr "lan"
"$et2macaddr"
- ;;
- esac
-
- wan_macaddr="$(nvram get wan_hwaddr)"
case "$board" in
asus,rt-ac87u)
- etXmacaddr=$(nvram get et1macaddr)
+ etX_macaddr=$(nvram get et1macaddr)
;;
dlink,dir-885l | \
netgear,r7900 | \
netgear,r8000 | \
netgear,r8500)
- etXmacaddr=$(nvram get et2macaddr)
+ # As vendor doesn't use eth0 its MAC may be missing. Use one
from eth2.
+ lan_macaddr=$(nvram get et2macaddr)
+ etX_macaddr=$(nvram get et2macaddr)
;;
*)
- etXmacaddr=$(nvram get et0macaddr)
+ etX_macaddr=$(nvram get et0macaddr)
;;
esac
# If WAN MAC isn't explicitly set, calculate it using base MAC as
reference.
- [ -z "$wan_macaddr" -a -n "$etXmacaddr" ] && wan_macaddr=$(macaddr_add
"$etXmacaddr" 1)
+ # However, best things would be to set the proper wan_macaddr directly
above
+ [ -z "$wan_macaddr" -a -n "$etX_macaddr" ] && wan_macaddr=$(macaddr_add
"$etX_macaddr" 1)
+ [ -n "$lan_macaddr" ] && ucidef_set_interface_macaddr "lan"
"$lan_macaddr"
[ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan"
"$wan_macaddr"
}
--
2.20.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
