Date: Sat, 11 Dec 2004 00:28:04 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66797 for review Message-ID: <200412110028.iBB0S4Oh002491@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=66797 Change 66797 by sam@sam_ebb on 2004/12/11 00:27:15 IFC @ 66796 Affected files ... .. //depot/projects/wifi/etc/defaults/pccard.conf#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate .. //depot/projects/wifi/include/string.h#2 integrate .. //depot/projects/wifi/include/unistd.h#3 integrate .. //depot/projects/wifi/lib/libc/string/swab.3#2 integrate .. //depot/projects/wifi/lib/libc/string/swab.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#3 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/wifi/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#3 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#3 integrate .. //depot/projects/wifi/share/man/man4/xe.4#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac.c#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_ioctl.h#2 delete .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#29 integrate .. //depot/projects/wifi/sys/netinet/in_gif.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/wifi/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#6 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#6 integrate .. //depot/projects/wifi/usr.bin/make/var.c#6 integrate .. //depot/projects/wifi/usr.sbin/sendmail/Makefile#3 integrate Differences ... ==== //depot/projects/wifi/etc/defaults/pccard.conf#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.271 2004/12/09 22:27:11 rsm Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2247,7 +2247,14 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison) +# Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (Ethernet part) +card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter" + config 0x27 "xe" ? +# config auto "sio" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Intel EtherExpress PRO/100 Mobile Adapter (16-bit version) card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16" config auto "xe" ? insert /etc/pccard_ether $device start ==== //depot/projects/wifi/gnu/usr.bin/cvs/cvsbug/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.21 2004/09/28 21:19:31 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.22 2004/12/10 18:16:52 kensmith Exp $ MAINTAINER= peter@FreeBSD.org @@ -21,6 +21,7 @@ -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \ -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \ -e "s,@MKTEMP_FUNCTION@,," \ + -e "s,@MKTEMP_SH_FUNCTION@,," \ ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> ==== //depot/projects/wifi/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ + * $FreeBSD: src/include/string.h,v 1.21 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _STRING_H_ @@ -108,8 +108,19 @@ #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ ==== //depot/projects/wifi/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ + * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _UNISTD_H_ @@ -436,7 +436,12 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); ==== //depot/projects/wifi/lib/libc/string/swab.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd June 4, 1993 +.Dd December 10, 2004 .Dt SWAB 3 .Os .Sh NAME @@ -41,9 +41,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In unistd.h .Ft void -.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/wifi/lib/libc/string/swab.c#2 (text+ko) ==== @@ -38,12 +38,12 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $"); -#include <string.h> +#include <unistd.h> void -swab(const void * __restrict from, void * __restrict to, size_t len) +swab(const void * __restrict from, void * __restrict to, ssize_t len) { unsigned long temp; int n; ==== //depot/projects/wifi/lib/libc_r/uthread/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -10,6 +10,7 @@ uthread_acl_set_fd.c \ uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ + uthread_atfork.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ uthread_attr_getdetachstate.c \ ==== //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.84 2004/12/10 03:36:45 grog Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -451,6 +451,13 @@ void *routine_arg; }; +struct pthread_atfork { + TAILQ_ENTRY(pthread_atfork) qe; + void (*prepare)(void); + void (*parent)(void); + void (*child)(void); +}; + struct pthread_attr { int sched_policy; int sched_inherit; @@ -1025,6 +1032,9 @@ ; #endif +SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _atfork_list; +SCLASS pthread_mutex_t _atfork_mutex; + /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default #ifdef GLOBAL_PTHREAD_PRIVATE ==== //depot/projects/wifi/lib/libc_r/uthread/uthread_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $ */ #include <sys/param.h> #include <errno.h> @@ -48,6 +48,7 @@ _fork(void) { struct pthread *curthread = _get_curthread(); + struct pthread_atfork *af; int i, flags, use_deadlist = 0; pid_t ret; pthread_t pthread; @@ -59,9 +60,23 @@ */ _thread_kern_sig_defer(); + _pthread_mutex_lock(&_atfork_mutex); + + /* Run down atfork prepare handlers. */ + TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) { + if (af->prepare != NULL) + af->prepare(); + } + /* Fork a new process: */ if ((ret = __sys_fork()) != 0) { - /* Parent process or error. Nothing to do here. */ + /* Run down atfork parent handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->parent != NULL) + af->parent(); + } + _pthread_mutex_unlock(&_atfork_mutex); + } else { /* Close the pthread kernel pipe: */ __sys_close(_thread_kern_pipe[0]); @@ -207,8 +222,15 @@ } } } + /* Run down atfork child handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->child != NULL) + af->child(); + } + _mutex_reinit(&_atfork_mutex); } + /* * Undefer and handle pending signals, yielding if necessary: */ ==== //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.48 2004/12/10 03:36:45 grog Exp $ */ /* Allocate space for global thread variables here: */ @@ -437,6 +437,8 @@ TAILQ_INIT(&_thread_list); TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); + TAILQ_INIT(&_atfork_list); + _pthread_mutex_init(&_atfork_mutex, NULL); /* Initialise the global signal action structure: */ sigfillset(&act.sa_mask); ==== //depot/projects/wifi/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.159 2004/11/03 21:51:34 ceri Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.160 2004/12/10 02:38:21 csjp Exp $ .\" .Dd October 22, 2004 .Dt IPFW 8 @@ -973,14 +973,10 @@ A .Ar group may be specified by name or number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm jail Ar prisonID Matches all TCP or UDP packets sent by or received for the jail whos prison ID is .Ar prisonID . -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm icmptypes Ar types Matches ICMP packets whose ICMP type is in the list .Ar types . @@ -1305,8 +1301,6 @@ A .Ar user may be matched by name or identification number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm verrevpath For incoming packets, a routing table lookup is done on the packet's source address. @@ -2342,10 +2336,6 @@ .Xr sysctl 8 , .Xr syslogd 8 .Sh BUGS -Lock ordering issues could result in system hard locks if rules which -contain UID, GID or jail ID constraints and used with debug.mpsafenet -set to 1. -.Pp The syntax has grown over the years and sometimes it might be confusing. Unfortunately, backward compatibility prevents cleaning up mistakes made in the definition of the syntax. ==== //depot/projects/wifi/share/man/man4/mac_portacl.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.8 2004/12/09 13:48:33 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd December , 2004 +.Dd December 9, 2004 .Dt MAC_PORTACL 4 .Os .Sh NAME ==== //depot/projects/wifi/share/man/man4/xe.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/xe.4,v 1.7 2004/07/08 12:52:33 ru Exp $ +.\" $FreeBSD: src/share/man/man4/xe.4,v 1.8 2004/12/09 23:13:18 rsm Exp $ .\" .Dd July 4, 2004 .Dt XE 4 @@ -103,6 +103,8 @@ Compaq Netelligent 10/100 PC Card (CPQ-10/100) .It Intel EtherExpress Pro/100 PC Card Mobile Adapter 16 (Pro/100 M16A) +.It +Intel EtherExpress Pro/100 LAN/Modem PC Card Adapter (Pro/100 M16B) .El .Pp Other similar devices using the same hardware may also be supported. ==== //depot/projects/wifi/sys/arm/arm/bcopyinout.S#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.3 2004/11/09 16:47:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.4 2004/12/10 16:49:08 cognet Exp $"); #ifdef __XSCALE__ #include <arm/arm/bcopyinout_xscale.S> #else @@ -80,7 +80,7 @@ /* Quick exit if length is zero */ teq r2, #0 moveq r0, #0 - RETEQ + RETeq SAVE_REGS #ifdef MULTIPROCESSOR ==== //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.12 2004/09/14 03:12:01 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.13 2004/12/10 17:42:47 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -1529,7 +1529,9 @@ pfsync_sendout(sc) struct pfsync_softc *sc; { +#if NBPFILTER > 0 struct ifnet *ifp = &sc->sc_if; +#endif struct mbuf *m; #ifdef __FreeBSD__ ==== //depot/projects/wifi/sys/dev/aac/aac.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.104 2004/11/21 04:03:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.105 2004/12/09 22:20:25 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -57,7 +57,7 @@ #include <machine/resource.h> #include <dev/aac/aacreg.h> -#include <dev/aac/aac_ioctl.h> +#include <sys/aac_ioctl.h> #include <dev/aac/aacvar.h> #include <dev/aac/aac_tables.h> ==== //depot/projects/wifi/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.17 2004/08/12 05:05:06 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.18 2004/12/09 22:20:25 scottl Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -60,7 +60,7 @@ #include <vm/pmap.h> #include <dev/aac/aacreg.h> -#include <dev/aac/aac_ioctl.h> +#include <sys/aac_ioctl.h> #include <dev/aac/aacvar.h> struct aac_cam { ==== //depot/projects/wifi/sys/dev/aac/aac_debug.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.19 2004/06/13 17:57:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.20 2004/12/09 22:20:25 scottl Exp $"); /* * Debugging support. @@ -47,7 +47,7 @@ #include <dev/aac/aac_compat.h> #include <dev/aac/aacreg.h> -#include <dev/aac/aac_ioctl.h> +#include <sys/aac_ioctl.h> #include <dev/aac/aacvar.h> #ifdef AAC_DEBUG ==== //depot/projects/wifi/sys/dev/aac/aac_disk.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.41 2004/08/12 05:05:06 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.42 2004/12/09 22:20:25 scottl Exp $"); #include "opt_aac.h" @@ -50,7 +50,7 @@ #include <sys/rman.h> #include <dev/aac/aacreg.h> -#include <dev/aac/aac_ioctl.h> +#include <sys/aac_ioctl.h> #include <dev/aac/aacvar.h> /* ==== //depot/projects/wifi/sys/dev/aac/aac_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.49 2004/10/21 19:14:32 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.50 2004/12/09 22:20:25 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -55,7 +55,7 @@ #include <dev/pci/pcivar.h> #include <dev/aac/aacreg.h> -#include <dev/aac/aac_ioctl.h> +#include <sys/aac_ioctl.h> #include <dev/aac/aacvar.h> static int aac_pci_probe(device_t dev); ==== //depot/projects/wifi/sys/dev/ctau/if_ct.c#3 (text+ko) ==== @@ -22,17 +22,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.17 2004/12/03 16:57:15 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.18 2004/12/10 05:54:45 rik Exp $"); #include <sys/param.h> - -#if __FreeBSD_version >= 500000 -# define NCTAU 1 -#else -# include "ctau.h" -#endif - -#if NCTAU > 0 #include <sys/proc.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -55,13 +47,7 @@ #include <machine/cpufunc.h> #include <machine/cserial.h> #include <machine/clock.h> -#if __FreeBSD_version < 500000 -# include <i386/isa/isa_device.h> -#endif #include <machine/resource.h> -#if __FreeBSD_version <= 501000 -# include <i386/isa/intr_machdep.h> -#endif #include <dev/cx/machdep.h> #include <dev/ctau/ctddk.h> #include <dev/cx/cronyxfw.h> @@ -73,20 +59,12 @@ # include <dev/ctau/ng_ct.h> #else # include <net/if_types.h> -# if __FreeBSD_version < 500000 -# include "sppp.h" -# if NSPPP <= 0 -# error The device ctau requires sppp or netgraph. -# endif -# endif # include <net/if_sppp.h> # define PP_CISCO IFF_LINK2 -# if __FreeBSD_version < 500000 -# include <bpf.h> -# endif # include <net/bpf.h> -# define NBPFILTER NBPF #endif + +#define NCTAU 1 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */ #ifndef PP_FR @@ -116,10 +94,8 @@ unsigned long phys; void *virt; size_t size; -#if __FreeBSD_version >= 500000 bus_dma_tag_t dmat; bus_dmamap_t mapp; -#endif } ct_dma_mem_t; typedef struct _drv_t { @@ -459,7 +435,6 @@ extern struct cdevsw ct_cdevsw; -#if __FreeBSD_version >= 500000 static void ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -516,29 +491,7 @@ bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); bus_dma_tag_destroy (dmem->dmat); } -#else -static int -ct_bus_dma_mem_alloc (int bnum, int cnum, ct_dma_mem_t *dmem) -{ - dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, - 0x100000, 0x1000000, 16, 0); - if (dmem->virt == NULL) { - if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); - else printf ("ct%d: ", bnum); - printf ("couldn't allocate memory for dma memory\n", unit); - return 0; - } - dmem->phys = vtophys (dmem->virt); - return 1; -} -static void -ct_bus_dma_mem_free (ct_dma_mem_t *dmem) -{ - contigfree (dmem->virt, dmem->size, M_DEVBUF); -} -#endif - /* * The adapter is present, initialize the driver structures. */ @@ -700,21 +653,12 @@ ct_bus_dma_mem_free (&d->dmamem); continue; } -#if __FreeBSD_version >= 500000 NG_NODE_SET_PRIVATE (d->node, d); -#else - d->node->private = d; -#endif sprintf (d->nodename, "%s%d", NG_CT_NODE_TYPE, c->board->num*NCHAN + c->num); if (ng_name_node (d->node, d->nodename)) { printf ("%s: cannot name node\n", d->nodename); -#if __FreeBSD_version >= 500000 NG_NODE_UNREF (d->node); -#else - ng_rmnode (d->node); - ng_unref (d->node); -#endif channel [b->num*NCHAN + c->num] = 0; c->sys = 0; ct_bus_dma_mem_free (&d->dmamem); @@ -722,18 +666,11 @@ } d->queue.ifq_maxlen = IFQ_MAXLEN; d->hi_queue.ifq_maxlen = IFQ_MAXLEN; -#if __FreeBSD_version >= 500000 mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "ct_queue_hi", NULL, MTX_DEF); -#endif #else /*NETGRAPH*/ d->pp.pp_if.if_softc = d; -#if __FreeBSD_version > 501000 if_initname (&d->pp.pp_if, "ct", b->num * NCHAN + c->num); -#else - d->pp.pp_if.if_unit = b->num * NCHAN + c->num; - d->pp.pp_if.if_name = "ct"; -#endif d->pp.pp_if.if_mtu = PP_MTU; d->pp.pp_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST | IFF_NEEDSGIANT; @@ -805,7 +742,6 @@ continue; #ifdef NETGRAPH -#if __FreeBSD_version >= 500000 if (d->node) { ng_rmnode_self (d->node); NG_NODE_UNREF (d->node); @@ -814,14 +750,8 @@ mtx_destroy (&d->queue.ifq_mtx); mtx_destroy (&d->hi_queue.ifq_mtx); #else - ng_rmnode (d->node); - d->node = 0; -#endif -#else -#if __FreeBSD_version >= 410000 && NBPFILTER > 0 /* Detach from the packet filter list of interfaces. */ bpfdetach (&d->pp.pp_if); -#endif /* Detach from the sync PPP list. */ sppp_detach (&d->pp.pp_if); @@ -1001,11 +931,7 @@ return; #ifndef NETGRAPH if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_MTAP (&d->pp.pp_if, m); -#else - bpf_mtap (&d->pp.pp_if, m); -#endif #endif len = m->m_pkthdr.len; if (! m->m_next) @@ -1097,7 +1023,7 @@ { drv_t *d = c->sys; struct mbuf *m; -#if __FreeBSD_version >= 500000 && defined NETGRAPH +#ifdef NETGRAPH int error; #endif @@ -1116,22 +1042,14 @@ printmbuf (m); #ifdef NETGRAPH m->m_pkthdr.rcvif = 0; -#if __FreeBSD_version >= 500000 NG_SEND_DATA_ONLY (error, d->hook, m); #else - ng_queue_data (d->hook, m, 0); -#endif -#else ++d->pp.pp_if.if_ipackets; m->m_pkthdr.rcvif = &d->pp.pp_if; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_TAP (&d->pp.pp_if, data, len); -#else - bpf_tap (&d->pp.pp_if, data, len); -#endif sppp_input (&d->pp.pp_if, m); #endif } @@ -1188,11 +1106,7 @@ } } -#if __FreeBSD_version < 500000 -static int ct_open (dev_t dev, int oflags, int devtype, struct proc *p) -#else static int ct_open (struct cdev *dev, int oflags, int devtype, struct thread *td) -#endif { drv_t *d; @@ -1203,11 +1117,7 @@ return 0; } -#if __FreeBSD_version < 500000 -static int ct_close (dev_t dev, int fflag, int devtype, struct proc *p) -#else static int ct_close (struct cdev *dev, int fflag, int devtype, struct thread *td) -#endif { drv_t *d = channel [minor(dev)]; @@ -1240,11 +1150,7 @@ /* * Process an ioctl request on /dev/cronyx/ctauN. */ -#if __FreeBSD_version < 500000 -static int ct_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) -#else static int ct_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) -#endif { drv_t *d = channel [minor (dev)]; ct_chan_t *c; @@ -1275,11 +1181,7 @@ case SERIAL_SETPROTO: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (d->pp.pp_if.if_flags & IFF_RUNNING) @@ -1307,11 +1209,7 @@ case SERIAL_SETKEEPALIVE: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if ((d->pp.pp_flags & PP_FR) || @@ -1340,11 +1238,7 @@ case SERIAL_SETCFG: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_HDLC) @@ -1420,11 +1314,7 @@ case SERIAL_CLRSTAT: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; c->rintr = 0; @@ -1447,11 +1337,7 @@ case SERIAL_SETBAUD: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1465,11 +1351,7 @@ case SERIAL_SETLOOP: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1485,11 +1367,7 @@ case SERIAL_SETDPLL: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1507,11 +1385,7 @@ case SERIAL_SETNRZI: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1527,11 +1401,7 @@ case SERIAL_SETDEBUG: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; c->debug = *(int*)data; @@ -1551,11 +1421,7 @@ case SERIAL_SETHIGAIN: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1575,11 +1441,7 @@ if (c->mode != M_E1) return EINVAL; /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1600,11 +1462,7 @@ case SERIAL_SETCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1626,11 +1484,7 @@ case SERIAL_SETTIMESLOTS: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1646,11 +1500,7 @@ case SERIAL_SETSUBCHAN: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; s = splimp (); @@ -1674,11 +1524,7 @@ case SERIAL_SETINVCLK: case SERIAL_SETINVTCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ if (error) return error; if (c->mode == M_E1 || c->mode == M_G703) @@ -1690,11 +1536,7 @@ case SERIAL_SETINVRCLK: /* Only for superuser! */ -#if __FreeBSD_version < 500000 - error = suser (p); -#else /* __FreeBSD_version >= 500000 */ error = suser (td); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412110028.iBB0S4Oh002491>