From: John Crispin <john@openwrt.org>
Date: Fri, 21 Dec 2012 13:47:25 +0000 (+0000)
Subject: minor cleanup for adsl firmware handling
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9a134fb7c0ccaf77a0f6851d7496494a4cfa4fab;p=openwrt%2Fstaging%2Fluka.git

minor cleanup for adsl firmware handling

SVN-Revision: 34818
---

diff --git a/package/platform/lantiq/ltq-adsl-app/files/dsl_control b/package/platform/lantiq/ltq-adsl-app/files/dsl_control
index c3c712db8a..e8a286f2bb 100644
--- a/package/platform/lantiq/ltq-adsl-app/files/dsl_control
+++ b/package/platform/lantiq/ltq-adsl-app/files/dsl_control
@@ -277,27 +277,23 @@ annex_m2p=00_00_00_00_00_00_04_00
 #
 start() {
 	local annex
-	local fwannex
+	local firmware
 	local xtu
 	config_load network
-	config_get annex adsl annex
-	config_get fwannex adsl fwannex
+	config_get annex wan annex
+	config_get firmware wan firmware
 
 	# get xtu
 	eval "xtu=\"\${annex_$annex}\""
 
-	# check for invalid annex mode
-	[ -n "${annex}" -a -z "${xtu}" ] &&
-		echo "unknown annex mode $annex"
-
-	# check for invalid fw annex mode
-	[[ "$fwannex" != "a" && "$fwannex" != "b" ]] &&
-		echo "invalid fwannex: $fwannex"
+	# check for firmware
+	[ -z "${firmware}" ] &&
+		firmware=adsl.bin
 
 	# start CPE dsl daemon in the background
 	service_start /sbin/dsl_cpe_control -i${xtu} \
 			-n /sbin/dsl_notify.sh \
-			-f /lib/firmware/ModemHWE.bin
+			-f /lib/firmware/${firmware}
 }
 
 #
@@ -308,7 +304,7 @@ start() {
 stop() {
 	DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
 	DSL_INTERFACE_STATUS="DOWN" \
-	/sbin/dsl_notify.sh
+		/sbin/dsl_notify.sh
 
 	service_stop /sbin/dsl_cpe_control
 }