This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 602d03b..3a18d6e 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -269,9 +269,6 @@ struct ucred {
 #define SOL_NETBEUI    267
 #define SOL_LLC                268
 
-/* PlanetLab PL2525: reset the context ID of an existing socket */
-#define SO_SETXID      SO_PEERCRED
-
 /* IPX options */
 #define IPX_TYPE       1
 
@@ -291,11 +288,6 @@ extern int move_addr_to_user(void *kaddr, int klen, void __user *uaddr, int __us
 extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr);
 extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
 
-struct socket;
-struct file * sock_map_file(struct socket *sock);
-extern int sock_map_fd(struct socket *sock);
-extern struct socket *sockfd_lookup(int fd, int *err);
-
 #endif
 #endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */