Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / vs_socket.h

diff --git a/include/linux/vs_socket.h b/include/linux/vs_socket.h
index c9c6244..9173bfe 100644 (file)
--- a/include/linux/vs_socket.h
+++ b/include/linux/vs_socket.h
@@ -7,24 +7,16 @@
 /* socket accounting */
 
 #include <linux/socket.h>
-#include <linux/vserver/cacct.h>
 
 static inline int vx_sock_type(int family)
 {
-       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;
-       }
+       int type = 4;
+
+       if (family > 0 && family < 3)
+               type = family;
+       else if (family == PF_INET6)
+               type = 3;
+       return type;
 }
 
 #define vx_acc_sock(v,f,p,s) \