aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-03-25 08:50:45 +0000
committerJohn Crispin <blogic@openwrt.org>2012-03-25 08:50:45 +0000
commite0e64cdd9b2a782009ca4d87f14ec43017932ea3 (patch)
treee8182788b33d7583360f1e2dbac6a23fbcb833a4
parente1efd040ac6dec6afc344c003369826ba2fee7e7 (diff)
downloadupstream-e0e64cdd9b2a782009ca4d87f14ec43017932ea3.tar.gz
upstream-e0e64cdd9b2a782009ca4d87f14ec43017932ea3.tar.bz2
upstream-e0e64cdd9b2a782009ca4d87f14ec43017932ea3.zip
[ltq-dsl] unbreak dsl firmware loading
Signed-off-by: Andrej Vlašić <andrej.vlasic0@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31066 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/ltq-dsl-app/files/dsl_control10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/ltq-dsl-app/files/dsl_control b/package/ltq-dsl-app/files/dsl_control
index 67e82b6d0a..e833854301 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
}
#