| Message ID | 1451422600-32600-3-git-send-email-openwrt@kresin.me |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 12/29/2015 09:56 PM, Mathias Kresin wrote: > 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 <openwrt@kresin.me> Acked-By: Hauke Mehrtens <hauke@hauke-m.de> Activating VDSL every time should be OK for the CPE devices with VDSL support. I do not know what happens with ADSL only chips. this could still cause inter interoperability problems with some broken? DSLAMs. > --- > package/network/config/ltq-vdsl-app/files/dsl_control | 16 ++++++---------- > 1 file changed, 6 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 3ead82b..9bd4eb5 100644 > --- a/package/network/config/ltq-vdsl-app/files/dsl_control > +++ b/package/network/config/ltq-vdsl-app/files/dsl_control > @@ -18,13 +18,14 @@ EXTRA_HELP=" status Get DSL status information > # 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_0C_01_04_00" > +# G.993.2 Annex A/B/C > +xtse_xdsl_a="04_00_04_00_0C_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 > @@ -32,7 +33,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" > > @@ -44,7 +45,6 @@ start_service() { > local annex > local firmware > local xtse > - local xtse_adsl > local mode > > config_load network > @@ -67,12 +67,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}" ] || { >
diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index 3ead82b..9bd4eb5 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -18,13 +18,14 @@ EXTRA_HELP=" status Get DSL status information # 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_0C_01_04_00" +# G.993.2 Annex A/B/C +xtse_xdsl_a="04_00_04_00_0C_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 @@ -32,7 +33,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" @@ -44,7 +45,6 @@ start_service() { local annex local firmware local xtse - local xtse_adsl local mode config_load network @@ -67,12 +67,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}" ] || {
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 <openwrt@kresin.me> --- package/network/config/ltq-vdsl-app/files/dsl_control | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)