linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / atm / pvc.c

diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index c0ce4d4..f2c5417 100644 (file)
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -60,7 +60,7 @@ static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr,
 }
 
 static int pvc_setsockopt(struct socket *sock, int level, int optname,
-                         char *optval, int optlen)
+                         char __user *optval, int optlen)
 {
        struct sock *sk = sock->sk;
        int error;
@@ -73,7 +73,7 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname,
 
 
 static int pvc_getsockopt(struct socket *sock, int level, int optname,
-                         char *optval, int *optlen)
+                         char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
        int error;
@@ -102,7 +102,7 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
 }
 
 
-static struct proto_ops pvc_proto_ops = {
+static const struct proto_ops pvc_proto_ops = {
        .family =       PF_ATMPVC,
        .owner =        THIS_MODULE,