From a5e5fa26a8169b072367ae2bde56124369bfae59 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Fri, 19 Feb 2021 17:38:13 +0100 Subject: [PATCH] DSL: set the default LinkEncapsulationUsed to 'G.993.2_Annex_K_PTM' if link_encapsulation_used is auto --- dmtree/tr181/dsl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dmtree/tr181/dsl.c b/dmtree/tr181/dsl.c index 93ae59e8..5a161694 100644 --- a/dmtree/tr181/dsl.c +++ b/dmtree/tr181/dsl.c @@ -971,10 +971,10 @@ static char *get_dsl_link_encapsulation_standard(char *str) dsl_link_encapsulation_standard = "G.992.3_Annex_K_PTM"; else if(strcmp(str, "vdsl2_atm") == 0) dsl_link_encapsulation_standard = "G.993.2_Annex_K_ATM"; - else if(strcmp(str, "auto") == 0) - dsl_link_encapsulation_standard = "G.994.1"; - else + else if(strcmp(str, "vdsl2_ptm") == 0) dsl_link_encapsulation_standard = "G.993.2_Annex_K_PTM"; + else + dsl_link_encapsulation_standard = "G.994.1"; return dsl_link_encapsulation_standard; } @@ -1007,7 +1007,7 @@ static int get_DSLChannel_LinkEncapsulationSupported(char *refparam, struct dmct static int get_DSLChannel_LinkEncapsulationUsed(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *link_encapsulation_used = get_dsl_value_without_argument("dsl.channel", ((struct dsl_channel_args*)data)->id, "status", "link_encapsulation_used"); - *value = get_dsl_link_encapsulation_standard(link_encapsulation_used); + *value = (strcmp(link_encapsulation_used, "auto") != 0) ? get_dsl_link_encapsulation_standard(link_encapsulation_used) : "G.993.2_Annex_K_PTM"; return 0; }