diff -NurpP linux-2.6.19-vs2.1.x-t3/include/net/af_unix.h linux-2.6.19-vs2.1.x-t3.1/include/net/af_unix.h
--- linux-2.6.19-vs2.1.x-t3/include/net/af_unix.h	2006-11-30 18:53:18 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/include/net/af_unix.h	2006-12-04 05:06:17 +0100
@@ -34,7 +34,7 @@ static inline struct sock *next_unix_soc
 			s = sk_next(s);
 		if (!s)
 			s = next_unix_socket_table(i);
-	} while (s && !vx_check(s->sk_xid, VS_WATCH_P|VS_IDENT));
+	} while (s && !nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT));
 	return s;
 }
 
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/ipv4/inet_diag.c linux-2.6.19-vs2.1.x-t3.1/net/ipv4/inet_diag.c
--- linux-2.6.19-vs2.1.x-t3/net/ipv4/inet_diag.c	2006-12-02 16:06:13 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/ipv4/inet_diag.c	2006-12-04 05:06:57 +0100
@@ -694,7 +694,7 @@ static int inet_diag_dump(struct sk_buff
 			sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
 				struct inet_sock *inet = inet_sk(sk);
 
-				if (!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+				if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 					continue;
 				if (num < s_num) {
 					num++;
@@ -756,7 +756,7 @@ skip_listen_ht:
 		sk_for_each(sk, node, &head->chain) {
 			struct inet_sock *inet = inet_sk(sk);
 
-			if (!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+			if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 				continue;
 			if (num < s_num)
 				goto next_normal;
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/ipv4/raw.c linux-2.6.19-vs2.1.x-t3.1/net/ipv4/raw.c
--- linux-2.6.19-vs2.1.x-t3/net/ipv4/raw.c	2006-12-02 16:05:08 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/ipv4/raw.c	2006-12-04 05:07:18 +0100
@@ -829,7 +829,7 @@ static struct sock *raw_get_first(struct
 
 		sk_for_each(sk, node, &raw_v4_htable[state->bucket])
 			if (sk->sk_family == PF_INET &&
-				vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+				nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 				goto found;
 	}
 	sk = NULL;
@@ -846,7 +846,7 @@ static struct sock *raw_get_next(struct 
 try_again:
 		;
 	} while (sk && (sk->sk_family != PF_INET ||
-		!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT)));
+		!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
 
 	if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
 		sk = sk_head(&raw_v4_htable[state->bucket]);
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/ipv4/tcp_ipv4.c linux-2.6.19-vs2.1.x-t3.1/net/ipv4/tcp_ipv4.c
--- linux-2.6.19-vs2.1.x-t3/net/ipv4/tcp_ipv4.c	2006-12-02 16:04:42 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/ipv4/tcp_ipv4.c	2006-12-04 04:51:13 +0100
@@ -1392,9 +1392,9 @@ static void *listening_get_next(struct s
 			while (req) {
 				vxdprintk(VXD_CBIT(net, 6),
 					"sk,req: %p [#%d] (from %d)", req->sk,
-					(req->sk)?req->sk->sk_xid:0, vx_current_xid());
+					(req->sk)?req->sk->sk_nid:0, nx_current_nid());
 				if (req->sk &&
-					!vx_check(req->sk->sk_xid, VS_WATCH_P|VS_IDENT))
+					!nx_check(req->sk->sk_nid, VS_WATCH_P|VS_IDENT))
 					continue;
 				if (req->rsk_ops->family == st->family) {
 					cur = req;
@@ -1421,8 +1421,8 @@ get_req:
 get_sk:
 	sk_for_each_from(sk, node) {
 		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
-			sk, sk->sk_xid, vx_current_xid());
-		if (!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+			sk, sk->sk_nid, nx_current_nid());
+		if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 			continue;
 		if (sk->sk_family == st->family) {
 			cur = sk;
@@ -1477,8 +1477,8 @@ static void *established_get_first(struc
 		sk_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
 			vxdprintk(VXD_CBIT(net, 6),
 				"sk,egf: %p [#%d] (from %d)",
-				sk, sk->sk_xid, vx_current_xid());
-			if (!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+				sk, sk->sk_nid, nx_current_nid());
+			if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 				continue;
 			if (sk->sk_family != st->family)
 				continue;
@@ -1490,8 +1490,8 @@ static void *established_get_first(struc
 				   &tcp_hashinfo.ehash[st->bucket + tcp_hashinfo.ehash_size].chain) {
 			vxdprintk(VXD_CBIT(net, 6),
 				"tw: %p [#%d] (from %d)",
-				tw, tw->tw_xid, vx_current_xid());
-			if (!vx_check(tw->tw_xid, VS_WATCH_P|VS_IDENT))
+				tw, tw->tw_nid, nx_current_nid());
+			if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
 				continue;
 			if (tw->tw_family != st->family)
 				continue;
@@ -1519,7 +1519,7 @@ static void *established_get_next(struct
 		tw = tw_next(tw);
 get_tw:
 		while (tw && (tw->tw_family != st->family ||
-			!vx_check(tw->tw_xid, VS_WATCH_P|VS_IDENT))) {
+			!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))) {
 			tw = tw_next(tw);
 		}
 		if (tw) {
@@ -1545,8 +1545,8 @@ get_tw:
 	sk_for_each_from(sk, node) {
 		vxdprintk(VXD_CBIT(net, 6),
 			"sk,egn: %p [#%d] (from %d)",
-			sk, sk->sk_xid, vx_current_xid());
-		if (!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+			sk, sk->sk_nid, nx_current_nid());
+		if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 			continue;
 		if (sk->sk_family == st->family)
 			goto found;
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/ipv4/udp.c linux-2.6.19-vs2.1.x-t3.1/net/ipv4/udp.c
--- linux-2.6.19-vs2.1.x-t3/net/ipv4/udp.c	2006-12-02 16:05:32 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/ipv4/udp.c	2006-12-04 05:07:46 +0100
@@ -1476,7 +1476,7 @@ static struct sock *udp_get_first(struct
 
 		sk_for_each(sk, node, &udp_hash[state->bucket]) {
 			if (sk->sk_family == state->family &&
-				vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT))
+				nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
 				goto found;
 		}
 	}
@@ -1494,7 +1494,7 @@ static struct sock *udp_get_next(struct 
 try_again:
 		;
 	} while (sk && (sk->sk_family != state->family ||
-		!vx_check(sk->sk_xid, VS_WATCH_P|VS_IDENT)));
+		!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
 
 	if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
 		sk = sk_head(&udp_hash[state->bucket]);
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/socket.c linux-2.6.19-vs2.1.x-t3.1/net/socket.c
--- linux-2.6.19-vs2.1.x-t3/net/socket.c	2006-11-30 18:53:18 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/socket.c	2006-12-04 05:08:37 +0100
@@ -561,11 +561,12 @@ static inline int __sock_sendmsg(struct 
 			vx_sock_fail(sock->sk, size);
 	}
 	vxdprintk(VXD_CBIT(net, 7),
-		"__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d",
+		"__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
 		sock, sock->sk,
 		(sock->sk)?sock->sk->sk_nx_info:0,
 		(sock->sk)?sock->sk->sk_vx_info:0,
 		(sock->sk)?sock->sk->sk_xid:0,
+		(sock->sk)?sock->sk->sk_nid:0,
 		(unsigned int)size, len);
 	return len;
 }
@@ -622,11 +623,12 @@ static inline int __sock_recvmsg(struct 
 	if ((len >= 0) && sock->sk)
 		vx_sock_recv(sock->sk, len);
 	vxdprintk(VXD_CBIT(net, 7),
-		"__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d",
+		"__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
 		sock, sock->sk,
 		(sock->sk)?sock->sk->sk_nx_info:0,
 		(sock->sk)?sock->sk->sk_vx_info:0,
 		(sock->sk)?sock->sk->sk_xid:0,
+		(sock->sk)?sock->sk->sk_nid:0,
 		(unsigned int)size, len);
 	return len;
 }
diff -NurpP linux-2.6.19-vs2.1.x-t3/net/unix/af_unix.c linux-2.6.19-vs2.1.x-t3.1/net/unix/af_unix.c
--- linux-2.6.19-vs2.1.x-t3/net/unix/af_unix.c	2006-11-30 18:53:18 +0100
+++ linux-2.6.19-vs2.1.x-t3.1/net/unix/af_unix.c	2006-12-04 05:08:47 +0100
@@ -254,7 +254,7 @@ static struct sock *__unix_find_socket_b
 	sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
 		struct unix_sock *u = unix_sk(s);
 
-		if (!vx_check(s->sk_xid, VS_WATCH_P|VS_IDENT))
+		if (!nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT))
 			continue;
 		if (u->addr->len == len &&
 		    !memcmp(u->addr->name, sunname, len))