diff options
| author |   henning <henning@openbsd.org> | 2005-06-07 02:30:47 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2005-06-07 02:30:47 +0000 |
| commit | e6bc2e761152401041050fad1b42fb020264ceee (patch) | |
| tree | 8df756f208a4945249ebcf7bc1a4ba42fbe23a14 | |
| parent | CCITT about to bite the dust, remove special casing in archs and drivers (diff) | |
| download | wireguard-openbsd-e6bc2e761152401041050fad1b42fb020264ceee.tar.xz wireguard-openbsd-e6bc2e761152401041050fad1b42fb020264ceee.zip | |
remove CCITT handling
| -rw-r--r-- | sys/compat/linux/linux_socket.c | 8 | ||||
| -rw-r--r-- | sys/kern/uipc_domain.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index c885d9e2675..f4217145118 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_socket.c,v 1.32 2004/07/08 15:11:37 tedu Exp $ */ +/* $OpenBSD: linux_socket.c,v 1.33 2005/06/07 02:30:47 henning Exp $ */ /* $NetBSD: linux_socket.c,v 1.14 1996/04/05 00:01:50 christos Exp $ */ /* @@ -114,13 +114,13 @@ static const int linux_to_bsd_domain_[LINUX_AF_MAX] = { AF_UNSPEC, AF_UNIX, AF_INET, - AF_CCITT, /* LINUX_AF_AX25 */ + -1, /* LINUX_AF_AX25 */ AF_IPX, AF_APPLETALK, -1, /* LINUX_AF_NETROM */ -1, /* LINUX_AF_BRIDGE */ -1, /* LINUX_AF_ATMPVC */ - AF_CCITT, /* LINUX_AF_X25 */ + -1, /* LINUX_AF_X25 */ AF_INET6, -1, /* LINUX_AF_ROSE */ AF_DECnet, @@ -148,7 +148,7 @@ static const int bsd_to_linux_domain_[AF_MAX] = { -1, /* AF_ISO */ -1, /* AF_ECMA */ -1, /* AF_DATAKIT */ - LINUX_AF_AX25, /* AF_CCITT */ + -1, /* AF_CCITT */ -1, /* LINUX_AF_SNA */ -1, /* LINUX_AF_DECnet */ -1, /* AF_DLI */ diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index f9abca937ff..c82853feaf2 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.21 2005/01/14 12:04:02 grange Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.22 2005/06/07 02:30:47 henning Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -97,9 +97,6 @@ domaininit(void) #ifdef NS ADDDOMAIN(ns); #endif -#ifdef CCITT - ADDDOMAIN(ccitt); -#endif #ifdef NATM ADDDOMAIN(natm); #endif |