[openwrt/openwrt] lantiq: use ActualNetDataRate for speed reporting

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/dd43fae67bbcc0383e7fa50d3abb61bba096a98c

commit dd43fae67bbcc0383e7fa50d3abb61bba096a98c
Author: Jeroen Peelaerts <jeroen.peelaerts at gmail.com>
AuthorDate: Tue Feb 9 23:33:51 2021 +0100

    lantiq: use ActualNetDataRate for speed reporting
    
    Switch to Actual Net Data Rate (ACTNDR) for speed reporting on lantiq VDSL modems
    
    Refer to ITU-T G.997.1 chapter 7.5.2.8
    
    Independent whether retransmission is used or not in a given transmit direction:
    -   In L0 state, this parameter reports the Net Data Rate (as specified in G.992.3, G.992.5 or G.993.2) at which the bearer channel is operating.
    -   In  L2 state, the parameter contains the Net Data Rate (as specified in G.992.3, G.992.5 or G.993.2) in the previous L0 state.
    
    Signed-off-by: Jeroen Peelaerts <jeroen.peelaerts at gmail.com>
    Reviewed-by: Andre Heider <a.heider at gmail.com>
    (cherry picked from commit 4f27ea7c33447f4b0c8e577509726927916b9625)
---
 package/network/config/ltq-vdsl-app/Makefile               | 2 +-
 package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile
index 8b8ffdc7a2..88385b9aa5 100644
--- a/package/network/config/ltq-vdsl-app/Makefile
+++ b/package/network/config/ltq-vdsl-app/Makefile
@@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ltq-vdsl-app
 PKG_VERSION:=4.17.18.6
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_BASE_NAME:=dsl_cpe_control
 PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@OPENWRT
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 52b2be20e1..8eefdfe4d5 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
@@ -532,7 +532,12 @@ static void g997_channel_status(int fd, DSL_AccessDir_t direction) {
 	IOCTL_DIR(DSL_G997_ChannelStatus_t, DSL_FIO_G997_CHANNEL_STATUS_GET, direction);
 
 	m_u32("interleave_delay", out.data.ActualInterleaveDelay * 10);
+#ifndef INCLUDE_DSL_CPE_API_DANUBE
+	// prefer ACTNDR, see comments in drv_dsl_cpe_api_g997.h
+	m_u32("data_rate", out.data.ActualNetDataRate);
+#else
 	m_u32("data_rate", out.data.ActualDataRate);
+#endif
 }
 
 static void g997_line_status(int fd, DSL_AccessDir_t direction) {