From 2fe464a712f8da597475d63a0ad28ec678eb404a Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 17 Dec 2019 14:37:26 +0100
Subject: lantiq: reorganize 02_network board.d files

This reorganizes 02_network board.d files based on what's done for
ath79 and ramips: Instead of putting all settings into a single big
case, the interface/dsl/MAC address setup is put into separate
functions with a specific switch case for each of them. This makes
grouping of devices much easier and should be easier to read, too.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../lantiq/ase/base-files/etc/board.d/02_network   | 71 +++++++++++++---------
 1 file changed, 42 insertions(+), 29 deletions(-)

(limited to 'target/linux/lantiq/ase')

diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
index 2334d6c25b..0bda3e4763 100755
--- a/target/linux/lantiq/ase/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
@@ -7,37 +7,50 @@
 . /lib/functions/system.sh
 . /lib/functions/lantiq.sh
 
-board_config_update
-
-annex="a"
-
-lan_mac=""
-wan_mac=""
+lantiq_setup_interfaces()
+{
+	local board="$1"
+
+	case "$board" in
+	*)
+		ucidef_set_interface_lan 'eth0'
+		;;
+	esac
+}
+
+lantiq_setup_dsl()
+{
+	local board="$1"
+	local annex="b"
+
+	case "$board" in
+	esac
+
+	lantiq_setup_dsl_helper "$annex"
+}
+
+lantiq_setup_macs()
+{
+	local board="$1"
+	local lan_mac=""
+	local wan_mac=""
+
+	case "$board" in
+	allnet,all0333cj)
+		lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
+		;;
+	esac
+
+	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
+	[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"
+}
 
+board_config_update
 board=$(board_name)
-
-case "$board" in
-allnet,all0333cj)
-	annex="b"
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	ucidef_set_interface_lan 'eth0'
-	;;
-netgear,dgn1000b)
-	annex="b"
-	ucidef_set_interface_lan 'eth0'
-	;;
-*)
-	ucidef_set_interface_lan 'eth0'
-	;;
-esac
-
-lantiq_setup_dsl_helper "$annex"
-
-[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
-[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"
-
+lantiq_setup_interfaces $board
+lantiq_setup_dsl $board
+lantiq_setup_macs $board
 board_config_flush
 
 exit 0
-
-- 
cgit v1.2.3