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, 57 insertions, 23 deletions

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index f29a12da5109..fc2562415555 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -660,12 +660,9 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
 out:    return ret;
 }
 
-static int raw_setsockopt(struct sock *sk, int level, int optname, 
+static int do_raw_setsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, int optlen)
 {
-        if (level != SOL_RAW)
-                return ip_setsockopt(sk, level, optname, optval, optlen);
-
         if (optname == ICMP_FILTER) {
                 if (inet_sk(sk)->num != IPPROTO_ICMP)
                         return -EOPNOTSUPP;
@@ -675,12 +672,27 @@ static int raw_setsockopt(struct sock *sk, int level, int optname,
         return -ENOPROTOOPT;
 }
 
-static int raw_getsockopt(struct sock *sk, int level, int optname, 
-                          char __user *optval, int __user *optlen)
+static int raw_setsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int optlen)
 {
         if (level != SOL_RAW)
-                return ip_getsockopt(sk, level, optname, optval, optlen);
+                return ip_setsockopt(sk, level, optname, optval, optlen);
+        return do_raw_setsockopt(sk, level, optname, optval, optlen);
+}
 
+#ifdef CONFIG_COMPAT
+static int compat_raw_setsockopt(struct sock *sk, int level, int optname,
+                                 char __user *optval, int optlen)
+{
+        if (level != SOL_RAW)
+                return compat_ip_setsockopt(sk, level, optname, optval, optlen);
+        return do_raw_setsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
+static int do_raw_getsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int __user *optlen)
+{
         if (optname == ICMP_FILTER) {
                 if (inet_sk(sk)->num != IPPROTO_ICMP)
                         return -EOPNOTSUPP;
@@ -690,6 +702,24 @@ static int raw_getsockopt(struct sock *sk, int level, int optname,
         return -ENOPROTOOPT;
 }
 
+static int raw_getsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int __user *optlen)
+{
+        if (level != SOL_RAW)
+                return ip_getsockopt(sk, level, optname, optval, optlen);
+        return do_raw_getsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_raw_getsockopt(struct sock *sk, int level, int optname,
+                                 char __user *optval, int __user *optlen)
+{
+        if (level != SOL_RAW)
+                return compat_ip_getsockopt(sk, level, optname, optval, optlen);
+        return do_raw_getsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
 static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
         switch (cmd) {
@@ -719,22 +749,26 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 }
 
 struct proto raw_prot = {
-        .name =         "RAW",
-        .owner =        THIS_MODULE,
-        .close =        raw_close,
-        .connect =      ip4_datagram_connect,
-        .disconnect =   udp_disconnect,
-        .ioctl =        raw_ioctl,
-        .init =         raw_init,
-        .setsockopt =   raw_setsockopt,
-        .getsockopt =   raw_getsockopt,
-        .sendmsg =      raw_sendmsg,
-        .recvmsg =      raw_recvmsg,
-        .bind =         raw_bind,
-        .backlog_rcv =  raw_rcv_skb,
-        .hash =         raw_v4_hash,
-        .unhash =       raw_v4_unhash,
-        .obj_size =     sizeof(struct raw_sock),
+        .name              = "RAW",
+        .owner             = THIS_MODULE,
+        .close             = raw_close,
+        .connect           = ip4_datagram_connect,
+        .disconnect        = udp_disconnect,
+        .ioctl             = raw_ioctl,
+        .init              = raw_init,
+        .setsockopt        = raw_setsockopt,
+        .getsockopt        = raw_getsockopt,
+        .sendmsg           = raw_sendmsg,
+        .recvmsg           = raw_recvmsg,
+        .bind              = raw_bind,
+        .backlog_rcv       = raw_rcv_skb,
+        .hash              = raw_v4_hash,
+        .unhash            = raw_v4_unhash,
+        .obj_size          = sizeof(struct raw_sock),
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt = compat_raw_setsockopt,
+        .compat_getsockopt = compat_raw_getsockopt,
+#endif
 };
 
 #ifdef CONFIG_PROC_FS