Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[powerpc.git] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8de5a8e..fa1ce0a 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -913,23 +913,21 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
 
 #ifdef CONFIG_COMPAT
 static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,
-                         char __user *optval, int optlen)
+                                  char __user *optval, int optlen)
 {
-       switch(level) {
-               case SOL_RAW:
+       switch (level) {
+       case SOL_RAW:
+               break;
+       case SOL_ICMPV6:
+               if (inet_sk(sk)->num != IPPROTO_ICMPV6)
+                       return -EOPNOTSUPP;
+               return rawv6_seticmpfilter(sk, level, optname, optval, optlen);
+       case SOL_IPV6:
+               if (optname == IPV6_CHECKSUM)
                        break;
-
-               case SOL_ICMPV6:
-                       if (inet_sk(sk)->num != IPPROTO_ICMPV6)
-                               return -EOPNOTSUPP;
-                       return rawv6_seticmpfilter(sk, level, optname, optval,
-                                                  optlen);
-               case SOL_IPV6:
-                       if (optname == IPV6_CHECKSUM)
-                               break;
-               default:
-                       return compat_ipv6_setsockopt(sk, level,
-                                       optname, optval, optlen);
+       default:
+               return compat_ipv6_setsockopt(sk, level, optname,
+                                             optval, optlen);
        };
        return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
 }
@@ -989,23 +987,21 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
 
 #ifdef CONFIG_COMPAT
 static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,
-                         char __user *optval, int __user *optlen)
+                                  char __user *optval, int __user *optlen)
 {
-       switch(level) {
-               case SOL_RAW:
+       switch (level) {
+       case SOL_RAW:
+               break;
+       case SOL_ICMPV6:
+               if (inet_sk(sk)->num != IPPROTO_ICMPV6)
+                       return -EOPNOTSUPP;
+               return rawv6_geticmpfilter(sk, level, optname, optval, optlen);
+       case SOL_IPV6:
+               if (optname == IPV6_CHECKSUM)
                        break;
-
-               case SOL_ICMPV6:
-                       if (inet_sk(sk)->num != IPPROTO_ICMPV6)
-                               return -EOPNOTSUPP;
-                       return rawv6_geticmpfilter(sk, level, optname, optval,
-                                                  optlen);
-               case SOL_IPV6:
-                       if (optname == IPV6_CHECKSUM)
-                               break;
-               default:
-                       return compat_ipv6_getsockopt(sk, level,
-                                       optname, optval, optlen);
+       default:
+               return compat_ipv6_getsockopt(sk, level, optname,
+                                             optval, optlen);
        };
        return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
 }
@@ -1056,27 +1052,27 @@ static int rawv6_init_sk(struct sock *sk)
 }
 
 struct proto rawv6_prot = {
-       .name =         "RAWv6",
-       .owner =        THIS_MODULE,
-       .close =        rawv6_close,
-       .connect =      ip6_datagram_connect,
-       .disconnect =   udp_disconnect,
-       .ioctl =        rawv6_ioctl,
-       .init =         rawv6_init_sk,
-       .destroy =      inet6_destroy_sock,
-       .setsockopt =   rawv6_setsockopt,
-       .getsockopt =   rawv6_getsockopt,
+       .name              = "RAWv6",
+       .owner             = THIS_MODULE,
+       .close             = rawv6_close,
+       .connect           = ip6_datagram_connect,
+       .disconnect        = udp_disconnect,
+       .ioctl             = rawv6_ioctl,
+       .init              = rawv6_init_sk,
+       .destroy           = inet6_destroy_sock,
+       .setsockopt        = rawv6_setsockopt,
+       .getsockopt        = rawv6_getsockopt,
+       .sendmsg           = rawv6_sendmsg,
+       .recvmsg           = rawv6_recvmsg,
+       .bind              = rawv6_bind,
+       .backlog_rcv       = rawv6_rcv_skb,
+       .hash              = raw_v6_hash,
+       .unhash            = raw_v6_unhash,
+       .obj_size          = sizeof(struct raw6_sock),
 #ifdef CONFIG_COMPAT
-       .compat_setsockopt =    compat_rawv6_setsockopt,
-       .compat_getsockopt =    compat_rawv6_getsockopt,
+       .compat_setsockopt = compat_rawv6_setsockopt,
+       .compat_getsockopt = compat_rawv6_getsockopt,
 #endif
-       .sendmsg =      rawv6_sendmsg,
-       .recvmsg =      rawv6_recvmsg,
-       .bind =         rawv6_bind,
-       .backlog_rcv =  rawv6_rcv_skb,
-       .hash =         raw_v6_hash,
-       .unhash =       raw_v6_unhash,
-       .obj_size =     sizeof(struct raw6_sock),
 };
 
 #ifdef CONFIG_PROC_FS
@@ -1202,7 +1198,7 @@ static int raw6_seq_open(struct inode *inode, struct file *file)
 {
        struct seq_file *seq;
        int rc = -ENOMEM;
-       struct raw6_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
+       struct raw6_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
        if (!s)
                goto out;
        rc = seq_open(file, &raw6_seq_ops);
@@ -1210,7 +1206,6 @@ static int raw6_seq_open(struct inode *inode, struct file *file)
                goto out_kfree;
        seq = file->private_data;
        seq->private = s;
-       memset(s, 0, sizeof(*s));
 out:
        return rc;
 out_kfree: