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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
  [NETFILTER]: Add H.323 conntrack/NAT helper
  [TG3]: Don't mark tg3_test_registers() as returning const.
  [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
  [IPV6]: Nearly complete kzalloc cleanup for net/ipv6
  [IPV6]: Cleanup of net/ipv6/reassambly.c
  [BRIDGE]: Remove duplicate const from is_link_local() argument type.
  [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
  [TG3]: make drivers/net/tg3.c:tg3_request_irq() static
  [BRIDGE]: use LLC to send STP
  [LLC]: llc_mac_hdr_init const arguments
  [BRIDGE]: allow show/store of group multicast address
  [BRIDGE]: use llc for receiving STP packets
  [BRIDGE]: stp timer to jiffies cleanup
  [BRIDGE]: forwarding remove unneeded preempt and bh diasables
  [BRIDGE]: netfilter inline cleanup
  [BRIDGE]: netfilter VLAN macro cleanup
  [BRIDGE]: netfilter dont use __constant_htons
  [BRIDGE]: netfilter whitespace
  [BRIDGE]: optimize frame pass up
  [BRIDGE]: use kzalloc
  ...

1 files changed, 101 insertions, 44 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index ae20a0ec9bd8..fa1ce0ae123e 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -859,29 +859,12 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
 }
 
 
-static int rawv6_setsockopt(struct sock *sk, int level, int optname, 
+static int do_rawv6_setsockopt(struct sock *sk, int level, int optname,
                             char __user *optval, int optlen)
 {
         struct raw6_sock *rp = raw6_sk(sk);
         int val;
 
-        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;
-                default:
-                        return ipv6_setsockopt(sk, level, optname, optval,
-                                               optlen);
-        };
-
         if (get_user(val, (int __user *)optval))
                 return -EFAULT;
 
@@ -906,12 +889,9 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
         }
 }
 
-static int rawv6_getsockopt(struct sock *sk, int level, int optname, 
-                            char __user *optval, int __user *optlen)
+static int rawv6_setsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int optlen)
 {
-        struct raw6_sock *rp = raw6_sk(sk);
-        int val, len;
-
         switch(level) {
                 case SOL_RAW:
                         break;
@@ -919,15 +899,45 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
                 case SOL_ICMPV6:
                         if (inet_sk(sk)->num != IPPROTO_ICMPV6)
                                 return -EOPNOTSUPP;
-                        return rawv6_geticmpfilter(sk, level, optname, optval,
+                        return rawv6_seticmpfilter(sk, level, optname, optval,
                                                    optlen);
                 case SOL_IPV6:
                         if (optname == IPV6_CHECKSUM)
                                 break;
                 default:
-                        return ipv6_getsockopt(sk, level, optname, optval,
+                        return ipv6_setsockopt(sk, level, optname, optval,
                                                optlen);
         };
+        return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,
+                                   char __user *optval, int optlen)
+{
+        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;
+        default:
+                return compat_ipv6_setsockopt(sk, level, optname,
+                                              optval, optlen);
+        };
+        return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
+static int do_rawv6_getsockopt(struct sock *sk, int level, int optname,
+                            char __user *optval, int __user *optlen)
+{
+        struct raw6_sock *rp = raw6_sk(sk);
+        int val, len;
 
         if (get_user(len,optlen))
                 return -EFAULT;
@@ -953,6 +963,50 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
         return 0;
 }
 
+static int rawv6_getsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int __user *optlen)
+{
+        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;
+                default:
+                        return ipv6_getsockopt(sk, level, optname, optval,
+                                               optlen);
+        };
+        return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,
+                                   char __user *optval, int __user *optlen)
+{
+        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;
+        default:
+                return compat_ipv6_getsockopt(sk, level, optname,
+                                              optval, optlen);
+        };
+        return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
 static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
         switch(cmd) {
@@ -998,23 +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,
-        .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),
+        .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,
+#endif
 };
 
 #ifdef CONFIG_PROC_FS
@@ -1140,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);
@@ -1148,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: