X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=include%2Flinux%2Fvs_socket.h;h=c9c624442593fac6ce6c075a465da7f4503b87b0;hp=9173bfe26f2e5f5590e055c550c74c9b1c103650;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114

diff --git a/include/linux/vs_socket.h b/include/linux/vs_socket.h
index 9173bfe26..c9c624442 100644
--- a/include/linux/vs_socket.h
+++ b/include/linux/vs_socket.h
@@ -7,16 +7,24 @@
 /* socket accounting */
 
 #include <linux/socket.h>
+#include <linux/vserver/cacct.h>
 
 static inline int vx_sock_type(int family)
 {
-	int type = 4;
-
-	if (family > 0 && family < 3)
-		type = family;
-	else if (family == PF_INET6)
-		type = 3;
-	return type;
+	switch (family) {
+	case PF_UNSPEC:
+		return VXA_SOCK_UNSPEC;
+	case PF_UNIX:
+		return VXA_SOCK_UNIX;
+	case PF_INET:
+		return VXA_SOCK_INET;
+	case PF_INET6:
+		return VXA_SOCK_INET6;
+	case PF_PACKET:
+		return VXA_SOCK_PACKET;
+	default:
+		return VXA_SOCK_OTHER;
+	}
 }
 
 #define vx_acc_sock(v,f,p,s) \