From 236bcdd002b3a3d0f615e78f9d9be5a1b927211b Mon Sep 17 00:00:00 2001 From: Antonio Aloisio Date: Sun, 25 Apr 2021 11:35:47 +0200 Subject: [PATCH] dsl: fix: Moved ewan nvram vars outside RTCONFIG_FRS_FEEDBACK scope in shared/defaults.c so that can are part of the default ones and the UI can store them --- release/src/router/shared/defaults.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/release/src/router/shared/defaults.c b/release/src/router/shared/defaults.c index 159760e0ca9..af5ec9204c3 100644 --- a/release/src/router/shared/defaults.c +++ b/release/src/router/shared/defaults.c @@ -3259,12 +3259,16 @@ struct nvram_tuple router_defaults[] = { { "fb_Subscribed_Info", "", CKN_STR64, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, { "fb_attach_iptables", "", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, { "fb_availability", "", CKN_STR64, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, - { "ewan_dot1q", "0", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, - { "ewan_vid", "0", CKN_STR4, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, - { "ewan_dot1p", "0", CKN_STR4, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, #endif /* RTCONFIG_DSL */ #endif /* RTCONFIG_FRS_FEEDBACK */ +#ifdef RTCONFIG_DSL + // Gnuton: Fixes https://github.com/gnuton/asuswrt-merlin.ng/issues/97 + { "ewan_dot1q", "0", CKN_STR1, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, + { "ewan_vid", "0", CKN_STR4, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, + { "ewan_dot1p", "0", CKN_STR4, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, +#endif /* RTCONFIG_DSL */ + #ifdef __CONFIG_NORTON__ { "nga_lickey", "0", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 }, { "nga_user", "0", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },