diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-07 02:29:31 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-07 02:29:31 +0000 |
| commit | d611c626dcfedc32389bf4cef66844f3bbe7f411 (patch) | |
| tree | 1efb403cf0c67e581b8516f82d3913eb7a47b427 | |
| parent | 525b8b85bcee548192ba13483c300604e68c6fbd (diff) | |
CCITT about to bite the dust, remove special casing in archs and drivers
| -rw-r--r-- | sys/arch/mac68k/dev/if_mc.c | 10 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/smc91cxx.c | 22 |
3 files changed, 5 insertions, 33 deletions
diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c index f200525f1c8..ddf91a6ab6e 100644 --- a/sys/arch/mac68k/dev/if_mc.c +++ b/sys/arch/mac68k/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.11 2005/01/04 18:42:04 martin Exp $ */ +/* $OpenBSD: if_mc.c,v 1.12 2005/06/07 02:29:30 henning Exp $ */ /* $NetBSD: if_mc.c,v 1.24 2004/10/30 18:08:34 thorpej Exp $ */ /*- @@ -62,14 +62,6 @@ #include <netns/ns_if.h> #endif -#if defined(CCITT) && defined(LLC) -#include <sys/socketvar.h> -#include <netccitt/x25.h> -#include <netccitt/pk.h> -#include <netccitt/pk_var.h> -#include <netccitt/pk_extern.h> -#endif - #include <uvm/uvm_extern.h> #include "bpfilter.h" diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index bbd56eccfef..9ec488eb381 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.14 2005/05/30 12:51:13 art Exp $ */ +/* $OpenBSD: interrupt.c,v 1.15 2005/06/07 02:29:30 henning Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -205,7 +205,7 @@ printf("Unhandled interrupt %x:%x\n", cause, pending); softclock(); } #if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || defined(CCITT) || NATM > 0 || \ + defined(IPX) || defined(NS) || NATM > 0 || \ NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~xcpl) { extern int netisr; @@ -514,7 +514,7 @@ generic_do_pending_int(int newcpl) softclock(); } #if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || defined(CCITT) || NATM > 0 || \ + defined(IPX) || defined(NS) || NATM > 0 || \ NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~newcpl) { int isr = netisr; diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index afc1ec6a141..cb0b870a4d6 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxx.c,v 1.19 2005/01/15 05:24:11 brad Exp $ */ +/* $OpenBSD: smc91cxx.c,v 1.20 2005/06/07 02:29:30 henning Exp $ */ /* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */ /*- @@ -113,14 +113,6 @@ #include <netns/ns_if.h> #endif -#if defined(CCITT) && defined(LLC) -#include <sys/socketvar.h> -#include <netccitt/x25.h> -#include <netccitt/pk.h> -#include <netccitt/pk_var.h> -#include <netccitt/pk_extern.h> -#endif - #if NBPFILTER > 0 #include <net/bpf.h> #endif @@ -1004,18 +996,6 @@ smc91cxx_ioctl(ifp, cmd, data) } break; -#if defined(CCITT) && defined(LLC) - case SIOCSIFCONF_X25: - if ((error = smc91cxx_enable(sc)) != 0) - break; - ifp->if_flags |= IFF_UP; - ifa->ifa_rtrequest = cons_rtrequest; /* XXX */ - error = x25_llcglue(PRC_IFUP, ifa->ifa_addr); - if (error == 0) - smc91cxx_init(sc); - break; -#endif - case SIOCSIFFLAGS: if ((ifp->if_flags & IFF_UP) == 0 && (ifp->if_flags & IFF_RUNNING) != 0) { |