Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v
retrieving revision 1.89.26.4
retrieving revision 1.90
diff -u -p -r1.89.26.4 -r1.90
--- src/sys/sys/socket.h	2010/08/11 22:55:11	1.89.26.4
+++ src/sys/sys/socket.h	2008/06/15 21:14:06	1.90
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.89.26.4 2010/08/11 22:55:11 yamt Exp $	*/
+/*	$NetBSD: socket.h,v 1.90 2008/06/15 21:14:06 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -120,9 +120,7 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 #define	SO_LINGER	0x0080		/* linger on close if data present */
 #define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
 #define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-/* 	SO_OTIMESTAMP	0x0400		*/
-#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
-#define	SO_TIMESTAMP	0x2000		/* timestamp received dgram traffic */
+#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
 
 
 /*
@@ -132,8 +130,8 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 #define SO_RCVBUF	0x1002		/* receive buffer size */
 #define SO_SNDLOWAT	0x1003		/* send low-water mark */
 #define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-/* SO_OSNDTIMEO		0x1005 */
-/* SO_ORCVTIMEO		0x1006 */
+#define SO_SNDTIMEO	0x1005		/* send timeout */
+#define SO_RCVTIMEO	0x1006		/* receive timeout */
 #define	SO_ERROR	0x1007		/* get error status and clear */
 #define	SO_TYPE		0x1008		/* get socket type */
 #define	SO_OVERFLOWED	0x1009		/* datagrams: return packets dropped */
@@ -142,8 +140,6 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 					 * kernel removes header and supplies
 					 * payload
 					 */
-#define SO_SNDTIMEO	0x100b		/* send timeout */
-#define SO_RCVTIMEO	0x100c		/* receive timeout */
 /*
  * Structure used for manipulating linger option.
  */
@@ -152,11 +148,6 @@ struct	linger {
 	int	l_linger;		/* linger time in seconds */
 };
 
-struct	accept_filter_arg {
-	char	af_name[16];
-	char	af_arg[256-16];
-};
-
 /*
  * Level number for (get/set)sockopt() to apply to socket itself.
  */
@@ -166,7 +157,7 @@ struct	accept_filter_arg {
  * Address families.
  */
 #define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host */
+#define	AF_LOCAL	1		/* local to host (pipes, portals) */
 #define	AF_UNIX		AF_LOCAL	/* backward compatibility */
 #define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
 #define	AF_IMPLINK	3		/* arpanet imp addresses */
@@ -210,8 +201,8 @@ struct	accept_filter_arg {
 #endif
 #define AF_BLUETOOTH	31		/* Bluetooth: HCI, SCO, L2CAP, RFCOMM */
 #define	AF_IEEE80211	32		/* IEEE80211 */
-#define	AF_MPLS		33		/* MultiProtocol Label Switching */
-#define	AF_MAX		34
+
+#define	AF_MAX		33
 
 /*
  * Structure used by kernel to store most
@@ -300,7 +291,6 @@ struct sockaddr_storage {
 #define PF_KEY 		pseudo_AF_KEY	/* like PF_ROUTE, only for key mgmt */
 #endif
 #define PF_BLUETOOTH	AF_BLUETOOTH
-#define	PF_MPLS		AF_MPLS
 
 #define	PF_MAX		AF_MAX
 
@@ -433,17 +423,15 @@ struct kinfo_pcb {
  */
 #define NET_RT_DUMP	1		/* dump; may limit to a.f. */
 #define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_OOIFLIST	3		/* old NET_RT_IFLIST (pre 1.5) */
-#define NET_RT_OIFLIST	4		/* survey interface list */
-#define	NET_RT_IFLIST	5
-#define	NET_RT_MAXID	6
+#define NET_RT_OIFLIST	3		/* old NET_RT_IFLIST (pre 1.5) */
+#define NET_RT_IFLIST	4		/* survey interface list */
+#define	NET_RT_MAXID	5
 
 #define CTL_NET_RT_NAMES { \
 	{ 0, 0 }, \
 	{ "dump", CTLTYPE_STRUCT }, \
 	{ "flags", CTLTYPE_STRUCT }, \
 	{ 0, 0 }, \
-	{ 0, 0 }, \
 	{ "iflist", CTLTYPE_STRUCT }, \
 }
 #endif /* _NETBSD_SOURCE */
@@ -546,9 +534,8 @@ struct cmsghdr {
 /* "Socket"-level control message types: */
 #define	SCM_RIGHTS	0x01		/* access rights (array of int) */
 #if defined(_NETBSD_SOURCE)
-/* 			0x02		   timestamp (struct timeval50) */
+#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
 #define	SCM_CREDS	0x04		/* credentials (struct sockcred) */
-#define	SCM_TIMESTAMP	0x08		/* timestamp (struct timeval) */
 #endif
 
 /*
@@ -574,13 +561,10 @@ sockaddr_getlen(const struct sockaddr *s
 __BEGIN_DECLS
 struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,
     const struct sockaddr *);
-struct sockaddr *sockaddr_externalize(struct sockaddr *, socklen_t,
-    const struct sockaddr *);
 struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);
 const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *);
 void *sockaddr_addr(struct sockaddr *, socklen_t *);
 const struct sockaddr *sockaddr_any(const struct sockaddr *);
-const struct sockaddr *sockaddr_any_by_family(int);
 const void *sockaddr_anyaddr(const struct sockaddr *, socklen_t *);
 int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
 struct sockaddr *sockaddr_dup(const struct sockaddr *, int);