summaryrefslogtreecommitdiffstats
path: root/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
blob: 4dcebc3d1200d6683410aa5295c0464436d076ba (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Index: sangam_atm-D7.04.03.00/tn7dsl.c
===================================================================
--- sangam_atm-D7.04.03.00.orig/tn7dsl.c	2010-08-26 09:36:54.000000000 +0200
+++ sangam_atm-D7.04.03.00/tn7dsl.c	2010-08-26 10:18:47.000000000 +0200
@@ -203,7 +203,11 @@
 static struct led_funcs ledreg[2];
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
 #define DEV_DSLMOD       CTL_UNNUMBERED
+#else
+#define DEV_DSLMOD	0
+#endif
 #define MAX_STR_SIZE     256
 #define DSL_MOD_SIZE     256
 
@@ -3431,9 +3435,16 @@
    */
   if(write)
     {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
     ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
-
+#else
+    ret = proc_dostring(ctl, write, buffer, lenp, 0);
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
     switch (ctl->ctl_name)
+#else
+    switch ((long)ctl->extra2)
+#endif
       {
       case DEV_DSLMOD:
       ptr = strpbrk(info, " \t");
@@ -3517,14 +3528,22 @@
   else
     {
     len += sprintf(info+len, mod_req);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
     ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
+#else
+    ret = proc_dostring(ctl, write, buffer, lenp, 0);
+#endif
     }
   return ret;
 }
 
 
 ctl_table dslmod_table[] = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
   {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string}
+#else
+  {"dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, NULL, (void *)DEV_DSLMOD}
+#endif
   ,
   {0}
   };