ltq-vdsl: update to version 4.17.18.6
[openwrt/staging/yousong.git] / package / kernel / lantiq / ltq-vdsl / patches / 100-compat.patch
1 --- a/src/Makefile.in
2 +++ b/src/Makefile.in
3 @@ -117,7 +117,7 @@ POST_UNINSTALL = :
4
5 # the headerfile of linux kernels 2.6.x contain to much arithmetic
6 # with void pointers (which is allowed for gcc!)
7 -@KERNEL_2_6_FALSE@am__append_6 = -Wpointer-arith
8 +@KERNEL_2_6_FALSE@am__append_6 =
9 subdir = src
10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
11 am__aclocal_m4_deps = $(top_srcdir)/configure.in
12 --- a/src/common/drv_dsl_cpe_os_linux.c
13 +++ b/src/common/drv_dsl_cpe_os_linux.c
14 @@ -11,6 +11,7 @@
15
16 #define DSL_INTERN
17
18 +#include <linux/device.h>
19 #include "drv_dsl_cpe_api.h"
20 #include "drv_dsl_cpe_api_ioctl.h"
21
22 @@ -249,14 +250,7 @@ static DSL_long_t DSL_DRV_Ioctls(DSL_DRV
23 }
24
25 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
26 - if (pFile->f_dentry != DSL_NULL)
27 - {
28 - pINode = pFile->f_dentry->d_inode;
29 - }
30 - else
31 - {
32 - pINode = DSL_NULL;
33 - }
34 + pINode = file_inode(pFile);
35 #endif
36
37 if (pINode == DSL_NULL)
38 @@ -1203,6 +1197,9 @@ static void DSL_DRV_NlSendMsg(DSL_char_t
39 }
40 #endif
41
42 +static struct class *dsl_class;
43 +static dev_t dsl_devt;
44 +
45 /* Entry point of driver */
46 int __init DSL_ModuleInit(void)
47 {
48 @@ -1241,6 +1238,10 @@ int __init DSL_ModuleInit(void)
49
50 DSL_DRV_DevNodeInit();
51
52 + dsl_class = class_create(THIS_MODULE, "dsl_cpe_api0");
53 + dsl_devt = MKDEV(DRV_DSL_CPE_API_DEV_MAJOR, 0);
54 + device_create(dsl_class, NULL, dsl_devt, NULL, "dsl_cpe_api0");
55 +
56 return 0;
57 }
58
59 @@ -1248,6 +1249,11 @@ void __exit DSL_ModuleCleanup(void)
60 {
61 printk("Module will be unloaded"DSL_DRV_CRLF);
62
63 + device_destroy(dsl_class, dsl_devt);
64 + dsl_devt = NULL;
65 + class_destroy(dsl_class);
66 + dsl_class = NULL;
67 +
68 unregister_chrdev(nMajorNum, DRV_DSL_CPE_API_DEV_NAME);
69
70 DSL_DRV_Cleanup();
71 --- a/src/device/drv_dsl_cpe_device_vrx.c
72 +++ b/src/device/drv_dsl_cpe_device_vrx.c
73 @@ -5337,6 +5337,7 @@ DSL_Error_t DSL_DRV_DEV_HybridTypeGet(
74 #undef DSL_DBG_BLOCK
75 #define DSL_DBG_BLOCK DSL_DBG_NOTIFICATIONS
76
77 +#if 0
78 DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignaling
79 (
80 DSL_Context_t *pContext,
81 @@ -5384,6 +5385,15 @@ DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignal
82
83 return nErrCode;
84 }
85 +#else
86 +DSL_Error_t DSL_DRV_DEV_MeiTcLayerSignaling
87 +(
88 + DSL_Context_t *pContext,
89 + DSL_TcLayerSelection_t nTcLayer)
90 +{
91 + return DSL_SUCCESS;
92 +}
93 +#endif
94
95 DSL_Error_t DSL_DRV_DEV_MeiShowtimeSignaling
96 (