From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 4 Mar 2005 13:46:27 +0000 (+0000)
Subject: - merge revision 1.8
X-Git-Tag: planetlab-3_0-rc13~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0ddd0a1e63d104b414d02d21a517cfba7f30abce;p=linux-2.6.git

- 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 f30253c38..6d1852f3c 100644
--- 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