Changeset 4100

Show
Ignore:
Timestamp:
09/29/09 01:07:12 (2 years ago)
Author:
proski
Message:

Adjust for procfs changes in Linux 2.6.32

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • madwifi/branches/madwifi-0.9.4/ath/if_athvar.h

    r4085 r4100  
    183183#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    184184        proc_dointvec(ctl, write, filp, buffer, lenp) 
    185 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ 
     185#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    186186#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    187187        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    189189#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    190190        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     191#else /* Linux 2.6.32+ */ 
     192#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     193        f(ctl_table *ctl, int write, \ 
     194          void __user *buffer, size_t *lenp, loff_t *ppos) 
     195#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     196        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    191197#endif 
    192198 
  • madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h

    r4060 r4100  
    515515#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    516516        proc_dointvec(ctl, write, filp, buffer, lenp) 
    517 #else 
     517#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    518518#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    519519        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    521521#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    522522        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     523#else /* Linux 2.6.32+ */ 
     524#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     525        f(ctl_table *ctl, int write, \ 
     526          void __user *buffer, size_t *lenp, loff_t *ppos) 
     527#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     528        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    523529#endif 
    524530 
  • madwifi/branches/madwifi-dfs/ath/if_athvar.h

    r4011 r4100  
    175175#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    176176        proc_dointvec(ctl, write, filp, buffer, lenp) 
    177 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ 
     177#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    178178#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    179179        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    181181#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    182182        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     183#else /* Linux 2.6.32+ */ 
     184#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     185        f(ctl_table *ctl, int write, \ 
     186          void __user *buffer, size_t *lenp, loff_t *ppos) 
     187#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     188        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    183189#endif 
    184190 
  • madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h

    r4060 r4100  
    596596#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    597597        proc_dointvec(ctl, write, filp, buffer, lenp) 
    598 #else 
     598#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    599599#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    600600        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    602602#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    603603        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     604#else /* Linux 2.6.32+ */ 
     605#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     606        f(ctl_table *ctl, int write, \ 
     607          void __user *buffer, size_t *lenp, loff_t *ppos) 
     608#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     609        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    604610#endif 
    605611 
  • madwifi/branches/madwifi-hal-0.10.5.6/ath/if_athvar.h

    r3986 r4100  
    175175#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    176176        proc_dointvec(ctl, write, filp, buffer, lenp) 
    177 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ 
     177#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    178178#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    179179        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    181181#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    182182        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     183#else /* Linux 2.6.32+ */ 
     184#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     185        f(ctl_table *ctl, int write, \ 
     186          void __user *buffer, size_t *lenp, loff_t *ppos) 
     187#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     188        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    183189#endif 
    184190 
  • madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.h

    r4068 r4100  
    596596#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    597597        proc_dointvec(ctl, write, filp, buffer, lenp) 
    598 #else 
     598#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    599599#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    600600        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    602602#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    603603        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     604#else /* Linux 2.6.32+ */ 
     605#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     606        f(ctl_table *ctl, int write, \ 
     607          void __user *buffer, size_t *lenp, loff_t *ppos) 
     608#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     609        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    604610#endif 
    605611 
  • madwifi/branches/madwifi-hal-0.9.30.13/ath/if_athvar.h

    r3986 r4100  
    175175#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    176176        proc_dointvec(ctl, write, filp, buffer, lenp) 
    177 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ 
     177#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    178178#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    179179        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    181181#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    182182        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     183#else /* Linux 2.6.32+ */ 
     184#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     185        f(ctl_table *ctl, int write, \ 
     186          void __user *buffer, size_t *lenp, loff_t *ppos) 
     187#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     188        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    183189#endif 
    184190 
  • madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.h

    r4068 r4100  
    596596#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    597597        proc_dointvec(ctl, write, filp, buffer, lenp) 
    598 #else 
     598#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    599599#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    600600        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    602602#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    603603        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     604#else /* Linux 2.6.32+ */ 
     605#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     606        f(ctl_table *ctl, int write, \ 
     607          void __user *buffer, size_t *lenp, loff_t *ppos) 
     608#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     609        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    604610#endif 
    605611 
  • madwifi/branches/madwifi-hal-testing/ath/if_athvar.h

    r3986 r4100  
    175175#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    176176        proc_dointvec(ctl, write, filp, buffer, lenp) 
    177 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */ 
     177#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    178178#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    179179        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    181181#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    182182        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     183#else /* Linux 2.6.32+ */ 
     184#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     185        f(ctl_table *ctl, int write, \ 
     186          void __user *buffer, size_t *lenp, loff_t *ppos) 
     187#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     188        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    183189#endif 
    184190 
  • madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h

    r4068 r4100  
    596596#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    597597        proc_dointvec(ctl, write, filp, buffer, lenp) 
    598 #else 
     598#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) 
    599599#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
    600600        f(ctl_table *ctl, int write, struct file *filp, \ 
     
    602602#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
    603603        proc_dointvec(ctl, write, filp, buffer, lenp, ppos) 
     604#else /* Linux 2.6.32+ */ 
     605#define IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ 
     606        f(ctl_table *ctl, int write, \ 
     607          void __user *buffer, size_t *lenp, loff_t *ppos) 
     608#define IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ 
     609        proc_dointvec(ctl, write, buffer, lenp, ppos) 
    604610#endif 
    605611