aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/config
diff options
context:
space:
mode:
authorAndre Heider <a.heider@gmail.com>2021-12-16 12:50:59 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-08 00:49:59 +0100
commit5ee1e045174bad1b7f2754bb022346acc60220f5 (patch)
treed95e741e4cee6bf998213a778f06bd49f8bc65d0 /package/network/config
parenta54b406ccb7b29a86e43e5535b86efede52157e6 (diff)
downloadupstream-5ee1e045174bad1b7f2754bb022346acc60220f5.tar.gz
upstream-5ee1e045174bad1b7f2754bb022346acc60220f5.tar.bz2
upstream-5ee1e045174bad1b7f2754bb022346acc60220f5.zip
ltq-vdsl: move to the default device name /dev/dsl_cpe_api/0
This makes patching it for ltq-vdsl-app unnecessary and paves the way for VRX518 support. Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package/network/config')
-rw-r--r--package/network/config/ltq-vdsl-app/patches/100-compat.patch11
-rw-r--r--package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c2
2 files changed, 1 insertions, 12 deletions
diff --git a/package/network/config/ltq-vdsl-app/patches/100-compat.patch b/package/network/config/ltq-vdsl-app/patches/100-compat.patch
index 6b738cfe66..6bc359c3cc 100644
--- a/package/network/config/ltq-vdsl-app/patches/100-compat.patch
+++ b/package/network/config/ltq-vdsl-app/patches/100-compat.patch
@@ -9,14 +9,3 @@
DSL_CPE_SIC_SET(DSL_TC_ATM, DSL_EMF_TC_CLEANED, DSL_EMF_TC_CLEANED, DSL_SYSTEMIF_MII, \
DSL_TC_EFM, DSL_EMF_TC_CLEANED, DSL_EMF_TC_CLEANED, DSL_SYSTEMIF_MII),
DSL_CPE_MAC_CFG_SET(DSL_EFM_SPEED_100, DSL_EFM_DUPLEX_FULL, DSL_EFM_FLOWCTRL_ON, DSL_EFM_AUTONEG_OFF, \
---- a/src/dsl_cpe_control.c
-+++ b/src/dsl_cpe_control.c
-@@ -6761,7 +6761,7 @@ DSL_int_t dsl_cpe_daemon (
- for (nDevice = 0; nDevice < DSL_CPE_MAX_DSL_ENTITIES; nDevice++)
- {
- #if defined(INCLUDE_DSL_CPE_API_VRX)
-- sprintf (device, "%s/%d", DSL_CPE_DEVICE_NAME, nDevice);
-+ sprintf (device, "%s%d", DSL_CPE_DEVICE_NAME, nDevice);
- #else
- sprintf (device, "%s", DSL_CPE_DEVICE_NAME);
- #endif /* defined(INCLUDE_DSL_CPE_API_VRX)*/
diff --git a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
index 707acdc606..93eecaf71d 100644
--- a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
+++ b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
@@ -735,7 +735,7 @@ static int metrics(struct ubus_context *ctx, struct ubus_object *obj,
vector_t vector = VECTOR_UNKNOWN;
#ifndef INCLUDE_DSL_CPE_API_DANUBE
- fd = open(DSL_CPE_DEVICE_NAME "0", O_RDWR, 0644);
+ fd = open(DSL_CPE_DEVICE_NAME "/0", O_RDWR, 0644);
#else
fd = open(DSL_CPE_DEVICE_NAME, O_RDWR, 0644);
#endif