From: downsj <downsj@openbsd.org>
Date: Wed, 12 Mar 1997 13:30:42 +0000 (+0000)
Subject: Move AF_SIP and put AF_INET6 in the same location as BSD/OS.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e6eb8d91cb54e523c2539ed128bb5c0f2b7303a3;p=openbsd

Move AF_SIP and put AF_INET6 in the same location as BSD/OS.

I couldn't find any use of AF_SIP in the kernel, didn't check user land.
---

diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 8f16308c9dc..9ecb735e90d 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: socket.h,v 1.14 1997/02/28 03:10:02 angelos Exp $	*/
+/*	$OpenBSD: socket.h,v 1.15 1997/03/12 13:30:42 downsj Exp $	*/
 /*	$NetBSD: socket.h,v 1.14 1996/02/09 18:25:36 christos Exp $	*/
 
 /*
@@ -120,13 +120,14 @@ struct	linger {
 #define	AF_CNT		21		/* Computer Network Technology */
 #define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
 #define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
+#define	AF_INET6	24		/* IPv6 */
 #define pseudo_AF_PIP	25		/* Help Identify PIP packets */
 #define AF_ISDN		26		/* Integrated Services Digital Network*/
 #define AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
 #define AF_NATM		27		/* native ATM access */
 #define	AF_ENCAP	28
-#define	AF_MAX		29
+#define	AF_SIP		29		/* Simple Internet Protocol */
+#define	AF_MAX		30
 
 /*
  * Structure used by kernel to store most
@@ -174,13 +175,14 @@ struct sockproto {
 #define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
 #define	PF_COIP		AF_COIP
 #define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
 #define	PF_IPX		AF_IPX		/* same format as AF_NS */
+#define PF_INET6	AF_INET6
 #define PF_RTIP		pseudo_AF_FTIP	/* same format as AF_INET */
 #define PF_PIP		pseudo_AF_PIP
 #define PF_ISDN		AF_ISDN
 #define PF_NATM		AF_NATM
 #define PF_ENCAP	AF_ENCAP
+#define	PF_SIP		AF_SIP
 #define	PF_MAX		AF_MAX
 
 /*