ltq-vdsl: update to version 4.17.18.6

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
This commit is contained in:
Hauke Mehrtens 2016-08-27 00:07:03 +02:00 committed by Hauke Mehrtens
parent 3a4db8548f
commit 7ecbc27951
2 changed files with 38 additions and 12 deletions

View file

@ -1,5 +1,5 @@
# Copyright (C) 2012 OpenWrt.org # Copyright (C) 2012 OpenWrt.org
# Copyright (C) 2015 Lantiq Beteiligungs GmbH & Co KG. # Copyright (C) 2015-2016 Lantiq Beteiligungs GmbH & Co KG.
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ltq-vdsl-vr9 PKG_NAME:=ltq-vdsl-vr9
PKG_VERSION:=4.16.6.3 PKG_VERSION:=4.17.18.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BASE_NAME:=drv_dsl_cpe_api PKG_BASE_NAME:=drv_dsl_cpe_api
PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BASE_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BASE_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
PKG_MD5SUM:=5b15a866bb1939c333d30a1b7f9e7856 PKG_MD5SUM:=72bb0218a7cbd2ea860bff4acc1c511e
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0

View file

@ -1,14 +1,14 @@
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -63,7 +63,7 @@ POST_UNINSTALL = : @@ -117,7 +117,7 @@ POST_UNINSTALL = :
# the headerfile of linux kernels 2.6.x contain to much arithmetic # the headerfile of linux kernels 2.6.x contain to much arithmetic
# with void pointers (which is allowed for gcc!) # with void pointers (which is allowed for gcc!)
-@KERNEL_2_6_FALSE@am__append_6 = -Wpointer-arith -@KERNEL_2_6_FALSE@am__append_6 = -Wpointer-arith
+@KERNEL_2_6_FALSE@am__append_6 = +@KERNEL_2_6_FALSE@am__append_6 =
subdir = src subdir = src
DIST_COMMON = $(drv_dsl_cpe_api_include_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
$(srcdir)/Makefile.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
--- a/src/common/drv_dsl_cpe_os_linux.c --- a/src/common/drv_dsl_cpe_os_linux.c
+++ b/src/common/drv_dsl_cpe_os_linux.c +++ b/src/common/drv_dsl_cpe_os_linux.c
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -19,7 +19,7 @@
#include "drv_dsl_cpe_api.h" #include "drv_dsl_cpe_api.h"
#include "drv_dsl_cpe_api_ioctl.h" #include "drv_dsl_cpe_api_ioctl.h"
@@ -238,14 +239,7 @@ static DSL_long_t DSL_DRV_Ioctls(DSL_DRV @@ -249,14 +250,7 @@ static DSL_long_t DSL_DRV_Ioctls(DSL_DRV
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
@ -35,9 +35,9 @@
#endif #endif
if (pINode == DSL_NULL) if (pINode == DSL_NULL)
@@ -1118,6 +1112,9 @@ static void DSL_DRV_DebugInit(void) @@ -1203,6 +1197,9 @@ static void DSL_DRV_NlSendMsg(DSL_char_t
return;
} }
#endif
+static struct class *dsl_class; +static struct class *dsl_class;
+static dev_t dsl_devt; +static dev_t dsl_devt;
@ -45,7 +45,7 @@
/* Entry point of driver */ /* Entry point of driver */
int __init DSL_ModuleInit(void) int __init DSL_ModuleInit(void)
{ {
@@ -1156,6 +1153,10 @@ int __init DSL_ModuleInit(void) @@ -1241,6 +1238,10 @@ int __init DSL_ModuleInit(void)
DSL_DRV_DevNodeInit(); DSL_DRV_DevNodeInit();
@ -56,7 +56,7 @@
return 0; return 0;
} }
@@ -1163,6 +1164,11 @@ void __exit DSL_ModuleCleanup(void) @@ -1248,6 +1249,11 @@ void __exit DSL_ModuleCleanup(void)
{ {
printk("Module will be unloaded"DSL_DRV_CRLF); printk("Module will be unloaded"DSL_DRV_CRLF);
@ -68,3 +68,29 @@
unregister_chrdev(nMajorNum, DRV_DSL_CPE_API_DEV_NAME); unregister_chrdev(nMajorNum, DRV_DSL_CPE_API_DEV_NAME);
DSL_DRV_Cleanup(); DSL_DRV_Cleanup();
--- a/src/device/drv_dsl_cpe_device_vrx.c
+++ b/src/device/drv_dsl_cpe_device_vrx.c
@@ -5337,6 +5337,7 @@ DSL_Error_t DSL_DRV_DEV_HybridTypeGet(
#undef DSL_DBG_BLOCK
#define DSL_DBG_BLOCK DSL_DBG_NOTIFICATIONS
+#if 0
DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignaling
(
DSL_Context_t *pContext,
@@ -5384,6 +5385,15 @@ DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignal
return nErrCode;
}
+#else
+DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignaling
+(
+ DSL_Context_t *pContext,
+ DSL_TcLayerSelection_t nTcLayer)
+{
+ return DSL_SUCCESS;
+}
+#endif
DSL_Error_t DSL_DRV_DEV_MeiShowtimeSignaling
(