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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 12 insertions, 26 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a05c34260e70..2b57eaf66abc 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -103,6 +103,7 @@
 #include <asm/uaccess.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <net/af_unix.h>
@@ -593,7 +594,7 @@ static struct proto unix_proto = {
  */
 static struct lock_class_key af_unix_sk_receive_queue_lock_key;
 
-static struct sock * unix_create1(struct socket *sock)
+static struct sock * unix_create1(struct net *net, struct socket *sock)
 {
         struct sock *sk = NULL;
         struct unix_sock *u;
@@ -601,7 +602,7 @@ static struct sock * unix_create1(struct socket *sock)
         if (atomic_read(&unix_nr_socks) >= 2*get_max_files())
                 goto out;
 
-        sk = sk_alloc(PF_UNIX, GFP_KERNEL, &unix_proto, 1);
+        sk = sk_alloc(net, PF_UNIX, GFP_KERNEL, &unix_proto, 1);
         if (!sk)
                 goto out;
 
@@ -627,8 +628,11 @@ out:
         return sk;
 }
 
-static int unix_create(struct socket *sock, int protocol)
+static int unix_create(struct net *net, struct socket *sock, int protocol)
 {
+        if (net != &init_net)
+                return -EAFNOSUPPORT;
+
         if (protocol && protocol != PF_UNIX)
                 return -EPROTONOSUPPORT;
 
@@ -654,7 +658,7 @@ static int unix_create(struct socket *sock, int protocol)
                 return -ESOCKTNOSUPPORT;
         }
 
-        return unix_create1(sock) ? 0 : -ENOMEM;
+        return unix_create1(net, sock) ? 0 : -ENOMEM;
 }
 
 static int unix_release(struct socket *sock)
@@ -1038,7 +1042,7 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,
         err = -ENOMEM;
 
         /* create new sock for complete connection */
-        newsk = unix_create1(NULL);
+        newsk = unix_create1(sk->sk_net, NULL);
         if (newsk == NULL)
                 goto out;
 
@@ -2082,25 +2086,7 @@ static const struct seq_operations unix_seq_ops = {
 
 static int unix_seq_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        int rc = -ENOMEM;
-        int *iter = kmalloc(sizeof(int), GFP_KERNEL);
-
-        if (!iter)
-                goto out;
-
-        rc = seq_open(file, &unix_seq_ops);
-        if (rc)
-                goto out_kfree;
-
-        seq          = file->private_data;
-        seq->private = iter;
-        *iter = 0;
-out:
-        return rc;
-out_kfree:
-        kfree(iter);
-        goto out;
+        return seq_open_private(file, &unix_seq_ops, sizeof(int));
 }
 
 static const struct file_operations unix_seq_fops = {
@@ -2135,7 +2121,7 @@ static int __init af_unix_init(void)
 
         sock_register(&unix_family_ops);
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("unix", 0, &unix_seq_fops);
+        proc_net_fops_create(&init_net, "unix", 0, &unix_seq_fops);
 #endif
         unix_sysctl_register();
 out:
@@ -2146,7 +2132,7 @@ static void __exit af_unix_exit(void)
 {
         sock_unregister(PF_UNIX);
         unix_sysctl_unregister();
-        proc_net_remove("unix");
+        proc_net_remove(&init_net, "unix");
         proto_unregister(&unix_proto);
 }