From 889b21f95414dcff942cb5f72d764d876b68ace2 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Fri, 13 Oct 2017 11:32:31 +0200
Subject: ar7-atm: drop LINUX_VERSION tests

Minimum supported kernel is 3.18, so we don't need to test for anything
older. In addition, the API hasn't changed since then, so we don't need
to check for any kernel version at all.  This helps to keeps the amount
of changes more managable.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
 .../190-2.6.32_proc_fixes.patch                    | 40 ++++++----------------
 1 file changed, 11 insertions(+), 29 deletions(-)

(limited to 'package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch')

diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
index 52ebbc1..23045bb 100644
--- a/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
@@ -1,53 +1,39 @@
 --- a/tn7dsl.c
 +++ b/tn7dsl.c
-@@ -215,7 +215,11 @@ led_reg_t ledreg[2];
+@@ -209,7 +209,7 @@ led_reg_t ledreg[2];
  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       CTL_UNNUMBERED
 +#define DEV_DSLMOD	0
-+#endif
  #define MAX_STR_SIZE     256
  #define DSL_MOD_SIZE     256
  
-@@ -3615,9 +3619,16 @@ static int dslmod_sysctl(ctl_table *ctl,
+@@ -3605,9 +3605,9 @@ static int dslmod_sysctl(ctl_table *ctl,
     */
    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, filp, buffer, lenp, 0);
 +    ret = proc_dostring(ctl, write, buffer, lenp, 0);
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-     switch (ctl->ctl_name)
-+#else
+ 
+-    switch (ctl->ctl_name)
 +    switch ((long)ctl->extra2)
-+#endif
        {
        case DEV_DSLMOD:
        ptr = strpbrk(info, " \t");
-@@ -3701,14 +3712,29 @@ static int dslmod_sysctl(ctl_table *ctl,
+@@ -3691,14 +3691,21 @@ static int dslmod_sysctl(ctl_table *ctl,
    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, filp, buffer, lenp, 0);
 +    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
+-  {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string}
 +	{
 +		.procname 		= "dslmod",
 +		.data			= info,
@@ -56,24 +42,20 @@
 +		.proc_handler	= &dslmod_sysctl,
 +		.extra2			= (void *)DEV_DSLMOD,
 +	}
-+#endif
    ,
    {0}
    };
-@@ -3716,7 +3742,16 @@ ctl_table dslmod_table[] = {
+@@ -3706,7 +3713,12 @@ 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
+-  {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table}
 +	{
 +		.procname		= "dev",
 +		.maxlen			= 0,
 +		.mode			= 0555,
 +		.child			= dslmod_table,
 +	}
-+	#endif
    ,
  #endif /* CONFIG_PROC_FS */
    {0}
-- 
cgit v1.1