From d2438d6942252f7b2f81dc639763c19bfbd6c14c Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 7 Aug 2003 21:54:36 +0000 Subject: [PATCH] kernel tree reorganization stage 1: Major cvs repository work (not logged as commits) plus a major reworking of the #include's to accomodate the relocations. * CVS repository files manually moved. Old directories left intact and empty (temporary). * Reorganize all filesystems into vfs/, most devices into dev/, sub-divide devices by function. * Begin to move device-specific architecture files to the device subdirs rather then throwing them all into, e.g. i386/include * Reorganize files related to system busses, placing the related code in a new bus/ directory. Also move cam to bus/cam though this may not have been the best idea in retrospect. * Reorganize emulation code and place it in a new emulation/ directory. * Remove the -I- compiler option in order to allow #include file localization, rename all config generated X.h files to use_X.h to clean up the conflicts. * Remove /usr/src/include (or /usr/include) dependancies during the kernel build, beyond what is normally needed to compile helper programs. * Make config create 'machine' softlinks for architecture specific directories outside of the standard /include. * Bump the config rev. WARNING! after this commit /usr/include and /usr/src/sys/compile/* should be regenerated from scratch. --- sys/dev/atm/en/midway.c | 4 +- sys/dev/atm/hea/eni.c | 4 +- sys/dev/atm/hea/eni_buffer.c | 4 +- sys/dev/atm/hea/eni_globals.c | 4 +- sys/dev/atm/hea/eni_if.c | 4 +- sys/dev/atm/hea/eni_init.c | 4 +- sys/dev/atm/hea/eni_intr.c | 4 +- sys/dev/atm/hea/eni_receive.c | 4 +- sys/dev/atm/hea/eni_transmit.c | 4 +- sys/dev/atm/hea/eni_vcm.c | 4 +- sys/dev/atm/hfa/fore_include.h | 4 +- sys/dev/disk/ccd/ccd.c | 4 +- sys/dev/netif/cx/if_cx.c | 4 +- sys/dev/netif/de/if_de.c | 10 +-- sys/dev/netif/wx/if_wxvar.h | 4 +- sys/dev/raid/vinum/vinumhdr.h | 4 +- sys/dev/usbmisc/umodem/umodem.c | 4 +- sys/kern/Make.tags.inc | 75 ++++++++++----------- sys/net/bridge/bridge.c | 6 +- sys/net/bsd_comp.c | 6 +- sys/net/ef/if_ef.c | 6 +- sys/net/i4b/capi/capi_l4if.c | 8 +-- sys/net/i4b/capi/capi_llif.c | 8 +-- sys/net/i4b/capi/capi_msgs.c | 8 +-- sys/net/i4b/capi/iavc/iavc_card.c | 8 +-- sys/net/i4b/capi/iavc/iavc_isa.c | 8 +-- sys/net/i4b/capi/iavc/iavc_lli.c | 8 +-- sys/net/i4b/capi/iavc/iavc_pci.c | 8 +-- sys/net/i4b/driver/i4b_isppp.c | 4 +- sys/net/i4b/layer1/i4b_l1dmux.c | 8 +-- sys/net/i4b/layer1/i4b_l1lib.c | 6 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c | 8 +-- sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c | 8 +-- sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c | 8 +-- sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c | 8 +-- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c | 8 +-- sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c | 4 +- sys/net/i4b/layer1/isic/i4b_diva.c | 4 +- sys/net/i4b/layer1/isic/i4b_drn_ngo.c | 4 +- sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c | 4 +- sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c | 4 +- sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c | 4 +- sys/net/i4b/layer1/isic/i4b_isic_isa.c | 4 +- sys/net/i4b/layer1/isic/i4b_isic_pnp.c | 4 +- sys/net/i4b/layer1/isic/i4b_siemens_isurf.c | 4 +- sys/net/if_arcsubr.c | 6 +- sys/net/if_atmsubr.c | 4 +- sys/net/if_ethersubr.c | 12 ++-- sys/net/if_fddisubr.c | 12 ++-- sys/net/if_loop.c | 10 +-- sys/net/oldbridge/bridge.c | 6 +- sys/net/ppp/if_ppp.c | 6 +- sys/net/sppp/if_spppsubr.c | 6 +- sys/netgraph/async/ng_async.c | 4 +- sys/netgraph/bridge/ng_bridge.c | 4 +- sys/netgraph/cisco/ng_cisco.c | 8 +-- sys/netgraph/iface/ng_iface.c | 4 +- sys/netgraph/ksocket/ng_ksocket.c | 4 +- sys/netgraph/netgraph/ng_base.c | 4 +- sys/netgraph/netgraph/ng_parse.c | 4 +- sys/netgraph/ppp/ng_ppp.c | 4 +- sys/netinet/if_atm.c | 4 +- sys/netinet/if_ether.c | 4 +- sys/netinet/in_pcb.c | 4 +- sys/netinet/in_proto.c | 4 +- sys/netinet/ip_gre.c | 10 +-- sys/netinet/ip_icmp.c | 4 +- sys/netinet/ip_input.c | 4 +- sys/netinet/ip_output.c | 6 +- sys/netinet/tcp_input.c | 4 +- sys/netinet/tcp_syncache.c | 4 +- sys/netinet6/ah_core.c | 4 +- sys/netinet6/ah_input.c | 8 +-- sys/netinet6/ah_output.c | 6 +- sys/netinet6/esp_core.c | 6 +- sys/netinet6/esp_input.c | 8 +-- sys/netinet6/esp_output.c | 6 +- sys/netinet6/icmp6.c | 4 +- sys/netinet6/in6_pcb.c | 4 +- sys/netinet6/ip6_forward.c | 4 +- sys/netinet6/ip6_output.c | 4 +- sys/netinet6/ipcomp_input.c | 6 +- sys/netinet6/ipcomp_output.c | 6 +- sys/netinet6/ipsec.c | 8 +-- sys/netinet6/ipsec.h | 4 +- sys/netinet6/ipsec6.h | 4 +- sys/netproto/atm/ipatm/ipatm_event.c | 4 +- sys/netproto/atm/ipatm/ipatm_if.c | 4 +- sys/netproto/atm/ipatm/ipatm_input.c | 4 +- sys/netproto/atm/ipatm/ipatm_load.c | 4 +- sys/netproto/atm/ipatm/ipatm_output.c | 4 +- sys/netproto/atm/ipatm/ipatm_usrreq.c | 4 +- sys/netproto/atm/ipatm/ipatm_vcm.c | 4 +- sys/netproto/atm/sigpvc/sigpvc_if.c | 4 +- sys/netproto/atm/sigpvc/sigpvc_subr.c | 4 +- sys/netproto/atm/spans/spans_arp.c | 8 +-- sys/netproto/atm/spans/spans_cls.c | 8 +-- sys/netproto/atm/spans/spans_if.c | 4 +- sys/netproto/atm/spans/spans_kxdr.c | 4 +- sys/netproto/atm/spans/spans_msg.c | 4 +- sys/netproto/atm/spans/spans_print.c | 4 +- sys/netproto/atm/spans/spans_proto.c | 4 +- sys/netproto/atm/spans/spans_subr.c | 4 +- sys/netproto/atm/spans/spans_util.c | 4 +- sys/netproto/atm/uni/q2110_sigaa.c | 4 +- sys/netproto/atm/uni/q2110_sigcpcs.c | 4 +- sys/netproto/atm/uni/q2110_subr.c | 4 +- sys/netproto/atm/uni/qsaal1_sigaa.c | 4 +- sys/netproto/atm/uni/qsaal1_sigcpcs.c | 4 +- sys/netproto/atm/uni/qsaal1_subr.c | 4 +- sys/netproto/atm/uni/sscf_uni.c | 4 +- sys/netproto/atm/uni/sscf_uni_lower.c | 4 +- sys/netproto/atm/uni/sscf_uni_upper.c | 4 +- sys/netproto/atm/uni/sscop.c | 4 +- sys/netproto/atm/uni/sscop_lower.c | 4 +- sys/netproto/atm/uni/sscop_pdu.c | 4 +- sys/netproto/atm/uni/sscop_sigaa.c | 4 +- sys/netproto/atm/uni/sscop_sigcpcs.c | 4 +- sys/netproto/atm/uni/sscop_subr.c | 4 +- sys/netproto/atm/uni/sscop_timer.c | 4 +- sys/netproto/atm/uni/sscop_upper.c | 4 +- sys/netproto/atm/uni/uni_load.c | 4 +- sys/netproto/atm/uni/uniarp.c | 8 +-- sys/netproto/atm/uni/uniarp_cache.c | 8 +-- sys/netproto/atm/uni/uniarp_input.c | 8 +-- sys/netproto/atm/uni/uniarp_output.c | 8 +-- sys/netproto/atm/uni/uniarp_timer.c | 8 +-- sys/netproto/atm/uni/uniarp_vcm.c | 8 +-- sys/netproto/atm/uni/uniip.c | 8 +-- sys/netproto/atm/uni/unisig_decode.c | 4 +- sys/netproto/atm/uni/unisig_encode.c | 4 +- sys/netproto/atm/uni/unisig_if.c | 8 +-- sys/netproto/atm/uni/unisig_mbuf.c | 4 +- sys/netproto/atm/uni/unisig_msg.c | 4 +- sys/netproto/atm/uni/unisig_print.c | 4 +- sys/netproto/atm/uni/unisig_proto.c | 4 +- sys/netproto/atm/uni/unisig_sigmgr_state.c | 4 +- sys/netproto/atm/uni/unisig_subr.c | 4 +- sys/netproto/atm/uni/unisig_util.c | 4 +- sys/netproto/atm/uni/unisig_vc_state.c | 4 +- sys/netproto/ncp/ncp_conn.h | 4 +- sys/netproto/ncp/ncp_ncp.c | 6 +- sys/netproto/ncp/ncp_sock.c | 6 +- sys/netproto/smb/netbios.h | 4 +- sys/vfs/nwfs/nwfs.h | 4 +- sys/vfs/nwfs/nwfs_io.c | 8 +-- sys/vfs/nwfs/nwfs_ioctl.c | 8 +-- sys/vfs/nwfs/nwfs_mount.h | 4 +- sys/vfs/nwfs/nwfs_node.c | 8 +-- sys/vfs/nwfs/nwfs_subr.c | 14 ++-- sys/vfs/nwfs/nwfs_vfsops.c | 12 ++-- sys/vfs/nwfs/nwfs_vnops.c | 12 ++-- sys/vfs/smbfs/smbfs_io.c | 8 +-- sys/vfs/smbfs/smbfs_node.c | 8 +-- sys/vfs/smbfs/smbfs_smb.c | 10 +-- sys/vfs/smbfs/smbfs_subr.c | 12 ++-- sys/vfs/smbfs/smbfs_vfsops.c | 10 +-- sys/vfs/smbfs/smbfs_vnops.c | 8 +-- 158 files changed, 470 insertions(+), 477 deletions(-) diff --git a/sys/dev/atm/en/midway.c b/sys/dev/atm/en/midway.c index db5d812fb1..9da69f438d 100644 --- a/sys/dev/atm/en/midway.c +++ b/sys/dev/atm/en/midway.c @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $ - * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.4 2003/08/07 21:54:27 dillon Exp $ */ /* @@ -142,7 +142,7 @@ #endif #ifdef NATM -#include +#include #endif #if !defined(sparc) && !defined(__FreeBSD__) diff --git a/sys/dev/atm/hea/eni.c b/sys/dev/atm/hea/eni.c index 0098bdefeb..59e5f0a5bd 100644 --- a/sys/dev/atm/hea/eni.c +++ b/sys/dev/atm/hea/eni.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_buffer.c b/sys/dev/atm/hea/eni_buffer.c index 2638cb1b8f..5355736913 100644 --- a/sys/dev/atm/hea/eni_buffer.c +++ b/sys/dev/atm/hea/eni_buffer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.5 1999/08/28 00:41:43 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_globals.c b/sys/dev/atm/hea/eni_globals.c index b184945f8a..8ed2f6402b 100644 --- a/sys/dev/atm/hea/eni_globals.c +++ b/sys/dev/atm/hea/eni_globals.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.5 2000/01/17 20:49:41 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_globals.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_globals.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_if.c b/sys/dev/atm/hea/eni_if.c index cbd597661e..c43cc6b001 100644 --- a/sys/dev/atm/hea/eni_if.c +++ b/sys/dev/atm/hea/eni_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_init.c b/sys/dev/atm/hea/eni_init.c index b38e75b550..f39bb44c5d 100644 --- a/sys/dev/atm/hea/eni_init.c +++ b/sys/dev/atm/hea/eni_init.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.3 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_init.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_init.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_intr.c b/sys/dev/atm/hea/eni_intr.c index e85f54c523..1cb3bfd13f 100644 --- a/sys/dev/atm/hea/eni_intr.c +++ b/sys/dev/atm/hea/eni_intr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.4 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_receive.c b/sys/dev/atm/hea/eni_receive.c index efb7356129..6ead38f6be 100644 --- a/sys/dev/atm/hea/eni_receive.c +++ b/sys/dev/atm/hea/eni_receive.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.5 1999/08/28 00:41:45 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_transmit.c b/sys/dev/atm/hea/eni_transmit.c index 1d821ce6f5..e59daef7fc 100644 --- a/sys/dev/atm/hea/eni_transmit.c +++ b/sys/dev/atm/hea/eni_transmit.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.6 1999/12/21 08:24:35 eivind Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_transmit.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_transmit.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -36,7 +36,7 @@ */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hea/eni_vcm.c b/sys/dev/atm/hea/eni_vcm.c index a62c3ee616..c7e6d75c98 100644 --- a/sys/dev/atm/hea/eni_vcm.c +++ b/sys/dev/atm/hea/eni_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.3 1999/08/28 00:41:47 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_vcm.c,v 1.4 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_vcm.c,v 1.5 2003/08/07 21:54:28 dillon Exp $ */ /* @@ -36,7 +36,7 @@ */ -#include +#include #include "eni_stats.h" #include "eni.h" diff --git a/sys/dev/atm/hfa/fore_include.h b/sys/dev/atm/hfa/fore_include.h index 126f74f1b4..02fd2de91d 100644 --- a/sys/dev/atm/hfa/fore_include.h +++ b/sys/dev/atm/hfa/fore_include.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.2 1999/08/28 00:41:50 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.4 2003/08/07 21:54:29 dillon Exp $ * */ @@ -39,7 +39,7 @@ #ifndef _FORE_INCLUDE_H #define _FORE_INCLUDE_H -#include +#include /* * If not specified elsewhere, guess which type of bus support we want diff --git a/sys/dev/disk/ccd/ccd.c b/sys/dev/disk/ccd/ccd.c index cd94999a14..5fc47f4e11 100644 --- a/sys/dev/disk/ccd/ccd.c +++ b/sys/dev/disk/ccd/ccd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73.2.1 2001/09/11 09:49:52 kris Exp $ */ -/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.9 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.10 2003/08/07 21:54:29 dillon Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -102,7 +102,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c index df791e98a4..10109c4b48 100644 --- a/sys/dev/netif/cx/if_cx.c +++ b/sys/dev/netif/cx/if_cx.c @@ -17,7 +17,7 @@ * Version 1.9, Wed Oct 4 18:58:15 MSK 1995 * * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $ - * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.4 2003/08/07 21:54:29 dillon Exp $ * */ #undef DEBUG @@ -45,7 +45,7 @@ #define watchdog_func_t void(*)(struct ifnet *) #define start_func_t void(*)(struct ifnet*) -#include +#include #include #include "cxreg.h" diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 4fedb81395..ac4bbf82c5 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -1,7 +1,7 @@ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.4 2003/08/07 21:17:00 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.5 2003/08/07 21:54:29 dillon Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -73,13 +73,13 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif #ifdef NS -#include -#include +#include +#include #endif #include diff --git a/sys/dev/netif/wx/if_wxvar.h b/sys/dev/netif/wx/if_wxvar.h index 4758c371b4..3df25ae48e 100644 --- a/sys/dev/netif/wx/if_wxvar.h +++ b/sys/dev/netif/wx/if_wxvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/pci/if_wxvar.h,v 1.4.2.6 2001/10/20 17:44:12 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.4 2003/08/07 21:54:29 dillon Exp $ */ /* * Principal Author: Matthew Jacob * Copyright (c) 1999, 2001 by Traakan Software @@ -88,7 +88,7 @@ MODULE_DEPEND(wx, miibus, 1, 1, 1); #include "opt_bdg.h" #ifdef BRIDGE #include -#include +#include #endif struct wxmdvar { diff --git a/sys/dev/raid/vinum/vinumhdr.h b/sys/dev/raid/vinum/vinumhdr.h index 6f32b2d671..0af022a341 100644 --- a/sys/dev/raid/vinum/vinumhdr.h +++ b/sys/dev/raid/vinum/vinumhdr.h @@ -38,7 +38,7 @@ /* * $Id: vinumhdr.h,v 1.18 2001/01/04 00:14:14 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.16.2.1 2001/03/13 02:59:43 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumhdr.h,v 1.5 2003/08/07 21:17:09 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumhdr.h,v 1.6 2003/08/07 21:54:29 dillon Exp $ */ #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/usbmisc/umodem/umodem.c b/sys/dev/usbmisc/umodem/umodem.c index 7971d7fa4d..83dfdf39b1 100644 --- a/sys/dev/usbmisc/umodem/umodem.c +++ b/sys/dev/usbmisc/umodem/umodem.c @@ -1,6 +1,6 @@ /* $NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.17.2.9 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.6 2003/08/07 21:17:14 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.7 2003/08/07 21:54:29 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ #include #include -#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if(umodemdebug) logprintf x diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index 3173bc59e9..e5ea543c0c 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/kern/Make.tags.inc,v 1.6.2.2 2003/02/10 12:21:08 des Exp $ -# $DragonFly: src/sys/kern/Make.tags.inc,v 1.4 2003/08/07 21:17:23 dillon Exp $ +# $DragonFly: src/sys/kern/Make.tags.inc,v 1.5 2003/08/07 21:54:30 dillon Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= /sys @@ -29,29 +29,29 @@ COMM= ${SYS}/conf/*.[ch] \ ${SYS}/dev/smbus/*.[ch] \ ${SYS}/dev/vn/*.[ch] \ ${SYS}/dev/vx/*.[ch] \ - ${SYS}/isofs/cd9660/*.[ch] \ + ${SYS}/vfs/isofs/cd9660/*.[ch] \ ${SYS}/kern/*.[ch] \ - ${SYS}/miscfs/deadfs/*.[ch] \ - ${SYS}/miscfs/fdesc/*.[ch] \ - ${SYS}/miscfs/fifofs/*.[ch] \ - ${SYS}/miscfs/nullfs/*.[ch] \ - ${SYS}/miscfs/portal/*.[ch] \ - ${SYS}/miscfs/procfs/*.[ch] \ - ${SYS}/miscfs/specfs/*.[ch] \ - ${SYS}/miscfs/umapfs/*.[ch] \ - ${SYS}/miscfs/union/*.[ch] \ - ${SYS}/msdosfs/*.[ch] \ + ${SYS}/vfs/deadfs/*.[ch] \ + ${SYS}/vfs/fdesc/*.[ch] \ + ${SYS}/vfs/fifofs/*.[ch] \ + ${SYS}/vfs/nullfs/*.[ch] \ + ${SYS}/vfs/portal/*.[ch] \ + ${SYS}/vfs/procfs/*.[ch] \ + ${SYS}/vfs/specfs/*.[ch] \ + ${SYS}/vfs/umapfs/*.[ch] \ + ${SYS}/vfs/union/*.[ch] \ + ${SYS}/vfs/msdosfs/*.[ch] \ ${SYS}/net/*.[ch] \ - ${SYS}/netatalk/*.[ch] \ - ${SYS}/netatm/*.[ch] \ + ${SYS}/netproto/atalk/*.[ch] \ + ${SYS}/netproto/atm/*.[ch] \ ${SYS}/netinet/*.[ch] \ - ${SYS}/netipx/*.[ch] \ - ${SYS}/netkey/*.[ch] \ - ${SYS}/netnatm/*.[ch] \ - ${SYS}/netns/*.[ch] \ - ${SYS}/nfs/*.[ch] \ - ${SYS}/pci/*.[ch] \ - ${SYS}/posix4/*.[ch] \ + ${SYS}/netproto/ipx/*.[ch] \ + ${SYS}/netproto/key/*.[ch] \ + ${SYS}/netproto/natm/*.[ch] \ + ${SYS}/netproto/ns/*.[ch] \ + ${SYS}/vfs/nfs/*.[ch] \ + ${SYS}/bus/pci/*.[ch] \ + ${SYS}/emulation/posix4/*.[ch] \ ${SYS}/vfs/mfs/*.[ch] \ ${SYS}/vfs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ @@ -59,18 +59,11 @@ COMM= ${SYS}/conf/*.[ch] \ COMMDIR1= ${SYS}/conf \ ${SYS}/kern \ - ${SYS}/msdosfs \ ${SYS}/net \ - ${SYS}/netatalk \ - ${SYS}/netatm \ - ${SYS}/netinet \ - ${SYS}/netipx \ - ${SYS}/netkey \ - ${SYS}/netnatm \ - ${SYS}/netns \ - ${SYS}/nfs \ + ${SYS}/netproto \ + ${SYS}/vfs \ ${SYS}/pci \ - ${SYS}/posix4 \ + ${SYS}/emulation \ ${SYS}/vm \ ${SYS}/sys @@ -91,15 +84,15 @@ COMMDIR2= ${SYS}/dev/advansys \ ${SYS}/dev/smbus \ ${SYS}/dev/vn \ ${SYS}/dev/vx \ - ${SYS}/isofs/cd9660 \ - ${SYS}/miscfs/deadfs \ - ${SYS}/miscfs/fdesc \ - ${SYS}/miscfs/fifofs \ - ${SYS}/miscfs/nullfs \ - ${SYS}/miscfs/portal \ - ${SYS}/miscfs/procfs \ - ${SYS}/miscfs/specfs \ - ${SYS}/miscfs/umapfs \ - ${SYS}/miscfs/union \ + ${SYS}/vfs/isofs/cd9660 \ + ${SYS}/vfs/deadfs \ + ${SYS}/vfs/fdesc \ + ${SYS}/vfs/fifofs \ + ${SYS}/vfs/nullfs \ + ${SYS}/vfs/portal \ + ${SYS}/vfs/procfs \ + ${SYS}/vfs/specfs \ + ${SYS}/vfs/umapfs \ + ${SYS}/vfs/union \ ${SYS}/vfs/ufs \ ${SYS}/vfs/mfs diff --git a/sys/net/bridge/bridge.c b/sys/net/bridge/bridge.c index 695dc373f6..717199ca2d 100644 --- a/sys/net/bridge/bridge.c +++ b/sys/net/bridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.5 2003/08/07 21:54:30 dillon Exp $ */ /* @@ -109,8 +109,8 @@ #include /* for struct arpcom */ #include -#include -#include +#include +#include #include "bridge.h" /*--------------------*/ diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index 07ebef61d6..c021f3276d 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -41,17 +41,17 @@ * This version is for use with mbufs on BSD-derived systems. * * $FreeBSD: src/sys/net/bsd_comp.c,v 1.11.2.1 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bsd_comp.c,v 1.2 2003/06/17 04:28:47 dillon Exp $ + * $DragonFly: src/sys/net/bsd_comp.c,v 1.3 2003/08/07 21:54:30 dillon Exp $ */ #include #include #include #include -#include +#include #define PACKETPTR struct mbuf * -#include +#include #if DO_BSD_COMPRESS /* diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c index 197f2b9f9c..1a4d643123 100644 --- a/sys/net/ef/if_ef.c +++ b/sys/net/ef/if_ef.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $ - * $DragonFly: src/sys/net/ef/if_ef.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/ef/if_ef.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ #include "opt_inet.h" @@ -58,8 +58,8 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif /* internal frame types */ diff --git a/sys/net/i4b/capi/capi_l4if.c b/sys/net/i4b/capi/capi_l4if.c index 4687616e4f..368c09cf58 100644 --- a/sys/net/i4b/capi/capi_l4if.c +++ b/sys/net/i4b/capi/capi_l4if.c @@ -25,7 +25,7 @@ * capi/capi_l4if.c The CAPI i4b L4/device interface. * * $FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ #include "use_i4bcapi.h" @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../include/i4b_l3l4.h" #include "../include/i4b_mbuf.h" diff --git a/sys/net/i4b/capi/capi_llif.c b/sys/net/i4b/capi/capi_llif.c index d8720db18e..e33af49fbc 100644 --- a/sys/net/i4b/capi/capi_llif.c +++ b/sys/net/i4b/capi/capi_llif.c @@ -25,7 +25,7 @@ * capi/capi_llif.c The i4b CAPI link layer interface. * * $FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ #include "use_i4bcapi.h" @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../include/i4b_l3l4.h" #include "../include/i4b_mbuf.h" diff --git a/sys/net/i4b/capi/capi_msgs.c b/sys/net/i4b/capi/capi_msgs.c index 5df4e15718..0715aa48f8 100644 --- a/sys/net/i4b/capi/capi_msgs.c +++ b/sys/net/i4b/capi/capi_msgs.c @@ -25,7 +25,7 @@ * capi/capi_msgs.c The CAPI i4b message handlers. * * $FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.1.2.2 2001/12/10 10:28:25 hm Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ #include "use_i4bcapi.h" @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../include/i4b_l3l4.h" #include "../include/i4b_mbuf.h" diff --git a/sys/net/i4b/capi/iavc/iavc_card.c b/sys/net/i4b/capi/iavc/iavc_card.c index 89f8c96d55..6990c0cd33 100644 --- a/sys/net/i4b/capi/iavc/iavc_card.c +++ b/sys/net/i4b/capi/iavc/iavc_card.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' card specific support routines. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ */ #include "use_iavc.h" @@ -49,9 +49,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../../include/i4b_global.h" #include "../../include/i4b_l3l4.h" diff --git a/sys/net/i4b/capi/iavc/iavc_isa.c b/sys/net/i4b/capi/iavc/iavc_isa.c index cdeb939a28..fc58731dd0 100644 --- a/sys/net/i4b/capi/iavc/iavc_isa.c +++ b/sys/net/i4b/capi/iavc/iavc_isa.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ */ #include "use_iavc.h" @@ -48,9 +48,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../../include/i4b_global.h" #include "../../include/i4b_l3l4.h" diff --git a/sys/net/i4b/capi/iavc/iavc_lli.c b/sys/net/i4b/capi/iavc/iavc_lli.c index f9e36d300b..9f639a805e 100644 --- a/sys/net/i4b/capi/iavc/iavc_lli.c +++ b/sys/net/i4b/capi/iavc/iavc_lli.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' Low Level Interface. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.2.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ */ #include "use_iavc.h" @@ -51,9 +51,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../../include/i4b_global.h" #include "../../include/i4b_l3l4.h" diff --git a/sys/net/i4b/capi/iavc/iavc_pci.c b/sys/net/i4b/capi/iavc/iavc_pci.c index c187a85e71..b7e2c3341a 100644 --- a/sys/net/i4b/capi/iavc/iavc_pci.c +++ b/sys/net/i4b/capi/iavc/iavc_pci.c @@ -26,7 +26,7 @@ * The AVM ISDN controllers' PCI bus attachment handling. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ */ #include "use_iavc.h" @@ -54,9 +54,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../../include/i4b_global.h" #include "../../include/i4b_l3l4.h" diff --git a/sys/net/i4b/driver/i4b_isppp.c b/sys/net/i4b/driver/i4b_isppp.c index 294f1b6cd3..7a399d7932 100644 --- a/sys/net/i4b/driver/i4b_isppp.c +++ b/sys/net/i4b/driver/i4b_isppp.c @@ -37,7 +37,7 @@ * $Id: i4b_isppp.c,v 1.44 2000/08/31 07:07:26 hm Exp $ * * $FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.7.2.3 2003/02/06 14:50:53 gj Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Thu Aug 31 09:02:27 2000] * @@ -65,7 +65,7 @@ #include #include -#include +#include #if defined(__FreeBSD_version) && __FreeBSD_version >= 400008 diff --git a/sys/net/i4b/layer1/i4b_l1dmux.c b/sys/net/i4b/layer1/i4b_l1dmux.c index e7d763032f..1d4e70a7ae 100644 --- a/sys/net/i4b/layer1/i4b_l1dmux.c +++ b/sys/net/i4b/layer1/i4b_l1dmux.c @@ -28,7 +28,7 @@ * -------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.3.2.2 2002/04/25 12:29:55 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.5 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 10 16:43:24 2001] * @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "i4b_l1.h" diff --git a/sys/net/i4b/layer1/i4b_l1lib.c b/sys/net/i4b/layer1/i4b_l1lib.c index db2f69d42c..461ab1076e 100644 --- a/sys/net/i4b/layer1/i4b_l1lib.c +++ b/sys/net/i4b/layer1/i4b_l1lib.c @@ -30,7 +30,7 @@ * $Id: i4b_l1lib.c,v 1.3 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.3.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.5 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Mon May 29 15:24:21 2000] * @@ -40,8 +40,8 @@ #include -#include -#include +#include +#include #include "i4b_l1.h" diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c index 858e4f16ab..8132f50778 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c @@ -30,7 +30,7 @@ * $Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.5 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Mon May 29 15:22:52 2000] * @@ -51,9 +51,9 @@ #include -#include -#include -#include +#include +#include +#include #include "../i4b_l1.h" diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c index 8d51d6127a..f58f74faee 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c @@ -30,7 +30,7 @@ * $Id: i4b_ifpi_l1.c,v 1.4 2000/06/02 16:14:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Fri Jun 2 14:54:30 2000] * @@ -49,9 +49,9 @@ #include -#include -#include -#include +#include +#include +#include #include "../isic/i4b_isic.h" #include "../isic/i4b_isac.h" diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c index 865bfc8da2..ac84e4a219 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c @@ -30,7 +30,7 @@ * $Id: i4b_ifpi_l1fsm.c,v 1.4 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Mon May 29 15:23:15 2000] * @@ -49,9 +49,9 @@ #include -#include -#include -#include +#include +#include +#include #include "../isic/i4b_isic.h" #include "../i4b_l1.h" diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c index 9773b3006b..21f98e60b5 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c @@ -36,7 +36,7 @@ * $Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.6.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.5 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Fri Jan 12 17:01:26 2001] * @@ -63,9 +63,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../../include/i4b_global.h" #include "../../include/i4b_mbuf.h" diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c index 9ae6816ef1..b979176fd5 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c @@ -31,7 +31,7 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.5 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Mon May 29 15:22:52 2000] * @@ -52,9 +52,9 @@ #include -#include -#include -#include +#include +#include +#include #include "../i4b_l1.h" #include "../isic/i4b_isic.h" diff --git a/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c index 6fa00ad7fd..18ac49b3cc 100644 --- a/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c +++ b/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c @@ -41,7 +41,7 @@ * Keil. * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:06:30 2001] * @@ -57,7 +57,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include "i4b_ipac.h" diff --git a/sys/net/i4b/layer1/isic/i4b_diva.c b/sys/net/i4b/layer1/isic/i4b_diva.c index b4e4c4c4cc..64e2f8a0c9 100644 --- a/sys/net/i4b/layer1/isic/i4b_diva.c +++ b/sys/net/i4b/layer1/isic/i4b_diva.c @@ -28,7 +28,7 @@ * -------------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.1.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Fri Jan 26 13:57:10 2001] * @@ -45,7 +45,7 @@ #include -#include +#include #include "i4b_isic.h" #include "i4b_ipac.h" diff --git a/sys/net/i4b/layer1/isic/i4b_drn_ngo.c b/sys/net/i4b/layer1/isic/i4b_drn_ngo.c index 53c73343e1..b9873fe33c 100644 --- a/sys/net/i4b/layer1/isic/i4b_drn_ngo.c +++ b/sys/net/i4b/layer1/isic/i4b_drn_ngo.c @@ -28,7 +28,7 @@ * -------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:07:44 2001] * @@ -44,7 +44,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include "i4b_hscx.h" diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c index 7afae1bbc6..4f799265cb 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c @@ -28,7 +28,7 @@ * ================================================================ * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.5.2.2 2001/10/24 14:17:20 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Oct 24 16:15:26 2001] * @@ -44,7 +44,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include "i4b_hscx.h" diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c index d09db00201..89db945707 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c @@ -28,7 +28,7 @@ * ===================================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:03 2001] * @@ -44,7 +44,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include "i4b_hscx.h" diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c index a8db972ac0..4644cacfe5 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c @@ -28,7 +28,7 @@ * ================================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.6.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:28 2001] * @@ -56,7 +56,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include "i4b_ipac.h" diff --git a/sys/net/i4b/layer1/isic/i4b_isic_isa.c b/sys/net/i4b/layer1/isic/i4b_isic_isa.c index f553359702..f82325040a 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic_isa.c +++ b/sys/net/i4b/layer1/isic/i4b_isic_isa.c @@ -28,7 +28,7 @@ * ================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:30:19 2001] * @@ -45,7 +45,7 @@ #include #include -#include +#include #include "i4b_isic.h" diff --git a/sys/net/i4b/layer1/isic/i4b_isic_pnp.c b/sys/net/i4b/layer1/isic/i4b_isic_pnp.c index 26c0c02c1b..106d250400 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic_pnp.c +++ b/sys/net/i4b/layer1/isic/i4b_isic_pnp.c @@ -38,7 +38,7 @@ * -------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.5.2.2 2001/12/10 12:18:11 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Fri Jan 26 14:01:04 2001] * @@ -55,7 +55,7 @@ #include #include -#include +#include #include "i4b_isic.h" #include diff --git a/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c index f8f667b6c8..9d23bfa408 100644 --- a/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c +++ b/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c @@ -37,7 +37,7 @@ * In case of trouble please contact Udo Schweigert * $FreeBSD: src/sys/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.4 2003/08/07 21:54:31 dillon Exp $ * * last edit-date: [Wed Jan 24 09:13:25 2001] * @@ -54,7 +54,7 @@ #include -#include +#include #include "i4b_isic.h" #include "i4b_ipac.h" diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index cca8427e69..0b5ccf9bfc 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,6 +1,6 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.1.2.5 2003/02/05 18:42:15 fjoe Exp $ */ -/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.3 2003/08/07 21:54:30 dillon Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -76,8 +76,8 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif MODULE_VERSION(arcnet, 1); diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 6b6cec7b52..f3aaacda2e 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_atmsubr.c,v 1.10.2.1 2001/03/06 00:29:26 obrien Exp $ - * $DragonFly: src/sys/net/if_atmsubr.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/if_atmsubr.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ /* @@ -64,7 +64,7 @@ #include #endif #ifdef NATM -#include +#include #endif #ifndef ETHERTYPE_IPV6 diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 0b7696a87a..bc64c4a0b2 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -32,7 +32,7 @@ * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $ - * $DragonFly: src/sys/net/if_ethersubr.c,v 1.5 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/if_ethersubr.c,v 1.6 2003/08/07 21:54:30 dillon Exp $ */ #include "opt_atalk.h" @@ -73,8 +73,8 @@ #endif #ifdef IPX -#include -#include +#include +#include int (*ef_inputp)(struct ifnet*, struct ether_header *eh, struct mbuf *m); int (*ef_outputp)(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, int *hlen); @@ -89,9 +89,9 @@ int ether_inputdebug = 0; #endif #ifdef NETATALK -#include -#include -#include +#include +#include +#include #define llc_snap_org_code llc_un.type_snap.org_code #define llc_snap_ether_type llc_un.type_snap.ether_type diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index a6853f14fc..e8d0a46569 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -34,7 +34,7 @@ * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $ - * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.4 2003/08/07 21:54:30 dillon Exp $ */ #include "opt_atalk.h" @@ -70,8 +70,8 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif #ifdef NS @@ -84,9 +84,9 @@ #endif #ifdef NETATALK -#include -#include -#include +#include +#include +#include #define llc_snap_org_code llc_un.type_snap.org_code #define llc_snap_ether_type llc_un.type_snap.ether_type diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index b7c51356dd..a89fd186eb 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -32,7 +32,7 @@ * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $ - * $DragonFly: src/sys/net/if_loop.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/if_loop.c,v 1.5 2003/08/07 21:54:30 dillon Exp $ */ /* @@ -65,8 +65,8 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif #ifdef INET6 @@ -83,8 +83,8 @@ #endif #ifdef NETATALK -#include -#include +#include +#include #endif NETATALK int loioctl __P((struct ifnet *, u_long, caddr_t)); diff --git a/sys/net/oldbridge/bridge.c b/sys/net/oldbridge/bridge.c index 18c6ac8659..232f3c2dfc 100644 --- a/sys/net/oldbridge/bridge.c +++ b/sys/net/oldbridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ + * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.5 2003/08/07 21:54:30 dillon Exp $ */ /* @@ -109,8 +109,8 @@ #include /* for struct arpcom */ #include -#include -#include +#include +#include #include "bridge.h" /*--------------------*/ diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c index 2d4ba92f69..cab977c8f5 100644 --- a/sys/net/ppp/if_ppp.c +++ b/sys/net/ppp/if_ppp.c @@ -70,7 +70,7 @@ */ /* $FreeBSD: src/sys/net/if_ppp.c,v 1.67.2.4 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.6 2003/08/07 21:17:30 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.7 2003/08/07 21:54:31 dillon Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -109,8 +109,8 @@ #endif #if IPX -#include -#include +#include +#include #endif #ifdef VJC diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c index f6381e5c28..6e8e19ddfa 100644 --- a/sys/net/sppp/if_spppsubr.c +++ b/sys/net/sppp/if_spppsubr.c @@ -18,7 +18,7 @@ * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $ - * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ #include @@ -86,8 +86,8 @@ #endif #ifdef IPX -#include -#include +#include +#include #endif #ifdef NS diff --git a/sys/netgraph/async/ng_async.c b/sys/netgraph/async/ng_async.c index 15a9b47991..5b57f172d8 100644 --- a/sys/netgraph/async/ng_async.c +++ b/sys/netgraph/async/ng_async.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.6.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $ */ @@ -58,7 +58,7 @@ #include "ng_async.h" #include -#include +#include /* Async decode state */ #define MODE_HUNT 0 diff --git a/sys/netgraph/bridge/ng_bridge.c b/sys/netgraph/bridge/ng_bridge.c index 0825942564..d978b2653d 100644 --- a/sys/netgraph/bridge/ng_bridge.c +++ b/sys/netgraph/bridge/ng_bridge.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.1.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ + * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ /* @@ -72,7 +72,7 @@ #include #include -#include +#include #include #include diff --git a/sys/netgraph/cisco/ng_cisco.c b/sys/netgraph/cisco/ng_cisco.c index 66ce53e2ed..3fcd160484 100644 --- a/sys/netgraph/cisco/ng_cisco.c +++ b/sys/netgraph/cisco/ng_cisco.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.4.2.6 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ + * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $ */ @@ -55,10 +55,10 @@ #include #include -#include +#include -#include -#include +#include +#include #include #include diff --git a/sys/netgraph/iface/ng_iface.c b/sys/netgraph/iface/ng_iface.c index 342ef48ec3..ecec954420 100644 --- a/sys/netgraph/iface/ng_iface.c +++ b/sys/netgraph/iface/ng_iface.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.7.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ + * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $ */ @@ -75,7 +75,7 @@ #include #include #include "ng_iface.h" -#include +#include /* This struct describes one address family */ struct iffam { diff --git a/sys/netgraph/ksocket/ng_ksocket.c b/sys/netgraph/ksocket/ng_ksocket.c index 782ae4e033..cd7becf5e6 100644 --- a/sys/netgraph/ksocket/ng_ksocket.c +++ b/sys/netgraph/ksocket/ng_ksocket.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.5.2.13 2003/04/28 20:41:09 archie Exp $ - * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.5 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $ */ @@ -66,7 +66,7 @@ #include "ng_ksocket.h" #include -#include +#include #define OFFSETOF(s, e) ((char *)&((s *)0)->e - (char *)((s *)0)) #define SADATA_OFFSET (OFFSETOF(struct sockaddr, sa_data)) diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c index d9be5df243..f799a74768 100644 --- a/sys/netgraph/netgraph/ng_base.c +++ b/sys/netgraph/netgraph/ng_base.c @@ -38,7 +38,7 @@ * Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.11.2.17 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.5 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.6 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -63,7 +63,7 @@ #include #include -#include "ng_parse.h" +#include /* List of all nodes */ static LIST_HEAD(, ng_node) nodelist; diff --git a/sys/netgraph/netgraph/ng_parse.c b/sys/netgraph/netgraph/ng_parse.c index 62e4b6db6f..6c16ee9210 100644 --- a/sys/netgraph/netgraph/ng_parse.c +++ b/sys/netgraph/netgraph/ng_parse.c @@ -38,7 +38,7 @@ * * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.3.2.8 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ #include @@ -52,7 +52,7 @@ #include #include -#include "ng_parse.h" +#include /* Compute alignment for primitive integral types */ struct int16_temp { diff --git a/sys/netgraph/ppp/ng_ppp.c b/sys/netgraph/ppp/ng_ppp.c index 921e45e9ab..8d4aec2fe9 100644 --- a/sys/netgraph/ppp/ng_ppp.c +++ b/sys/netgraph/ppp/ng_ppp.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.15.2.10 2003/03/10 17:55:48 archie Exp $ - * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.5 2003/08/07 21:54:32 dillon Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -60,7 +60,7 @@ #include #include #include "ng_ppp.h" -#include +#include #define PROT_VALID(p) (((p) & 0x0101) == 0x0001) #define PROT_COMPRESSABLE(p) (((p) & 0xff00) == 0x0000) diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c index 76d9b56136..7b5a782249 100644 --- a/sys/netinet/if_atm.c +++ b/sys/netinet/if_atm.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/if_atm.c,v 1.8.2.1 2001/12/20 10:30:18 ru Exp $ - * $DragonFly: src/sys/netinet/if_atm.c,v 1.3 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/if_atm.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ /* @@ -62,7 +62,7 @@ #include #ifdef NATM -#include +#include #endif diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 8eea89e422..c2f0d58e0a 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -32,7 +32,7 @@ * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netinet/if_ether.c,v 1.64.2.23 2003/04/11 07:23:15 fjoe Exp $ - * $DragonFly: src/sys/netinet/if_ether.c,v 1.3 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/if_ether.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ /* @@ -62,7 +62,7 @@ #include #ifdef BRIDGE #include -#include +#include #endif #include diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index c9af6c027b..397d63ca2c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -32,7 +32,7 @@ * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.59.2.26 2003/01/24 05:11:33 sam Exp $ - * $DragonFly: src/sys/netinet/in_pcb.c,v 1.6 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/in_pcb.c,v 1.7 2003/08/07 21:54:32 dillon Exp $ */ #include "opt_ipsec.h" @@ -70,7 +70,7 @@ #ifdef IPSEC #include -#include +#include #endif /* IPSEC */ #ifdef FAST_IPSEC diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 4578ee8ebe..20aca8f239 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -32,7 +32,7 @@ * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 * $FreeBSD: src/sys/netinet/in_proto.c,v 1.53.2.6 2003/01/24 05:11:34 sam Exp $ - * $DragonFly: src/sys/netinet/in_proto.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netinet/in_proto.c,v 1.3 2003/08/07 21:54:32 dillon Exp $ */ #include "opt_ipdivert.h" @@ -84,7 +84,7 @@ #endif /* FAST_IPSEC */ #ifdef IPXIP -#include +#include #endif #ifdef NSIP diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 66a65abf2b..96e0ee6231 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,6 +1,6 @@ /* * $NetBSD: ip_gre.c,v 1.21 2002/08/14 00:23:30 itojun Exp $ - * $DragonFly: src/sys/netinet/ip_gre.c,v 1.2 2003/07/23 02:30:22 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_gre.c,v 1.3 2003/08/07 21:54:32 dillon Exp $ * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -82,13 +82,13 @@ #endif #ifdef NETATALK -#include -#include -#include +#include +#include +#include #endif /* Needs IP headers. */ -#include +#include #include diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 4cba1bc6fe..80b4ae2bbc 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -32,7 +32,7 @@ * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.39.2.19 2003/01/24 05:11:34 sam Exp $ - * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.3 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ */ #include "opt_ipsec.h" @@ -61,7 +61,7 @@ #ifdef IPSEC #include -#include +#include #endif #ifdef FAST_IPSEC diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 2e3b9197c6..9c3ee6e0b1 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -32,7 +32,7 @@ * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.52 2003/03/07 07:01:28 silby Exp $ - * $DragonFly: src/sys/netinet/ip_input.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_input.c,v 1.5 2003/08/07 21:54:32 dillon Exp $ */ #define _IP_VHL @@ -84,7 +84,7 @@ #ifdef IPSEC #include -#include +#include #endif #ifdef FAST_IPSEC diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 34582a6fa9..267511328f 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -32,7 +32,7 @@ * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 * $FreeBSD: src/sys/netinet/ip_output.c,v 1.99.2.37 2003/04/15 06:44:45 silby Exp $ - * $DragonFly: src/sys/netinet/ip_output.c,v 1.6 2003/08/07 21:17:33 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_output.c,v 1.7 2003/08/07 21:54:32 dillon Exp $ */ #define _IP_VHL @@ -72,9 +72,9 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); #ifdef IPSEC #include -#include +#include #ifdef IPSEC_DEBUG -#include +#include #else #define KEYDEBUG(lev,arg) #endif diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 67829fcbbb..908ce7f9e5 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -32,7 +32,7 @@ * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.107.2.38 2003/05/21 04:46:41 cjc Exp $ - * $DragonFly: src/sys/netinet/tcp_input.c,v 1.6 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/tcp_input.c,v 1.7 2003/08/07 21:54:32 dillon Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -93,7 +93,7 @@ struct tcphdr tcp_savetcp; #ifdef IPSEC #include #include -#include +#include #endif /*IPSEC*/ #include diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 35424a3921..4ff091cc4a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.5.2.14 2003/02/24 04:02:27 silby Exp $ - * $DragonFly: src/sys/netinet/tcp_syncache.c,v 1.4 2003/06/25 05:22:32 dillon Exp $ + * $DragonFly: src/sys/netinet/tcp_syncache.c,v 1.5 2003/08/07 21:54:32 dillon Exp $ */ #include "opt_inet6.h" @@ -80,7 +80,7 @@ #ifdef INET6 #include #endif -#include +#include #endif /*IPSEC*/ #ifdef FAST_IPSEC diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c index 3c61becdd2..808cad7c66 100644 --- a/sys/netinet6/ah_core.c +++ b/sys/netinet6/ah_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.2.2.5 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ah_core.c,v 1.44 2001/03/12 11:24:39 itojun Exp $ */ /* @@ -82,7 +82,7 @@ #endif #endif #include -#include +#include #include #include #include diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c index 7073323d56..b122407e5b 100644 --- a/sys/netinet6/ah_input.c +++ b/sys/netinet6/ah_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.1.2.6 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_input.c,v 1.3 2003/07/23 02:30:22 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_input.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $ */ /* @@ -80,10 +80,10 @@ #ifdef INET6 #include #endif -#include -#include +#include +#include #ifdef IPSEC_DEBUG -#include +#include #else #define KEYDEBUG(lev,arg) #endif diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c index 67e80ba6a9..3fc919e08d 100644 --- a/sys/netinet6/ah_output.c +++ b/sys/netinet6/ah_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_output.c,v 1.1.2.5 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_output.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_output.c,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ah_output.c,v 1.31 2001/07/26 06:53:15 jinmei Exp $ */ /* @@ -72,8 +72,8 @@ #ifdef INET6 #include #endif -#include -#include +#include +#include #include diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c index 2ab45d56d5..cf2ec15c20 100644 --- a/sys/netinet6/esp_core.c +++ b/sys/netinet6/esp_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.1.2.4 2002/03/26 10:12:29 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_core.c,v 1.3 2003/07/29 12:51:30 hmp Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_core.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: esp_core.c,v 1.50 2000/11/02 12:27:38 itojun Exp $ */ /* @@ -70,8 +70,8 @@ #endif #include #include -#include -#include +#include +#include #include #include #include diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c index e0479f615a..6b7bea9667 100644 --- a/sys/netinet6/esp_input.c +++ b/sys/netinet6/esp_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.1.2.8 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.3 2003/07/23 02:30:22 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */ /* @@ -83,9 +83,9 @@ #ifdef INET6 #include #endif -#include -#include -#include +#include +#include +#include #include diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c index 7cf8357821..08c718f0f7 100644 --- a/sys/netinet6/esp_output.c +++ b/sys/netinet6/esp_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.1.2.4 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_output.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_output.c,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */ /* @@ -75,8 +75,8 @@ #ifdef INET6 #include #endif -#include -#include +#include +#include #include diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e1a3a9eed7..c1b45db43d 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.6.2.13 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.5 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /* @@ -101,7 +101,7 @@ #ifdef IPSEC #include -#include +#include #endif #ifdef FAST_IPSEC diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 3a14a7f9bf..4a5b16b5ed 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.10.2.9 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.8 2003/08/07 21:17:33 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.9 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -110,7 +110,7 @@ #ifdef INET6 #include #endif -#include +#include #endif /* IPSEC */ #ifdef FAST_IPSEC diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 19454cc1da..0355264285 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.4.2.7 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_forward.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_forward.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */ /* @@ -69,7 +69,7 @@ #ifdef INET6 #include #endif -#include +#include #endif /* IPSEC */ #ifdef FAST_IPSEC diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 04eaeb57b1..6122532e6e 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.13.2.18 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.6 2003/08/07 21:17:33 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.7 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ /* @@ -99,7 +99,7 @@ #ifdef INET6 #include #endif -#include +#include #endif /* IPSEC */ #ifdef FAST_IPSEC diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c index 427324c11c..ef5cbba498 100644 --- a/sys/netinet6/ipcomp_input.c +++ b/sys/netinet6/ipcomp_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipcomp_input.c,v 1.1.2.3 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipcomp_input.c,v 1.3 2003/07/23 02:30:22 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ipcomp_input.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ipcomp_input.c,v 1.25 2001/03/01 09:12:09 itojun Exp $ */ /* @@ -74,8 +74,8 @@ #ifdef INET6 #include #endif -#include -#include +#include +#include #include diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c index 7a900decdf..03fcc13eb8 100644 --- a/sys/netinet6/ipcomp_output.c +++ b/sys/netinet6/ipcomp_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipcomp_output.c,v 1.1.2.4 2003/04/29 08:33:50 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipcomp_output.c,v 1.3 2003/07/29 12:51:30 hmp Exp $ */ +/* $DragonFly: src/sys/netinet6/ipcomp_output.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ipcomp_output.c,v 1.25 2002/06/09 14:44:00 itojun Exp $ */ /* @@ -75,8 +75,8 @@ #ifdef INET6 #include #endif -#include -#include +#include +#include #include diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index 4b1beb634b..88449de728 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipsec.c,v 1.3.2.12 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.2 2003/06/17 04:28:52 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -98,9 +98,9 @@ #ifdef INET6 #include #endif -#include -#include -#include +#include +#include +#include #include diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h index 40ea04642c..8c2bc7a973 100644 --- a/sys/netinet6/ipsec.h +++ b/sys/netinet6/ipsec.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipsec.h,v 1.4.2.4 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ipsec.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ipsec.h,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */ /* @@ -44,7 +44,7 @@ #endif #include -#include +#include #ifdef _KERNEL diff --git a/sys/netinet6/ipsec6.h b/sys/netinet6/ipsec6.h index 4ea79491d7..bd128c14f8 100644 --- a/sys/netinet6/ipsec6.h +++ b/sys/netinet6/ipsec6.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipsec6.h,v 1.3.2.2 2001/07/03 11:01:54 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/ipsec6.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ipsec6.h,v 1.3 2003/08/07 21:54:33 dillon Exp $ */ /* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */ /* @@ -39,7 +39,7 @@ #define _NETINET6_IPSEC6_H_ #include -#include +#include #ifdef _KERNEL extern struct ipsecstat ipsec6stat; diff --git a/sys/netproto/atm/ipatm/ipatm_event.c b/sys/netproto/atm/ipatm/ipatm_event.c index 1cbe86d393..cfeb826716 100644 --- a/sys/netproto/atm/ipatm/ipatm_event.c +++ b/sys/netproto/atm/ipatm/ipatm_event.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.4 1999/08/28 00:48:43 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_event.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_event.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm.h" #include "ipatm_var.h" diff --git a/sys/netproto/atm/ipatm/ipatm_if.c b/sys/netproto/atm/ipatm/ipatm_if.c index 7aa187a01a..dfd8caef94 100644 --- a/sys/netproto/atm/ipatm/ipatm_if.c +++ b/sys/netproto/atm/ipatm/ipatm_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.4 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_if.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_if.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm_var.h" #include "ipatm_serv.h" diff --git a/sys/netproto/atm/ipatm/ipatm_input.c b/sys/netproto/atm/ipatm/ipatm_input.c index 974eab8d58..270f378d56 100644 --- a/sys/netproto/atm/ipatm/ipatm_input.c +++ b/sys/netproto/atm/ipatm/ipatm_input.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.4 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_input.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_input.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm_var.h" diff --git a/sys/netproto/atm/ipatm/ipatm_load.c b/sys/netproto/atm/ipatm/ipatm_load.c index f0db734e0e..6d84781f60 100644 --- a/sys/netproto/atm/ipatm/ipatm_load.c +++ b/sys/netproto/atm/ipatm/ipatm_load.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.6 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_load.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_load.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include "opt_atm.h" #endif -#include +#include #include "ipatm.h" #include "ipatm_var.h" diff --git a/sys/netproto/atm/ipatm/ipatm_output.c b/sys/netproto/atm/ipatm/ipatm_output.c index 86c31322c4..5e79378169 100644 --- a/sys/netproto/atm/ipatm/ipatm_output.c +++ b/sys/netproto/atm/ipatm/ipatm_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.4.2.1 2000/06/02 22:39:08 archie Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_output.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_output.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm_var.h" #include "ipatm_serv.h" diff --git a/sys/netproto/atm/ipatm/ipatm_usrreq.c b/sys/netproto/atm/ipatm/ipatm_usrreq.c index bfba4f7ec4..830e22c6e9 100644 --- a/sys/netproto/atm/ipatm/ipatm_usrreq.c +++ b/sys/netproto/atm/ipatm/ipatm_usrreq.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.5.2.1 2003/02/15 09:25:13 phk Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_usrreq.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_usrreq.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm_var.h" #include "ipatm_serv.h" diff --git a/sys/netproto/atm/ipatm/ipatm_vcm.c b/sys/netproto/atm/ipatm/ipatm_vcm.c index 9641954287..5f33b029b6 100644 --- a/sys/netproto/atm/ipatm/ipatm_vcm.c +++ b/sys/netproto/atm/ipatm/ipatm_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.4 1999/08/28 00:48:45 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_vcm.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_vcm.c,v 1.4 2003/08/07 21:54:33 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "ipatm.h" #include "ipatm_var.h" diff --git a/sys/netproto/atm/sigpvc/sigpvc_if.c b/sys/netproto/atm/sigpvc/sigpvc_if.c index c51c79f1e1..4b6ca12a51 100644 --- a/sys/netproto/atm/sigpvc/sigpvc_if.c +++ b/sys/netproto/atm/sigpvc/sigpvc_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.7 2000/01/17 20:49:46 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -40,7 +40,7 @@ #include "opt_atm.h" #endif -#include +#include #include "sigpvc_var.h" diff --git a/sys/netproto/atm/sigpvc/sigpvc_subr.c b/sys/netproto/atm/sigpvc/sigpvc_subr.c index 4d937d999d..0310489f0a 100644 --- a/sys/netproto/atm/sigpvc/sigpvc_subr.c +++ b/sys/netproto/atm/sigpvc/sigpvc_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.4 2000/01/17 20:49:46 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_subr.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sigpvc_var.h" diff --git a/sys/netproto/atm/spans/spans_arp.c b/sys/netproto/atm/spans/spans_arp.c index 65c0dd43e5..604480a2ab 100644 --- a/sys/netproto/atm/spans/spans_arp.c +++ b/sys/netproto/atm/spans/spans_arp.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.7 2000/01/15 20:34:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_arp.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_arp.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "spans_xdr.h" #include "spans_var.h" #include "spans_cls.h" diff --git a/sys/netproto/atm/spans/spans_cls.c b/sys/netproto/atm/spans/spans_cls.c index 2bf59d5cb4..1fc27c6cab 100644 --- a/sys/netproto/atm/spans/spans_cls.c +++ b/sys/netproto/atm/spans/spans_cls.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.6 1999/08/28 00:48:49 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_cls.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_cls.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "spans_xdr.h" #include "spans_var.h" #include "spans_cls.h" diff --git a/sys/netproto/atm/spans/spans_if.c b/sys/netproto/atm/spans/spans_if.c index fe1866ebc4..9d5217d5d8 100644 --- a/sys/netproto/atm/spans/spans_if.c +++ b/sys/netproto/atm/spans/spans_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.6 1999/08/28 00:48:49 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -40,7 +40,7 @@ #include "opt_atm.h" #endif -#include +#include #include "spans_xdr.h" #include "spans_var.h" diff --git a/sys/netproto/atm/spans/spans_kxdr.c b/sys/netproto/atm/spans/spans_kxdr.c index dc74627c72..c4142f8aea 100644 --- a/sys/netproto/atm/spans/spans_kxdr.c +++ b/sys/netproto/atm/spans/spans_kxdr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_kxdr.c,v 1.3 1999/08/28 00:48:50 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_kxdr.c,v 1.3 2003/07/26 20:36:58 rob Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_kxdr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include /* * This file contains code that has been copied and/or modified from diff --git a/sys/netproto/atm/spans/spans_msg.c b/sys/netproto/atm/spans/spans_msg.c index 72d636301d..3333eabfd0 100644 --- a/sys/netproto/atm/spans/spans_msg.c +++ b/sys/netproto/atm/spans/spans_msg.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.5 1999/08/28 00:48:50 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_msg.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_msg.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include #include "spans_xdr.h" diff --git a/sys/netproto/atm/spans/spans_print.c b/sys/netproto/atm/spans/spans_print.c index fdb7a30180..bdb4dc1adc 100644 --- a/sys/netproto/atm/spans/spans_print.c +++ b/sys/netproto/atm/spans/spans_print.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.6 1999/08/28 00:48:50 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_print.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_print.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "spans_xdr.h" #include "spans_var.h" diff --git a/sys/netproto/atm/spans/spans_proto.c b/sys/netproto/atm/spans/spans_proto.c index 105c385eeb..7641ad601c 100644 --- a/sys/netproto/atm/spans/spans_proto.c +++ b/sys/netproto/atm/spans/spans_proto.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.4 1999/08/28 00:48:51 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_proto.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_proto.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "spans_xdr.h" #include "spans_var.h" diff --git a/sys/netproto/atm/spans/spans_subr.c b/sys/netproto/atm/spans/spans_subr.c index afe3c54bd2..3427c83c81 100644 --- a/sys/netproto/atm/spans/spans_subr.c +++ b/sys/netproto/atm/spans/spans_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.4 1999/08/28 00:48:52 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "spans_xdr.h" #include "spans_var.h" diff --git a/sys/netproto/atm/spans/spans_util.c b/sys/netproto/atm/spans/spans_util.c index 043180cb37..273f9f9463 100644 --- a/sys/netproto/atm/spans/spans_util.c +++ b/sys/netproto/atm/spans/spans_util.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.5 1999/08/29 10:28:10 bde Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_util.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_util.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "spans_xdr.h" #include "spans_var.h" diff --git a/sys/netproto/atm/uni/q2110_sigaa.c b/sys/netproto/atm/uni/q2110_sigaa.c index b2615b95d5..03e9d9e879 100644 --- a/sys/netproto/atm/uni/q2110_sigaa.c +++ b/sys/netproto/atm/uni/q2110_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.4 2000/01/17 20:49:48 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigaa.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/q2110_sigcpcs.c b/sys/netproto/atm/uni/q2110_sigcpcs.c index c3b5e9ea93..8a9f6a9e14 100644 --- a/sys/netproto/atm/uni/q2110_sigcpcs.c +++ b/sys/netproto/atm/uni/q2110_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigcpcs.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/q2110_subr.c b/sys/netproto/atm/uni/q2110_subr.c index def56a7622..cb394b75c6 100644 --- a/sys/netproto/atm/uni/q2110_subr.c +++ b/sys/netproto/atm/uni/q2110_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/qsaal1_sigaa.c b/sys/netproto/atm/uni/qsaal1_sigaa.c index 8de259bcca..5d1e5cadfd 100644 --- a/sys/netproto/atm/uni/qsaal1_sigaa.c +++ b/sys/netproto/atm/uni/qsaal1_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigaa.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/qsaal1_sigcpcs.c b/sys/netproto/atm/uni/qsaal1_sigcpcs.c index e169c73214..819e877910 100644 --- a/sys/netproto/atm/uni/qsaal1_sigcpcs.c +++ b/sys/netproto/atm/uni/qsaal1_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigcpcs.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/qsaal1_subr.c b/sys/netproto/atm/uni/qsaal1_subr.c index 66034f7f85..0a79ef388d 100644 --- a/sys/netproto/atm/uni/qsaal1_subr.c +++ b/sys/netproto/atm/uni/qsaal1_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.4 2000/01/17 20:49:50 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscf_uni.c b/sys/netproto/atm/uni/sscf_uni.c index f985d1573f..2d6ac9cf7b 100644 --- a/sys/netproto/atm/uni/sscf_uni.c +++ b/sys/netproto/atm/uni/sscf_uni.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.7.2.1 2001/09/30 22:54:35 kris Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "uni.h" #include "sscf_uni_var.h" diff --git a/sys/netproto/atm/uni/sscf_uni_lower.c b/sys/netproto/atm/uni/sscf_uni_lower.c index 0f414e7cf1..6035bf91a1 100644 --- a/sys/netproto/atm/uni/sscf_uni_lower.c +++ b/sys/netproto/atm/uni/sscf_uni_lower.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.4 1999/08/28 00:48:56 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_lower.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_lower.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "uni.h" #include "sscop.h" diff --git a/sys/netproto/atm/uni/sscf_uni_upper.c b/sys/netproto/atm/uni/sscf_uni_upper.c index 651c6aecb6..f870fcce3f 100644 --- a/sys/netproto/atm/uni/sscf_uni_upper.c +++ b/sys/netproto/atm/uni/sscf_uni_upper.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.5 2000/01/17 20:49:50 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_upper.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_upper.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "uni.h" #include "sscop.h" diff --git a/sys/netproto/atm/uni/sscop.c b/sys/netproto/atm/uni/sscop.c index fc81f4d3a1..ecdf01a88c 100644 --- a/sys/netproto/atm/uni/sscop.c +++ b/sys/netproto/atm/uni/sscop.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop.c,v 1.6.2.1 2001/09/30 22:54:35 kris Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_lower.c b/sys/netproto/atm/uni/sscop_lower.c index 61502dea27..129b49b758 100644 --- a/sys/netproto/atm/uni/sscop_lower.c +++ b/sys/netproto/atm/uni/sscop_lower.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.5 2000/01/17 20:49:51 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_lower.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_lower.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_pdu.c b/sys/netproto/atm/uni/sscop_pdu.c index 0a8f9dfffd..26800cf192 100644 --- a/sys/netproto/atm/uni/sscop_pdu.c +++ b/sys/netproto/atm/uni/sscop_pdu.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.5 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_pdu.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_pdu.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_sigaa.c b/sys/netproto/atm/uni/sscop_sigaa.c index e372cae7a3..d4ba1253bd 100644 --- a/sys/netproto/atm/uni/sscop_sigaa.c +++ b/sys/netproto/atm/uni/sscop_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.4 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigaa.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_sigcpcs.c b/sys/netproto/atm/uni/sscop_sigcpcs.c index 78ac710012..48bb3cd66d 100644 --- a/sys/netproto/atm/uni/sscop_sigcpcs.c +++ b/sys/netproto/atm/uni/sscop_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.4 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigcpcs.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_subr.c b/sys/netproto/atm/uni/sscop_subr.c index 1eb8f849f9..c052585f38 100644 --- a/sys/netproto/atm/uni/sscop_subr.c +++ b/sys/netproto/atm/uni/sscop_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.6 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_timer.c b/sys/netproto/atm/uni/sscop_timer.c index 9e83a6023e..60f479b138 100644 --- a/sys/netproto/atm/uni/sscop_timer.c +++ b/sys/netproto/atm/uni/sscop_timer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.6 2000/01/17 20:49:53 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_timer.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_timer.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/sscop_upper.c b/sys/netproto/atm/uni/sscop_upper.c index cf1bf9bb8d..43f3175c40 100644 --- a/sys/netproto/atm/uni/sscop_upper.c +++ b/sys/netproto/atm/uni/sscop_upper.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.5 2000/01/17 20:49:54 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_upper.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_upper.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "sscop.h" #include "sscop_misc.h" diff --git a/sys/netproto/atm/uni/uni_load.c b/sys/netproto/atm/uni/uni_load.c index f4a13228b6..efbdcbafa6 100644 --- a/sys/netproto/atm/uni/uni_load.c +++ b/sys/netproto/atm/uni/uni_load.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uni_load.c,v 1.4 2000/01/17 20:49:54 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uni_load.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uni_load.c,v 1.3 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include "opt_atm.h" #endif -#include +#include /* * External functions diff --git a/sys/netproto/atm/uni/uniarp.c b/sys/netproto/atm/uni/uniarp.c index 823f07e921..57509bf370 100644 --- a/sys/netproto/atm/uni/uniarp.c +++ b/sys/netproto/atm/uni/uniarp.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.8 2000/01/15 20:46:07 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "unisig_var.h" #include "uniip_var.h" diff --git a/sys/netproto/atm/uni/uniarp_cache.c b/sys/netproto/atm/uni/uniarp_cache.c index 1b3153421d..2c554cd383 100644 --- a/sys/netproto/atm/uni/uniarp_cache.c +++ b/sys/netproto/atm/uni/uniarp_cache.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.4 1999/08/28 00:49:02 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_cache.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_cache.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "unisig_var.h" #include "uniip_var.h" diff --git a/sys/netproto/atm/uni/uniarp_input.c b/sys/netproto/atm/uni/uniarp_input.c index 6ac698a687..ff265085b0 100644 --- a/sys/netproto/atm/uni/uniarp_input.c +++ b/sys/netproto/atm/uni/uniarp_input.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.6 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_input.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_input.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" /* diff --git a/sys/netproto/atm/uni/uniarp_output.c b/sys/netproto/atm/uni/uniarp_output.c index 03e4f6a38c..ca96960691 100644 --- a/sys/netproto/atm/uni/uniarp_output.c +++ b/sys/netproto/atm/uni/uniarp_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.3 1999/08/28 00:49:03 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_output.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_output.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" /* diff --git a/sys/netproto/atm/uni/uniarp_timer.c b/sys/netproto/atm/uni/uniarp_timer.c index 386323e1e2..719b335e8c 100644 --- a/sys/netproto/atm/uni/uniarp_timer.c +++ b/sys/netproto/atm/uni/uniarp_timer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.4 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_timer.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_timer.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" /* diff --git a/sys/netproto/atm/uni/uniarp_vcm.c b/sys/netproto/atm/uni/uniarp_vcm.c index f19efe9958..32aa03a4bd 100644 --- a/sys/netproto/atm/uni/uniarp_vcm.c +++ b/sys/netproto/atm/uni/uniarp_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.5 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_vcm.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_vcm.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" /* diff --git a/sys/netproto/atm/uni/uniip.c b/sys/netproto/atm/uni/uniip.c index 7bd0ec7d7c..f8f4d5bddf 100644 --- a/sys/netproto/atm/uni/uniip.c +++ b/sys/netproto/atm/uni/uniip.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniip.c,v 1.4 1999/08/28 00:49:03 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniip.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniip.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" /* diff --git a/sys/netproto/atm/uni/unisig_decode.c b/sys/netproto/atm/uni/unisig_decode.c index e20a1e9e9f..854782aa9d 100644 --- a/sys/netproto/atm/uni/unisig_decode.c +++ b/sys/netproto/atm/uni/unisig_decode.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.5 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_decode.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_decode.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_encode.c b/sys/netproto/atm/uni/unisig_encode.c index 732558e9d2..574b5b7368 100644 --- a/sys/netproto/atm/uni/unisig_encode.c +++ b/sys/netproto/atm/uni/unisig_encode.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.5 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_encode.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_encode.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_if.c b/sys/netproto/atm/uni/unisig_if.c index 6fc653fcb0..74b81e2e4b 100644 --- a/sys/netproto/atm/uni/unisig_if.c +++ b/sys/netproto/atm/uni/unisig_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.8 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,10 +35,10 @@ * */ -#include +#include -#include -#include +#include +#include #include "uniip_var.h" #include "unisig.h" diff --git a/sys/netproto/atm/uni/unisig_mbuf.c b/sys/netproto/atm/uni/unisig_mbuf.c index 96a1b8c83e..20f600025e 100644 --- a/sys/netproto/atm/uni/unisig_mbuf.c +++ b/sys/netproto/atm/uni/unisig_mbuf.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.5 1999/08/28 00:49:05 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_mbuf.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_mbuf.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_mbuf.h" diff --git a/sys/netproto/atm/uni/unisig_msg.c b/sys/netproto/atm/uni/unisig_msg.c index 49fae8650c..43cab0193b 100644 --- a/sys/netproto/atm/uni/unisig_msg.c +++ b/sys/netproto/atm/uni/unisig_msg.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.6 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_msg.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_msg.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_print.c b/sys/netproto/atm/uni/unisig_print.c index 72ea432d65..6dc6da9f4c 100644 --- a/sys/netproto/atm/uni/unisig_print.c +++ b/sys/netproto/atm/uni/unisig_print.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.4 2000/01/17 20:49:57 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_print.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_print.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_proto.c b/sys/netproto/atm/uni/unisig_proto.c index e0eda6e545..f099225d92 100644 --- a/sys/netproto/atm/uni/unisig_proto.c +++ b/sys/netproto/atm/uni/unisig_proto.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.5 2000/01/17 20:49:57 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_proto.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_proto.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" diff --git a/sys/netproto/atm/uni/unisig_sigmgr_state.c b/sys/netproto/atm/uni/unisig_sigmgr_state.c index c8d7aa62fe..03946f6257 100644 --- a/sys/netproto/atm/uni/unisig_sigmgr_state.c +++ b/sys/netproto/atm/uni/unisig_sigmgr_state.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.6 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_sigmgr_state.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_sigmgr_state.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "uni.h" #include "unisig.h" diff --git a/sys/netproto/atm/uni/unisig_subr.c b/sys/netproto/atm/uni/unisig_subr.c index 07c432618a..103074c103 100644 --- a/sys/netproto/atm/uni/unisig_subr.c +++ b/sys/netproto/atm/uni/unisig_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.7 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_subr.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_subr.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_util.c b/sys/netproto/atm/uni/unisig_util.c index 46b9a72b3a..565cf4c27e 100644 --- a/sys/netproto/atm/uni/unisig_util.c +++ b/sys/netproto/atm/uni/unisig_util.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.6 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_util.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_util.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/atm/uni/unisig_vc_state.c b/sys/netproto/atm/uni/unisig_vc_state.c index 67ed8cac19..8fe67ee79a 100644 --- a/sys/netproto/atm/uni/unisig_vc_state.c +++ b/sys/netproto/atm/uni/unisig_vc_state.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.6.2.1 2001/07/25 20:53:44 pirzyk Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_vc_state.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_vc_state.c,v 1.4 2003/08/07 21:54:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include #include "unisig_var.h" #include "unisig_msg.h" diff --git a/sys/netproto/ncp/ncp_conn.h b/sys/netproto/ncp/ncp_conn.h index 12d637104d..9495b9c65d 100644 --- a/sys/netproto/ncp/ncp_conn.h +++ b/sys/netproto/ncp/ncp_conn.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_conn.h,v 1.3 1999/12/29 04:46:15 peter Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_conn.h,v 1.3 2003/06/25 03:56:05 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_conn.h,v 1.4 2003/08/07 21:54:35 dillon Exp $ */ #ifndef _NETNCP_NCP_CONN_H_ #define _NETNCP_NCP_CONN_H_ @@ -43,7 +43,7 @@ #ifdef IPX #ifndef _NETIPX_IPX_H_ -#include +#include #endif #endif diff --git a/sys/netproto/ncp/ncp_ncp.c b/sys/netproto/ncp/ncp_ncp.c index 4401fbf9f0..001c49d9ae 100644 --- a/sys/netproto/ncp/ncp_ncp.c +++ b/sys/netproto/ncp/ncp_ncp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.3 1999/10/29 10:21:07 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_ncp.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_ncp.c,v 1.6 2003/08/07 21:54:35 dillon Exp $ * * Core of NCP protocol */ @@ -46,8 +46,8 @@ #include #ifdef IPX -#include -#include +#include +#include #endif #include "ncp.h" diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c index 1af3e500ec..280fb29efd 100644 --- a/sys/netproto/ncp/ncp_sock.c +++ b/sys/netproto/ncp/ncp_sock.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.2 1999/10/12 10:36:59 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.6 2003/08/07 21:17:38 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.7 2003/08/07 21:54:35 dillon Exp $ * * Low level socket routines */ @@ -57,8 +57,8 @@ #include #ifdef IPX -#include -#include +#include +#include #endif #include "ncp.h" diff --git a/sys/netproto/smb/netbios.h b/sys/netproto/smb/netbios.h index 12bfbebe99..76de3e3ef7 100644 --- a/sys/netproto/smb/netbios.h +++ b/sys/netproto/smb/netbios.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/netbios.h,v 1.1.2.2 2002/04/22 04:24:25 bp Exp $ - * $DragonFly: src/sys/netproto/smb/netbios.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/netbios.h,v 1.3 2003/08/07 21:54:35 dillon Exp $ */ #ifndef _NETSMB_NETBIOS_H_ #define _NETSMB_NETBIOS_H_ @@ -43,7 +43,7 @@ #endif #ifndef _NETIPX_IPX_H_ -#include +#include #endif #define AF_NETBIOS AF_NS /* XXX: should go to socket.h */ diff --git a/sys/vfs/nwfs/nwfs.h b/sys/vfs/nwfs/nwfs.h index 2d47c9cc72..5770dee468 100644 --- a/sys/vfs/nwfs/nwfs.h +++ b/sys/vfs/nwfs/nwfs.h @@ -30,13 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs.h,v 1.3 1999/12/29 04:54:56 peter Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs.h,v 1.5 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs.h,v 1.6 2003/08/07 21:54:35 dillon Exp $ */ #ifndef _NWFS_H_ #define _NWFS_H_ -#include +#include #include "nwfs_mount.h" #define NR_OPEN 0 diff --git a/sys/vfs/nwfs/nwfs_io.c b/sys/vfs/nwfs/nwfs_io.c index 65509cadbd..97981c5e85 100644 --- a/sys/vfs/nwfs/nwfs_io.c +++ b/sys/vfs/nwfs/nwfs_io.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_io.c,v 1.6.2.1 2000/10/25 02:11:10 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.7 2003/08/07 21:54:35 dillon Exp $ * */ #include @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "nwfs.h" #include "nwfs_node.h" diff --git a/sys/vfs/nwfs/nwfs_ioctl.c b/sys/vfs/nwfs/nwfs_ioctl.c index a75d394bf0..cfac389e1c 100644 --- a/sys/vfs/nwfs/nwfs_ioctl.c +++ b/sys/vfs/nwfs/nwfs_ioctl.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_ioctl.c,v 1.2.2.1 2001/02/22 09:14:12 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.5 2003/08/07 21:54:35 dillon Exp $ */ #include #include @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "nwfs.h" #include "nwfs_node.h" diff --git a/sys/vfs/nwfs/nwfs_mount.h b/sys/vfs/nwfs/nwfs_mount.h index e927c28528..2b3da9098a 100644 --- a/sys/vfs/nwfs/nwfs_mount.h +++ b/sys/vfs/nwfs/nwfs_mount.h @@ -30,13 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_mount.h,v 1.5.2.1 2000/04/17 08:34:19 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_mount.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_mount.h,v 1.3 2003/08/07 21:54:35 dillon Exp $ */ #ifndef _NWFS_MOUNT_H_ #define _NWFS_MOUNT_H_ #ifndef _NCP_NCP_NLS_H_ -#include +#include #endif #define NWFS_VERMAJ 1 diff --git a/sys/vfs/nwfs/nwfs_node.c b/sys/vfs/nwfs/nwfs_node.c index dd7c5669c9..8eb00936e9 100644 --- a/sys/vfs/nwfs/nwfs_node.c +++ b/sys/vfs/nwfs/nwfs_node.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_node.c,v 1.3.2.8 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.7 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.8 2003/08/07 21:54:35 dillon Exp $ */ #include #include @@ -47,9 +47,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "nwfs.h" #include "nwfs_mount.h" diff --git a/sys/vfs/nwfs/nwfs_subr.c b/sys/vfs/nwfs/nwfs_subr.c index 857da22e8a..ace11d95d0 100644 --- a/sys/vfs/nwfs/nwfs_subr.c +++ b/sys/vfs/nwfs/nwfs_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_subr.c,v 1.2.2.2 2000/10/25 02:11:10 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_subr.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_subr.c,v 1.5 2003/08/07 21:54:35 dillon Exp $ */ #include #include @@ -39,12 +39,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "nwfs.h" #include "nwfs_node.h" diff --git a/sys/vfs/nwfs/nwfs_vfsops.c b/sys/vfs/nwfs/nwfs_vfsops.c index 7e224d48a0..e6e8ef1599 100644 --- a/sys/vfs/nwfs/nwfs_vfsops.c +++ b/sys/vfs/nwfs/nwfs_vfsops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_vfsops.c,v 1.6.2.6 2001/10/25 19:18:54 dillon Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ */ #include "opt_ncp.h" #ifndef NCP @@ -48,11 +48,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "nwfs.h" #include "nwfs_node.h" diff --git a/sys/vfs/nwfs/nwfs_vnops.c b/sys/vfs/nwfs/nwfs_vnops.c index 68ec23b134..ae26ed7961 100644 --- a/sys/vfs/nwfs/nwfs_vnops.c +++ b/sys/vfs/nwfs/nwfs_vnops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_vnops.c,v 1.6.2.3 2001/03/14 11:26:59 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ */ #include #include @@ -47,11 +47,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "nwfs.h" #include "nwfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_io.c b/sys/vfs/smbfs/smbfs_io.c index 1042ba2899..db8947568d 100644 --- a/sys/vfs/smbfs/smbfs_io.c +++ b/sys/vfs/smbfs/smbfs_io.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.3.2.3 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ * */ #include @@ -55,9 +55,9 @@ /* #include */ -#include -#include -#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_node.c b/sys/vfs/smbfs/smbfs_node.c index a6e89855a0..b148ee68aa 100644 --- a/sys/vfs/smbfs/smbfs_node.c +++ b/sys/vfs/smbfs/smbfs_node.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.2.2.3 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ */ #include #include @@ -47,9 +47,9 @@ #include */ #include -#include -#include -#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_smb.c b/sys/vfs/smbfs/smbfs_smb.c index 564c383f6e..642aebba58 100644 --- a/sys/vfs/smbfs/smbfs_smb.c +++ b/sys/vfs/smbfs/smbfs_smb.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.5 2003/08/07 21:54:36 dillon Exp $ */ #include #include @@ -46,10 +46,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_subr.c b/sys/vfs/smbfs/smbfs_subr.c index d10a4a7356..dd97d8fb80 100644 --- a/sys/vfs/smbfs/smbfs_subr.c +++ b/sys/vfs/smbfs/smbfs_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_subr.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_subr.c,v 1.4 2003/08/07 21:54:36 dillon Exp $ */ #include #include @@ -42,11 +42,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_vfsops.c b/sys/vfs/smbfs/smbfs_vfsops.c index 9dbb9e3c9a..9f484e8038 100644 --- a/sys/vfs/smbfs/smbfs_vfsops.c +++ b/sys/vfs/smbfs/smbfs_vfsops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.2.2.5 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -49,10 +49,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" diff --git a/sys/vfs/smbfs/smbfs_vnops.c b/sys/vfs/smbfs/smbfs_vnops.c index 06b4781dcc..67ae575e9e 100644 --- a/sys/vfs/smbfs/smbfs_vnops.c +++ b/sys/vfs/smbfs/smbfs_vnops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.2.2.8 2003/04/04 08:57:23 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.7 2003/08/07 21:54:36 dillon Exp $ */ #include #include @@ -48,9 +48,9 @@ #include -#include -#include -#include +#include +#include +#include #include "smbfs.h" #include "smbfs_node.h" -- 2.41.0