diff options
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r-- | include/linux/sysctl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 94316a98e0d0..665412c4f4b9 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -11,7 +11,7 @@ | |||
11 | ** the sysctl() binary interface. Do *NOT* change the | 11 | ** the sysctl() binary interface. Do *NOT* change the |
12 | ** numbering of any existing values here, and do not change | 12 | ** numbering of any existing values here, and do not change |
13 | ** any numbers within any one set of values. If you have to | 13 | ** any numbers within any one set of values. If you have to |
14 | ** have to redefine an existing interface, use a new number for it. | 14 | ** redefine an existing interface, use a new number for it. |
15 | ** The kernel will then return -ENOTDIR to any application using | 15 | ** The kernel will then return -ENOTDIR to any application using |
16 | ** the old binary interface. | 16 | ** the old binary interface. |
17 | ** | 17 | ** |
@@ -699,7 +699,8 @@ enum { | |||
699 | NET_X25_CALL_REQUEST_TIMEOUT=2, | 699 | NET_X25_CALL_REQUEST_TIMEOUT=2, |
700 | NET_X25_RESET_REQUEST_TIMEOUT=3, | 700 | NET_X25_RESET_REQUEST_TIMEOUT=3, |
701 | NET_X25_CLEAR_REQUEST_TIMEOUT=4, | 701 | NET_X25_CLEAR_REQUEST_TIMEOUT=4, |
702 | NET_X25_ACK_HOLD_BACK_TIMEOUT=5 | 702 | NET_X25_ACK_HOLD_BACK_TIMEOUT=5, |
703 | NET_X25_FORWARD=6 | ||
703 | }; | 704 | }; |
704 | 705 | ||
705 | /* /proc/sys/net/token-ring */ | 706 | /* /proc/sys/net/token-ring */ |
@@ -918,8 +919,7 @@ typedef struct ctl_table ctl_table; | |||
918 | 919 | ||
919 | typedef int ctl_handler (ctl_table *table, int __user *name, int nlen, | 920 | typedef int ctl_handler (ctl_table *table, int __user *name, int nlen, |
920 | void __user *oldval, size_t __user *oldlenp, | 921 | void __user *oldval, size_t __user *oldlenp, |
921 | void __user *newval, size_t newlen, | 922 | void __user *newval, size_t newlen); |
922 | void **context); | ||
923 | 923 | ||
924 | typedef int proc_handler (ctl_table *ctl, int write, struct file * filp, | 924 | typedef int proc_handler (ctl_table *ctl, int write, struct file * filp, |
925 | void __user *buffer, size_t *lenp, loff_t *ppos); | 925 | void __user *buffer, size_t *lenp, loff_t *ppos); |
@@ -950,7 +950,7 @@ extern int do_sysctl (int __user *name, int nlen, | |||
950 | extern int do_sysctl_strategy (ctl_table *table, | 950 | extern int do_sysctl_strategy (ctl_table *table, |
951 | int __user *name, int nlen, | 951 | int __user *name, int nlen, |
952 | void __user *oldval, size_t __user *oldlenp, | 952 | void __user *oldval, size_t __user *oldlenp, |
953 | void __user *newval, size_t newlen, void ** context); | 953 | void __user *newval, size_t newlen); |
954 | 954 | ||
955 | extern ctl_handler sysctl_string; | 955 | extern ctl_handler sysctl_string; |
956 | extern ctl_handler sysctl_intvec; | 956 | extern ctl_handler sysctl_intvec; |