From 40c47af27db8d66c25f7a94506ff3a0be4f524ae Mon Sep 17 00:00:00 2001 From: blogic Date: Sun, 25 Mar 2012 08:50:45 +0000 Subject: [ltq-dsl] unbreak dsl firmware loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrej Vlašić git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31066 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ltq-dsl-app/files/dsl_control | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/ltq-dsl-app/files/dsl_control b/package/ltq-dsl-app/files/dsl_control index 67e82b6d0..e83385430 100644 --- a/package/ltq-dsl-app/files/dsl_control +++ b/package/ltq-dsl-app/files/dsl_control @@ -278,9 +278,11 @@ annex_m2p=00_00_00_00_00_00_04_00 # start() { local annex + local fwannex local xtu config_load network - config_get annex atm annex + config_get annex adsl annex + config_get fwannex adsl fwannex # get xtu eval "xtu=\"\${annex_$annex}\"" @@ -289,10 +291,14 @@ start() { [ -n "${annex}" -a -z "${xtu}" ] && echo "unknown annex mode $annex" + # check for invalid fw annex mode + [[ "$fwannex" != "a" && "$fwannex" != "b" ]] && + echo "invalid fwannex: $fwannex" + # 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/dsl-fw-${fwannex}.bin } # -- cgit v1.2.3