Adjust for procfs changes in Linux 2.6.32

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4099 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath/if_athvar.h b/ath/if_athvar.h
index 59a811054081199ecc5d501c963ca2cd56fccd49..612a4dbdfa2667122b82c0f8e93b484415d1bdab 100644 (file)
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -174,12 +174,18 @@ static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask
          void __user *buffer, size_t *lenp)
 #define        ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
        proc_dointvec(ctl, write, filp, buffer, lenp)
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 #define        ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
        f(ctl_table *ctl, int write, struct file *filp, \
          void __user *buffer, size_t *lenp, loff_t *ppos)
 #define        ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
        proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
+#else /* Linux 2.6.32+ */
+#define        ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
+       f(ctl_table *ctl, int write, \
+         void __user *buffer, size_t *lenp, loff_t *ppos)
+#define        ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+       proc_dointvec(ctl, write, buffer, lenp, ppos)
 #endif
 
 #define        ATH_TIMEOUT     1000

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index b6d542293c8613158043c7a7029e75ce62b13a5b..67aea47a63b407562f771857620f730441cffe35 100644 (file)
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -595,12 +595,18 @@ static __inline unsigned long msecs_to_jiffies(const unsigned int m)
          void __user *buffer, size_t *lenp)
 #define        IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
        proc_dointvec(ctl, write, filp, buffer, lenp)
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 #define        IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
        f(ctl_table *ctl, int write, struct file *filp, \
          void __user *buffer, size_t *lenp, loff_t *ppos)
 #define        IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
        proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
+#else /* Linux 2.6.32+ */
+#define        IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
+       f(ctl_table *ctl, int write, \
+         void __user *buffer, size_t *lenp, loff_t *ppos)
+#define        IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+       proc_dointvec(ctl, write, buffer, lenp, ppos)
 #endif
 
 void ieee80211_virtfs_latevattach(struct ieee80211vap *);