patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / net / ipv4 / sysctl_net_ipv4.c

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 4a98b0b..6b0b744 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -62,7 +62,7 @@ extern ctl_table ipv4_route_table[];
 
 static
 int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
-                       void *buffer, size_t *lenp)
+                       void __user *buffer, size_t *lenp)
 {
        int val = ipv4_devconf.forwarding;
        int ret;
@@ -75,9 +75,10 @@ int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
        return ret;
 }
 
-static int ipv4_sysctl_forward_strategy(ctl_table *table, int *name, int nlen,
-                        void *oldval, size_t *oldlenp,
-                        void *newval, size_t newlen, 
+static int ipv4_sysctl_forward_strategy(ctl_table *table,
+                        int __user *name, int nlen,
+                        void __user *oldval, size_t __user *oldlenp,
+                        void __user *newval, size_t newlen, 
                         void **context)
 {
        int *valp = table->data;
@@ -89,7 +90,7 @@ static int ipv4_sysctl_forward_strategy(ctl_table *table, int *name, int nlen,
        if (newlen != sizeof(int))
                return -EINVAL;
 
-       if (get_user(new, (int *)newval))
+       if (get_user(new, (int __user *)newval))
                return -EFAULT;
 
        if (new == *valp)
@@ -665,6 +666,22 @@ ctl_table ipv4_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
+       {
+               .ctl_name       = NET_TCP_DEFAULT_WIN_SCALE,
+               .procname       = "tcp_default_win_scale",
+               .data           = &sysctl_tcp_default_win_scale,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               .ctl_name       = NET_TCP_MODERATE_RCVBUF,
+               .procname       = "tcp_moderate_rcvbuf",
+               .data           = &sysctl_tcp_moderate_rcvbuf,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
        { .ctl_name = 0 }
 };