From 0ddd0a1e63d104b414d02d21a517cfba7f30abce Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 4 Mar 2005 13:46:27 +0000 Subject: [PATCH] - merge revision 1.8 date: 2005/02/01 03:09:08; author: mlhuang; state: Exp; lines: +2 -0 - bound vnet mods by #ifdef --- include/linux/socket.h | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.47.0