aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-11-24 20:41:07 +0000
committerJohn Crispin <blogic@openwrt.org>2015-11-24 20:41:07 +0000
commit295fc2175602d8572972c1036eb9d790dfa92b72 (patch)
tree5603d0b928dac00d425c21658f8a1e8f7381cbda /package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
parentce5d62d26fe4218773e6701a54fb0a63903041e3 (diff)
downloadmaster-187ad058-295fc2175602d8572972c1036eb9d790dfa92b72.tar.gz
master-187ad058-295fc2175602d8572972c1036eb9d790dfa92b72.tar.bz2
master-187ad058-295fc2175602d8572972c1036eb9d790dfa92b72.zip
lantiq: ltq-vdsl: update to version 4.16.6.3
In addition to the update this also fixes some build warnings and makes it use the same configure option as used in Lantiq UGW. Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47635 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch')
-rw-r--r--package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch20
1 files changed, 5 insertions, 15 deletions
diff --git a/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
index e68a6f0ec3..4af07da370 100644
--- a/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
+++ b/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
@@ -19,7 +19,7 @@
#include "drv_dsl_cpe_api.h"
#include "drv_dsl_cpe_api_ioctl.h"
-@@ -238,24 +239,10 @@ static DSL_long_t DSL_DRV_Ioctls(DSL_DRV
+@@ -238,14 +239,7 @@ static DSL_long_t DSL_DRV_Ioctls(DSL_DRV
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
@@ -34,18 +34,8 @@
+ pINode = file_inode(pFile);
#endif
-- if (pINode == DSL_NULL)
-- {
-- bIsInKernel = DSL_TRUE;
-- }
-- else
-- {
- bIsInKernel = DSL_FALSE;
-- }
-
- if ( (_IOC_TYPE(nCommand) == DSL_IOC_MAGIC_CPE_API) ||
- (_IOC_TYPE(nCommand) == DSL_IOC_MAGIC_CPE_API_G997) ||
-@@ -1102,6 +1089,9 @@ static void DSL_DRV_DebugInit(void)
+ if (pINode == DSL_NULL)
+@@ -1118,6 +1112,9 @@ static void DSL_DRV_DebugInit(void)
return;
}
@@ -55,7 +45,7 @@
/* Entry point of driver */
int __init DSL_ModuleInit(void)
{
-@@ -1140,6 +1130,10 @@ int __init DSL_ModuleInit(void)
+@@ -1156,6 +1153,10 @@ int __init DSL_ModuleInit(void)
DSL_DRV_DevNodeInit();
@@ -66,7 +56,7 @@
return 0;
}
-@@ -1147,6 +1141,11 @@ void __exit DSL_ModuleCleanup(void)
+@@ -1163,6 +1164,11 @@ void __exit DSL_ModuleCleanup(void)
{
printk("Module will be unloaded"DSL_DRV_CRLF);