- merge revision 1.8

date: 2005/02/01 03:09:08;  author: mlhuang;  state: Exp;  lines: +2 -0
- bound vnet mods by #ifdef

diff --git a/include/linux/socket.h b/include/linux/socket.h
index f30253c..6d1852f 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -273,8 +273,10 @@ struct ucred {
 #define SOL_NETBEUI    267
 #define SOL_LLC                268
 
+#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
 /* PlanetLab PL2525: reset the context ID of an existing socket */
 #define SO_SETXID      SO_PEERCRED
+#endif
 
 /* IPX options */
 #define IPX_TYPE       1