Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / net / af_unix.h

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 2412bb6..47c8228 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -4,8 +4,8 @@
 #include <linux/socket.h>
 #include <linux/un.h>
 #include <linux/mutex.h>
-#include <net/sock.h>
 #include <linux/vs_base.h>
+#include <net/sock.h>
 
 extern void unix_inflight(struct file *fp);
 extern void unix_notinflight(struct file *fp);
@@ -34,7 +34,7 @@ static inline struct sock *next_unix_socket(int *i, struct sock *s)
                        s = sk_next(s);
                if (!s)
                        s = next_unix_socket_table(i);
-       } while (s && !vx_check(s->sk_xid, VX_IDENT|VX_WATCH));
+       } while (s && !nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT));
        return s;
 }