From 7816dffd036f6d29bb885478defbf875cdbde003 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 1 Jan 2016 21:20:02 +0000 Subject: [PATCH] ltq-vdsl-app: add/enable missing G.993.2 XTSE bits This patch adds the missing VDSL2 bits to the annex specific XTSE (like it should be according to the comments above the XTSE bits). Since r47933 it's mandatory to remove the annex option to switch to VDSL2 (only) operation mode. As shown by ticket #21436 and a few mails I received personally, even experienced users are not aware that they have to remove the annex option to get their VDSL2 line working and as shown by this patch it doesn't need to be that "complicated". Signed-off-by: Mathias Kresin SVN-Revision: 48051 --- .../config/ltq-vdsl-app/files/dsl_control | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index cc65daad41..22d775cf39 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -11,16 +11,20 @@ EXTRA_HELP=" status Get DSL status information [ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh +# +# ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE)) +# # G.992.1 Annex A # G.992.3 Annex A / L-US1 / L_US-2 / M # G.992.5 Annex A / M -xtse_adsl_a="04_00_04_00_4C_01_04_00" +# G.993.2 Annex A/B/C +xtse_xdsl_a="04_00_04_00_4C_01_04_07" # G.992.1 Annex B # G.992.3 Annex B # G.992.5 Annex B # G.993.2 Annex A/B/C -xtse_adsl_b="10_00_10_00_00_04_00_00" +xtse_adsl_b="10_00_10_00_00_04_00_07" # G.992.1 Annex B # G.992.3 Annex B @@ -28,7 +32,7 @@ xtse_adsl_b="10_00_10_00_00_04_00_00" # G.992.5 Annex B # G.992.5 Annex J # G.993.2 Annex A/B/C -xtse_adsl_j="10_00_10_40_00_04_01_00" +xtse_adsl_j="10_00_10_40_00_04_01_07" xtse_vdsl="00_00_00_00_00_00_00_07" @@ -40,7 +44,6 @@ start_service() { local annex local firmware local xtse - local xtse_adsl local mode config_load network @@ -63,12 +66,8 @@ start_service() { ;; esac - eval "xtse_adsl=\"\${xtse_adsl_$annex}\"" - if [ "${xtse_adsl}" ]; then - xtse=$xtse_adsl - else - xtse=$xtse_vdsl - fi + eval "xtse=\"\${xtse_xdsl_$annex}\"" + [ -z "${xtse}" ] && xtse=$xtse_vdsl [ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin [ -f "${firmware}" ] || {