| 1 | --- a/net80211/ieee80211_linux.h |
| 2 | +++ b/net80211/ieee80211_linux.h |
| 3 | @@ -640,12 +640,24 @@ static __inline unsigned long msecs_to_j |
| 4 | void __user *buffer, size_t *lenp) |
| 5 | #define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ |
| 6 | proc_dointvec(ctl, write, filp, buffer, lenp) |
| 7 | -#else |
| 8 | +#define IEEE80211_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 9 | + proc_dostring(ctl, write, filp, buffer, lenp) |
| 10 | +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) |
| 11 | #define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ |
| 12 | f(ctl_table *ctl, int write, struct file *filp, \ |
| 13 | void __user *buffer, size_t *lenp, loff_t *ppos) |
| 14 | #define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ |
| 15 | proc_dointvec(ctl, write, filp, buffer, lenp, ppos) |
| 16 | +#define IEEE80211_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 17 | + proc_dostring(ctl, write, filp, buffer, lenp, ppos) |
| 18 | +#else /* Linux 2.6.32+ */ |
| 19 | +#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ |
| 20 | + f(ctl_table *ctl, int write, \ |
| 21 | + void __user *buffer, size_t *lenp, loff_t *ppos) |
| 22 | +#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ |
| 23 | + proc_dointvec(ctl, write, buffer, lenp, ppos) |
| 24 | +#define IEEE80211_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 25 | + proc_dostring(ctl, write, buffer, lenp, ppos) |
| 26 | #endif |
| 27 | |
| 28 | void ieee80211_virtfs_latevattach(struct ieee80211vap *); |
| 29 | --- a/ath/if_athvar.h |
| 30 | +++ b/ath/if_athvar.h |
| 31 | @@ -173,14 +173,22 @@ static inline struct net_device *_alloc_ |
| 32 | proc_dointvec(ctl, write, filp, buffer, lenp) |
| 33 | #define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 34 | proc_dostring(ctl, write, filp, buffer, lenp) |
| 35 | -#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ |
| 36 | +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) |
| 37 | #define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ |
| 38 | f(ctl_table *ctl, int write, struct file *filp, \ |
| 39 | void __user *buffer, size_t *lenp, loff_t *ppos) |
| 40 | #define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ |
| 41 | proc_dointvec(ctl, write, filp, buffer, lenp, ppos) |
| 42 | +#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 43 | + proc_dostring(ctl, write, filp, buffer, lenp, ppos) |
| 44 | +#else /* Linux 2.6.32+ */ |
| 45 | +#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ |
| 46 | + f(ctl_table *ctl, int write, \ |
| 47 | + void __user *buffer, size_t *lenp, loff_t *ppos) |
| 48 | +#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ |
| 49 | + proc_dointvec(ctl, write, buffer, lenp, ppos) |
| 50 | #define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ |
| 51 | - proc_dostring(ctl, write, filp, buffer, lenp, ppos) |
| 52 | + proc_dostring(ctl, write, buffer, lenp, ppos) |
| 53 | #endif |
| 54 | |
| 55 | #define ATH_TIMEOUT 1000 |
| 56 | |
