From: Bjørn Mork <bjorn@mork.no>
Date: Mon, 12 Apr 2021 12:27:23 +0000 (+0200)
Subject: realtek: revert to "standard" management configuration
X-Git-Tag: v22.03.0-rc1~1068
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9e7149f729e9b7b18a2ad0e7ba9d939f678e3eac;p=openwrt%2Fstaging%2Fhauke.git

realtek: revert to "standard" management configuration

The default management interface should be easy to find for users
doing "blind" installations without console access.  There are
already multiple examples in the forum of advanced early adopters
having problems locating the management interface after installing
OpenWrt.

Requiring tagged VLAN configration to access the initial management
interface creates unnecessary hassle at best. Errors on the other
end are close to impossible to debug without console access, even
for advanced users.  Less advanced users might have problems with
the concept of VLAN tagging.

Limiting management access to a single arbitrary port among up to
52 possible LAN ports makes this even more difficult, for no
reason at all. Users might have reasons to use a different port
for management.  And they might even have difficulties using the
OpenWrt selected one. The port might be the wrong type for their
management link (e.g copper instead of fibre).  Or they might
depend on PoE power from a device which they can't reconfigure.

User expectations will be based on
- OpenWrt defaults for other devices
- stock firmware default for the device in question
- common default behaviour of similar devices

All 3 cases point to a static IP address accessible on the native
VLAN of any LAN port.  A switch does not have any WAN port.  All
ports are LAN ports.

This changes the default network configuration in line with these
expectations.

Cc: John Crispin <john@phrozen.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index 58461c9c99..4eeb5768e3 100644
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -22,27 +22,23 @@ for lan in /sys/class/net/lan*; do
 	lan_list="$lan_list $(basename $lan)"
 done
 ucidef_set_bridge_device switch
-ucidef_set_interface_wan "$lan_list"
-ucidef_set_interface "lan" device "lan1:t" protocol "static" vlan 100
+ucidef_set_interface_lan "$lan_list"
 
 lan_mac=""
-wan_mac=""
 label_mac=""
 case $board in
 *)
-	wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
+	lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
 	label_mac=$lan_mac
 	;;
 esac
 
-lan_mac=$(macaddr_setbit_la $wan_mac)
-
 ucidef_set_interface_macaddr "lan" $lan_mac
-ucidef_set_interface_macaddr "wan" $wan_mac
-ucidef_set_bridge_mac "$wan_mac"
-ucidef_set_network_device_mac eth0 $wan_mac
+ucidef_set_bridge_mac "$lan_mac"
+ucidef_set_network_device_mac eth0 $lan_mac
 for lan in $lan_list; do
 	ucidef_set_network_device_mac $lan $lan_mac
+	lan_mac=$(macaddr_setbit_la $lan_mac)
 	lan_mac=$(macaddr_add $lan_mac 1)
 done
 [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac