kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / ar7-atm / patches-D7.04.03.00 / 190-2.6.32_proc_fixes.patch

diff --git a/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch b/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
index 4dcebc3..11487bf 100644 (file)
--- a/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
+++ b/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
@@ -1,8 +1,6 @@
-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 @@
+--- a/tn7dsl.c
++++ b/tn7dsl.c
+@@ -203,7 +203,11 @@ led_reg_t ledreg[2];

  static struct led_funcs ledreg[2];
  #endif
  
  static struct led_funcs ledreg[2];
  #endif
  


@@ -14,7 +12,7 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c
  #define MAX_STR_SIZE     256
  #define DSL_MOD_SIZE     256
  
  #define MAX_STR_SIZE     256
  #define DSL_MOD_SIZE     256
  

-@@ -3431,9 +3435,16 @@
+@@ -3431,9 +3435,16 @@ static int dslmod_sysctl(ctl_table *ctl,

     */
    if(write)
      {
     */
    if(write)
      {


@@ -32,7 +30,7 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c
        {
        case DEV_DSLMOD:
        ptr = strpbrk(info, " \t");
        {
        case DEV_DSLMOD:
        ptr = strpbrk(info, " \t");

-@@ -3517,14 +3528,22 @@
+@@ -3517,14 +3528,29 @@ static int dslmod_sysctl(ctl_table *ctl,

    else
      {
      len += sprintf(info+len, mod_req);
    else
      {
      len += sprintf(info+len, mod_req);


@@ -50,8 +48,32 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
    {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string}
 +#else
 +#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}
++      {
++              .procname               = "dslmod",
++              .data                   = info,
++              .maxlen                 = DSL_MOD_SIZE,
++              .mode                   = 0644,
++              .proc_handler   = &dslmod_sysctl,
++              .extra2                 = (void *)DEV_DSLMOD,
++      }

 +#endif
    ,
    {0}
    };
 +#endif
    ,
    {0}
    };

+@@ -3532,7 +3558,16 @@ ctl_table dslmod_table[] = {
+ /* Make sure that /proc/sys/dev is there */
+ ctl_table dslmod_root_table[] = {
+ #ifdef CONFIG_PROC_FS
++      #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+   {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table}
++      #else
++      {
++              .procname               = "dev",
++              .maxlen                 = 0,
++              .mode                   = 0555,
++              .child                  = dslmod_table,
++      }
++      #endif
+   ,
+ #endif /* CONFIG_PROC_FS */
+   {0}