Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 68afc53..e19457f 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -22,6 +22,7 @@
 
 
 #include <linux/module.h>
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/types.h>
@@ -368,12 +369,6 @@ int inet6_destroy_sock(struct sock *sk)
        struct sk_buff *skb;
        struct ipv6_txoptions *opt;
 
-       /*
-        *      Release destination entry
-        */
-
-       sk_dst_reset(sk);
-
        /* Release rx options */
 
        if ((skb = xchg(&np->pktoptions, NULL)) != NULL)
@@ -461,45 +456,53 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 
 const struct proto_ops inet6_stream_ops = {
-       .family =       PF_INET6,
-       .owner =        THIS_MODULE,
-       .release =      inet6_release,
-       .bind =         inet6_bind,
-       .connect =      inet_stream_connect,            /* ok           */
-       .socketpair =   sock_no_socketpair,             /* a do nothing */
-       .accept =       inet_accept,                    /* ok           */
-       .getname =      inet6_getname, 
-       .poll =         tcp_poll,                       /* ok           */
-       .ioctl =        inet6_ioctl,                    /* must change  */
-       .listen =       inet_listen,                    /* ok           */
-       .shutdown =     inet_shutdown,                  /* ok           */
-       .setsockopt =   sock_common_setsockopt,         /* ok           */
-       .getsockopt =   sock_common_getsockopt,         /* ok           */
-       .sendmsg =      inet_sendmsg,                   /* ok           */
-       .recvmsg =      sock_common_recvmsg,            /* ok           */
-       .mmap =         sock_no_mmap,
-       .sendpage =     tcp_sendpage
+       .family            = PF_INET6,
+       .owner             = THIS_MODULE,
+       .release           = inet6_release,
+       .bind              = inet6_bind,
+       .connect           = inet_stream_connect,       /* ok           */
+       .socketpair        = sock_no_socketpair,        /* a do nothing */
+       .accept            = inet_accept,               /* ok           */
+       .getname           = inet6_getname,
+       .poll              = tcp_poll,                  /* ok           */
+       .ioctl             = inet6_ioctl,               /* must change  */
+       .listen            = inet_listen,               /* ok           */
+       .shutdown          = inet_shutdown,             /* ok           */
+       .setsockopt        = sock_common_setsockopt,    /* ok           */
+       .getsockopt        = sock_common_getsockopt,    /* ok           */
+       .sendmsg           = inet_sendmsg,              /* ok           */
+       .recvmsg           = sock_common_recvmsg,       /* ok           */
+       .mmap              = sock_no_mmap,
+       .sendpage          = tcp_sendpage,
+#ifdef CONFIG_COMPAT
+       .compat_setsockopt = compat_sock_common_setsockopt,
+       .compat_getsockopt = compat_sock_common_getsockopt,
+#endif
 };
 
 const struct proto_ops inet6_dgram_ops = {
-       .family =       PF_INET6,
-       .owner =        THIS_MODULE,
-       .release =      inet6_release,
-       .bind =         inet6_bind,
-       .connect =      inet_dgram_connect,             /* ok           */
-       .socketpair =   sock_no_socketpair,             /* a do nothing */
-       .accept =       sock_no_accept,                 /* a do nothing */
-       .getname =      inet6_getname, 
-       .poll =         udp_poll,                       /* ok           */
-       .ioctl =        inet6_ioctl,                    /* must change  */
-       .listen =       sock_no_listen,                 /* ok           */
-       .shutdown =     inet_shutdown,                  /* ok           */
-       .setsockopt =   sock_common_setsockopt,         /* ok           */
-       .getsockopt =   sock_common_getsockopt,         /* ok           */
-       .sendmsg =      inet_sendmsg,                   /* ok           */
-       .recvmsg =      sock_common_recvmsg,            /* ok           */
-       .mmap =         sock_no_mmap,
-       .sendpage =     sock_no_sendpage,
+       .family            = PF_INET6,
+       .owner             = THIS_MODULE,
+       .release           = inet6_release,
+       .bind              = inet6_bind,
+       .connect           = inet_dgram_connect,        /* ok           */
+       .socketpair        = sock_no_socketpair,        /* a do nothing */
+       .accept            = sock_no_accept,            /* a do nothing */
+       .getname           = inet6_getname,
+       .poll              = udp_poll,                  /* ok           */
+       .ioctl             = inet6_ioctl,               /* must change  */
+       .listen            = sock_no_listen,            /* ok           */
+       .shutdown          = inet_shutdown,             /* ok           */
+       .setsockopt        = sock_common_setsockopt,    /* ok           */
+       .getsockopt        = sock_common_getsockopt,    /* ok           */
+       .sendmsg           = inet_sendmsg,              /* ok           */
+       .recvmsg           = sock_common_recvmsg,       /* ok           */
+       .mmap              = sock_no_mmap,
+       .sendpage          = sock_no_sendpage,
+#ifdef CONFIG_COMPAT
+       .compat_setsockopt = compat_sock_common_setsockopt,
+       .compat_getsockopt = compat_sock_common_getsockopt,
+#endif
 };
 
 static struct net_proto_family inet6_family_ops = {
@@ -510,24 +513,28 @@ static struct net_proto_family inet6_family_ops = {
 
 /* Same as inet6_dgram_ops, sans udp_poll.  */
 static const struct proto_ops inet6_sockraw_ops = {
-       .family =       PF_INET6,
-       .owner =        THIS_MODULE,
-       .release =      inet6_release,
-       .bind =         inet6_bind,
-       .connect =      inet_dgram_connect,             /* ok           */
-       .socketpair =   sock_no_socketpair,             /* a do nothing */
-       .accept =       sock_no_accept,                 /* a do nothing */
-       .getname =      inet6_getname, 
-       .poll =         datagram_poll,                  /* ok           */
-       .ioctl =        inet6_ioctl,                    /* must change  */
-       .listen =       sock_no_listen,                 /* ok           */
-       .shutdown =     inet_shutdown,                  /* ok           */
-       .setsockopt =   sock_common_setsockopt,         /* ok           */
-       .getsockopt =   sock_common_getsockopt,         /* ok           */
-       .sendmsg =      inet_sendmsg,                   /* ok           */
-       .recvmsg =      sock_common_recvmsg,            /* ok           */
-       .mmap =         sock_no_mmap,
-       .sendpage =     sock_no_sendpage,
+       .family            = PF_INET6,
+       .owner             = THIS_MODULE,
+       .release           = inet6_release,
+       .bind              = inet6_bind,
+       .connect           = inet_dgram_connect,        /* ok           */
+       .socketpair        = sock_no_socketpair,        /* a do nothing */
+       .accept            = sock_no_accept,            /* a do nothing */
+       .getname           = inet6_getname,
+       .poll              = datagram_poll,             /* ok           */
+       .ioctl             = inet6_ioctl,               /* must change  */
+       .listen            = sock_no_listen,            /* ok           */
+       .shutdown          = inet_shutdown,             /* ok           */
+       .setsockopt        = sock_common_setsockopt,    /* ok           */
+       .getsockopt        = sock_common_getsockopt,    /* ok           */
+       .sendmsg           = inet_sendmsg,              /* ok           */
+       .recvmsg           = sock_common_recvmsg,       /* ok           */
+       .mmap              = sock_no_mmap,
+       .sendpage          = sock_no_sendpage,
+#ifdef CONFIG_COMPAT
+       .compat_setsockopt = compat_sock_common_setsockopt,
+       .compat_getsockopt = compat_sock_common_getsockopt,
+#endif
 };
 
 static struct inet_protosw rawv6_protosw = {
@@ -689,11 +696,11 @@ snmp6_mib_init(void *ptr[2], size_t mibsize, size_t mibalign)
        if (ptr == NULL)
                return -EINVAL;
 
-       ptr[0] = __alloc_percpu(mibsize, mibalign);
+       ptr[0] = __alloc_percpu(mibsize);
        if (!ptr[0])
                goto err0;
 
-       ptr[1] = __alloc_percpu(mibsize, mibalign);
+       ptr[1] = __alloc_percpu(mibsize);
        if (!ptr[1])
                goto err1;