Date: Wed, 5 Mar 2003 12:50:04 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26392 for review Message-ID: <200303052050.h25Ko4An097523@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26392 Change 26392 by jhb@jhb_laptop on 2003/03/05 12:49:54 IFC @26388. Affected files ... .. //depot/projects/smpng/sys/boot/common/help.common#8 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#21 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#6 integrate .. //depot/projects/smpng/sys/conf/NOTES#34 integrate .. //depot/projects/smpng/sys/conf/files#64 integrate .. //depot/projects/smpng/sys/conf/options#45 integrate .. //depot/projects/smpng/sys/conf/options.pc98#24 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#10 integrate .. //depot/projects/smpng/sys/dev/dgb/dgb.c#12 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#24 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#6 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#7 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#13 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#6 integrate .. //depot/projects/smpng/sys/dev/si/si.c#10 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/setjmp.h#6 integrate .. //depot/projects/smpng/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/smpng/sys/kern/Makefile#3 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#79 integrate .. //depot/projects/smpng/sys/kern/tty.c#31 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#20 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#17 integrate .. //depot/projects/smpng/sys/modules/if_gre/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/rc/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/smpng/sys/net/if_ef.c#10 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/smpng/sys/net/if_faith.c#13 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/smpng/sys/net/if_gif.c#16 integrate .. //depot/projects/smpng/sys/net/if_gre.c#7 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#11 integrate .. //depot/projects/smpng/sys/net/if_loop.c#15 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#19 integrate .. //depot/projects/smpng/sys/net/if_sl.c#17 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#13 integrate .. //depot/projects/smpng/sys/net/if_stf.c#19 integrate .. //depot/projects/smpng/sys/net/if_tun.c#22 integrate .. //depot/projects/smpng/sys/net/intrq.c#3 delete .. //depot/projects/smpng/sys/net/intrq.h#4 delete .. //depot/projects/smpng/sys/net/netisr.c#2 integrate .. //depot/projects/smpng/sys/net/netisr.h#5 integrate .. //depot/projects/smpng/sys/net/route.h#10 integrate .. //depot/projects/smpng/sys/net/rtsock.c#25 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#5 integrate .. //depot/projects/smpng/sys/netatalk/at_extern.h#4 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#2 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#7 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#12 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#10 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#5 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#8 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ah_input.c#8 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_var.h#4 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#9 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#3 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#7 integrate .. //depot/projects/smpng/sys/netns/idp.h#2 delete .. //depot/projects/smpng/sys/netns/idp_usrreq.c#7 delete .. //depot/projects/smpng/sys/netns/idp_var.h#2 delete .. //depot/projects/smpng/sys/netns/ns.c#5 delete .. //depot/projects/smpng/sys/netns/ns.h#5 delete .. //depot/projects/smpng/sys/netns/ns_cksum.c#2 delete .. //depot/projects/smpng/sys/netns/ns_error.c#3 delete .. //depot/projects/smpng/sys/netns/ns_error.h#2 delete .. //depot/projects/smpng/sys/netns/ns_if.h#4 delete .. //depot/projects/smpng/sys/netns/ns_input.c#6 delete .. //depot/projects/smpng/sys/netns/ns_ip.c#4 delete .. //depot/projects/smpng/sys/netns/ns_output.c#3 delete .. //depot/projects/smpng/sys/netns/ns_pcb.c#6 delete .. //depot/projects/smpng/sys/netns/ns_pcb.h#2 delete .. //depot/projects/smpng/sys/netns/ns_proto.c#2 delete .. //depot/projects/smpng/sys/netns/sp.h#2 delete .. //depot/projects/smpng/sys/netns/spidp.h#2 delete .. //depot/projects/smpng/sys/netns/spp_debug.c#2 delete .. //depot/projects/smpng/sys/netns/spp_debug.h#2 delete .. //depot/projects/smpng/sys/netns/spp_timer.h#2 delete .. //depot/projects/smpng/sys/netns/spp_usrreq.c#8 delete .. //depot/projects/smpng/sys/netns/spp_var.h#2 delete .. //depot/projects/smpng/sys/netsmb/netbios.h#4 integrate .. //depot/projects/smpng/sys/sys/socket.h#13 integrate .. //depot/projects/smpng/sys/sys/tty.h#9 integrate Differences ... ==== //depot/projects/smpng/sys/boot/common/help.common#8 (text+ko) ==== @@ -234,11 +234,15 @@ cannot be set below the default determined when the kernel was compiled. + set kern.ipc.nsfbufs=<value> NSFBUFS + + Set the number of sendfile buffers to be allocated. This + overrides the value determined when the kernel was compiled. + set kern.vm.kmem.size=<value> VM_KMEM_SIZE Sets the size of kernel memory (bytes). This overrides - completely the value determined when the kernel was - compiled. + the value determined when the kernel was compiled. set machdep.disable_mtrrs=1 ==== //depot/projects/smpng/sys/boot/common/loader.8#21 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.53 2003/03/03 22:53:35 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.54 2003/03/04 23:46:29 seanc Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -444,10 +444,13 @@ determined when the kernel was compiled. Modifies .Va NMBCLUSTERS . +.It Va kern.ipc.nsfbufs +Set the number of sendfile buffers to be allocated. +Modifies +.Va NSFBUFS . .It Va kern.vm.kmem.size Sets the size of kernel memory (bytes). -This overrides completely the value -determined when the kernel was compiled. +This overrides the value determined when the kernel was compiled. Modifies .Va VM_KMEM_SIZE . .It Va kern.maxswzone ==== //depot/projects/smpng/sys/coda/coda_vnops.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.44 2002/09/25 02:33:29 jeff Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.46 2003/03/05 10:23:51 tjr Exp $ * */ @@ -59,6 +59,7 @@ #include <sys/namei.h> #include <sys/proc.h> #include <sys/uio.h> +#include <sys/unistd.h> #include <vm/vm.h> #include <vm/vm_object.h> @@ -138,7 +139,7 @@ { &vop_strategy_desc, coda_strategy }, /* strategy */ { &vop_print_desc, coda_vop_error }, /* print */ { &vop_islocked_desc, coda_islocked }, /* islocked */ - { &vop_pathconf_desc, coda_vop_error }, /* pathconf */ + { &vop_pathconf_desc, coda_pathconf }, /* pathconf */ { &vop_advlock_desc, coda_vop_nop }, /* advlock */ { &vop_lease_desc, coda_vop_nop }, /* lease */ { &vop_poll_desc, (vop_t *) vop_stdpoll }, @@ -798,7 +799,8 @@ return(error); } - error = venus_readlink(vtomi(vp), &cp->c_fid, cred, td->td_proc, &str, &len); + error = venus_readlink(vtomi(vp), &cp->c_fid, cred, + td != NULL ? td->td_proc : NULL, &str, &len); if (!error) { uiop->uio_rw = UIO_READ; @@ -1976,3 +1978,30 @@ return cp; } + +int +coda_pathconf(v) + void *v; +{ + struct vop_pathconf_args *ap; + int error; + int *retval; + + ap = v; + retval = ap->a_retval; + error = 0; + + switch (ap->a_name) { + case _PC_NAME_MAX: + *retval = CODA_MAXNAMLEN; + break; + case _PC_PATH_MAX: + *retval = CODA_MAXPATHLEN; + break; + default: + error = vop_stdpathconf(ap); + break; + } + + return (error); +} ==== //depot/projects/smpng/sys/coda/coda_vnops.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.11 2002/05/16 21:25:34 trhodes Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.12 2003/03/05 13:48:51 tjr Exp $ * */ @@ -78,6 +78,7 @@ int coda_vop_error(void *); int coda_vop_nop(void *); int coda_fbsd_getpages (void *); +int coda_pathconf(void *); int coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, struct ucred *cred, struct thread *td); ==== //depot/projects/smpng/sys/conf/NOTES#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1132 2003/03/02 23:01:41 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1134 2003/03/05 19:24:20 peter Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -356,8 +356,6 @@ # # Protocol families: # Only the INET (Internet) family is officially supported in FreeBSD. -# Source code for the NS (Xerox Network Service) is provided for amusement -# value. # options INET #Internet communications protocols options INET6 #IPv6 communications protocols @@ -387,10 +385,6 @@ options NETATALK #Appletalk communications protocols options NETATALKDEBUG #Appletalk debugging -# These are currently broken but are shipped due to interest. -#options NS #Xerox NS protocols -#options NSIP #XNS over IP - # # SMB/CIFS requester # NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV @@ -1038,6 +1032,9 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 +# Maximum size of a tty or pty input buffer. +options TTYHOG=8193 + ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/smpng/sys/conf/files#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.764 2003/03/02 23:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.766 2003/03/05 19:24:20 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1172,7 +1172,6 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan -net/intrq.c standard net/net_osdep.c standard net/netisr.c standard net/ppp_deflate.c optional ppp_deflate @@ -1422,16 +1421,6 @@ netncp/ncp_rq.c optional ncp netncp/ncp_sock.c optional ncp netncp/ncp_subr.c optional ncp -netns/idp_usrreq.c optional ns -netns/ns.c optional ns -netns/ns_error.c optional ns -netns/ns_input.c optional ns -netns/ns_ip.c optional ns -netns/ns_output.c optional ns -netns/ns_pcb.c optional ns -netns/ns_proto.c optional ns -netns/spp_debug.c optional ns -netns/spp_usrreq.c optional ns netsmb/smb_conn.c optional netsmb netsmb/smb_crypt.c optional netsmb netsmb/smb_dev.c optional netsmb ==== //depot/projects/smpng/sys/conf/options#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.376 2003/03/02 23:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.378 2003/03/05 19:24:20 peter Exp $ # # On the handling of kernel options # @@ -141,6 +141,7 @@ VFS_AIO WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +TTYHOG opt_tty.h # POSIX kernel options _KPOSIX_PRIORITY_SCHEDULING opt_posix.h @@ -352,7 +353,6 @@ LIBMCHAIN NCP opt_ncp.h NETATALK opt_atalk.h -NS opt_ns.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h ==== //depot/projects/smpng/sys/conf/options.pc98#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.158 2003/01/18 08:29:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.159 2003/03/05 18:12:48 jhb Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -29,6 +29,7 @@ PECOFF_DEBUG opt_pecoff.h # i386 SMP options APIC_IO opt_global.h +HTT # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#10 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.32 2003/02/15 06:25:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.33 2003/03/04 23:19:55 jlemon Exp $"; #endif @@ -442,10 +442,8 @@ # if SOLARIS error = (fr_qin(fra->fra_q, m) == 0) ? EINVAL : 0; # else /* SOLARIS */ - if (! IF_HANDOFF(&ipintrq, m, NULL)) + if (! netisr_queue(NETISR_IP, m)) error = ENOBUFS; - else - schednetisr(NETISR_IP); # endif /* SOLARIS */ if (error) fr_authstats.fas_quefail++; ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.75 2003/03/03 16:24:43 phk Exp $ + * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.76 2003/03/05 08:16:28 das Exp $ * * Digiboard driver. * @@ -58,6 +58,7 @@ #include "opt_compat.h" #include "opt_dgb.h" +#include "opt_tty.h" #include "dgb.h" ==== //depot/projects/smpng/sys/dev/en/midway.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/en/midway.c,v 1.34 2003/02/19 05:47:04 imp Exp $ + * $FreeBSD: src/sys/dev/en/midway.c,v 1.35 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -3314,7 +3314,9 @@ printf(" %d cells trashed due almost full buffer\n", sc->ttrash); printf(" %d rx mbuf allocation failures\n", sc->rxmbufout); #ifdef NATM +#if 0 printf(" %d drops at natmintrq\n", natmintrq.ifq_drops); +#endif #ifdef NATM_STAT printf(" natmintr so_rcv: ok/drop cnt: %d/%d, ok/drop bytes: %d/%d\n", natm_sookcnt, natm_sodropcnt, natm_sookbytes, natm_sodropbytes); ==== //depot/projects/smpng/sys/dev/firewire/fwohci.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.42 2003/03/03 04:10:56 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.43 2003/03/05 01:50:57 simokawa Exp $ * */ @@ -1585,7 +1585,6 @@ dbch = &sc->ir[dmach]; ir = &dbch->xferq; - ldesc = dbch->ndesc - 1; if ((ir->flag & FWXFERQ_RUNNING) == 0) { tag = (ir->flag >> 6) & 3; @@ -1609,8 +1608,6 @@ if(err) return err; - s = splfw(); - first = STAILQ_FIRST(&ir->stfree); if (first == NULL) { device_printf(fc->dev, "IR DMA no free chunk\n"); @@ -1618,6 +1615,8 @@ return 0; } + ldesc = dbch->ndesc - 1; + s = splfw(); prev = STAILQ_LAST(&ir->stdma, fw_bulkxfer, link); while ((chunk = STAILQ_FIRST(&ir->stfree)) != NULL) { volatile struct fwohcidb *db; ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.149 2003/02/27 19:41:55 wpaul Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.150 2003/03/05 19:24:21 peter Exp $ */ /* @@ -45,11 +45,6 @@ #include <net/if_dl.h> #include <net/if_media.h> -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #include <net/bpf.h> #include <sys/sockio.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/hea/eni_receive.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.13 2002/11/06 22:58:55 jhb Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.14 2003/03/04 23:19:54 jlemon Exp $ * */ @@ -61,7 +61,7 @@ #include <dev/hea/eni_var.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.13 2002/11/06 22:58:55 jhb Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.14 2003/03/04 23:19:54 jlemon Exp $"); #endif static void eni_recv_stack(void *, KBuffer *); @@ -680,7 +680,6 @@ u_long DMA_Rdptr; u_long dma_wrp; u_long start, stop; - int que = 0; int s; s = splimp(); @@ -802,9 +801,7 @@ /* * Schedule callback */ - if (IF_HANDOFF(&atm_intrq, m, NULL)) { - que++; - } else { + if (! netisr_queue(NETISR_ATM, m)) { eup->eu_stats.eni_st_drv.drv_rv_intrq++; eup->eu_pif.pif_ierrors++; #ifdef DO_LOG @@ -827,13 +824,6 @@ } finish: (void) splx(s); - - /* - * If we found any completed buffers, schedule a call into - * the kernel to process the atm_intrq. - */ - if ( que ) - schednetisr(NETISR_ATM); return; } ==== //depot/projects/smpng/sys/dev/hfa/fore_receive.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.17 2002/11/06 22:58:55 jhb Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.18 2003/03/04 23:19:54 jlemon Exp $ * */ @@ -64,7 +64,7 @@ #include <dev/hfa/fore_include.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.17 2002/11/06 22:58:55 jhb Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.18 2003/03/04 23:19:54 jlemon Exp $"); #endif @@ -479,9 +479,7 @@ /* * Schedule callback */ - if (IF_HANDOFF(&atm_intrq, mhead, NULL)) { - schednetisr(NETISR_ATM); - } else { + if (! netisr_queue(NETISR_ATM, mhead)) { fup->fu_stats->st_drv.drv_rv_ifull++; goto free_ent; } ==== //depot/projects/smpng/sys/dev/iicbus/if_ic.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.16 2003/02/19 05:47:06 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.17 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -314,10 +314,8 @@ top = m_devget(sc->ic_ifbuf + ICHDRLEN, len, 0, &sc->ic_if, 0); - if (top) { - if (IF_HANDOFF(&ipintrq, top, NULL)) - schednetisr(NETISR_IP); - } + if (top) + netisr_dispatch(NETISR_IP, top); break; err: ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.13 2003/03/03 12:15:44 phk Exp $ + * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.14 2003/03/05 08:16:28 das Exp $ */ /* @@ -39,6 +39,8 @@ */ #include "opt_compat.h" +#include "opt_tty.h" + #include <sys/param.h> #include <sys/systm.h> #if defined(COMPAT_43) || defined(COMPAT_SUNOS) ==== //depot/projects/smpng/sys/dev/ppbus/if_plip.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp - * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.27 2003/02/19 05:47:09 imp Exp $ + * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.28 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -520,11 +520,7 @@ if (top) { if (sc->sc_if.if_bpf) lptap(&sc->sc_if, top); - if (! IF_HANDOFF(&ipintrq, top, NULL)) { - lprintf("DROP"); - } else { - schednetisr(NETISR_IP); - } + netisr_queue(NETISR_IP, top); } goto done; } @@ -569,11 +565,7 @@ if (top) { if (sc->sc_if.if_bpf) lptap(&sc->sc_if, top); - if (! IF_HANDOFF(&ipintrq, top, NULL)) { - lprintf("DROP"); - } else { - schednetisr(NETISR_IP); - } + netisr_queue(NETISR_IP, top); } } goto done; ==== //depot/projects/smpng/sys/dev/ray/if_ray.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.61 2003/02/19 05:47:10 imp Exp $ + * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.62 2003/03/05 18:13:19 dmlb Exp $ * */ @@ -476,7 +476,6 @@ * * Do not update these in ray_init_download's parameter setup * - * XXX see the ray_init_download section for stuff to move */ RAY_MAP_CM(sc); bzero(&sc->sc_d, sizeof(struct ray_nw_param)); @@ -836,7 +835,6 @@ * All of the variables in these sets can be updated by the * card or ioctls. * - * XXX see the ray_attach section for stuff to move */ sc->sc_d.np_upd_param = 0; bzero(sc->sc_d.np_bss_id, ETHER_ADDR_LEN); @@ -1174,7 +1172,7 @@ RAY_COM_CHKRUNNING(sc, com, ifp); /* - * XXX Don't do anything if we are not in a managed network + * Don't do anything if we are not in a managed network * * XXX V4 adhoc does not need this, V5 adhoc unknown */ @@ -2614,12 +2612,12 @@ case RAY_ECMD_REJOIN_DONE: RAY_DPRINTF(sc, RAY_DBG_RX, "REJOIN_DONE"); - sc->sc_c.np_havenet = 1; /* XXX Should not be here but in function */ + sc->sc_c.np_havenet = 1; break; case RAY_ECMD_ROAM_START: RAY_DPRINTF(sc, RAY_DBG_RX, "ROAM_START"); - sc->sc_c.np_havenet = 0; /* XXX Should not be here but in function */ + sc->sc_c.np_havenet = 0; break; case RAY_ECMD_JAPAN_CALL_SIGNAL: @@ -3068,11 +3066,11 @@ /* * Runq entry to update a parameter * - * The card and driver are happy for parameters to be updated - * whenever the card is plugged in - * - * XXX the above is a little bit of a lie until _download is sorted out and we - * XXX keep local copies of things + * The card and driver are basically happy for parameters to be updated + * whenever the card is plugged in. However, there may be a couple of + * network hangs whilst the update is performed. Reading parameters back + * straight away may give the wrong answer and some parameters cannot be + * read at all. Local copies should be kept. */ static void ray_upparams(struct ray_softc *sc, struct ray_comq_entry *com) ==== //depot/projects/smpng/sys/dev/rc/rc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/rc/rc.c,v 1.79 2003/03/03 16:24:43 phk Exp $ + * $FreeBSD: src/sys/dev/rc/rc.c,v 1.80 2003/03/05 08:16:28 das Exp $ */ /* @@ -35,6 +35,8 @@ /*#define RCDEBUG*/ +#include "opt_tty.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/si/si.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/si.c,v 1.116 2003/03/03 16:24:44 phk Exp $ + * $FreeBSD: src/sys/dev/si/si.c,v 1.117 2003/03/05 08:16:29 das Exp $ */ #ifndef lint @@ -41,6 +41,7 @@ #include "opt_compat.h" #include "opt_debug_si.h" +#include "opt_tty.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/dev/sn/if_sn.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.24 2003/02/19 05:47:11 imp Exp $ + * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.25 2003/03/05 19:24:21 peter Exp $ */ /* @@ -108,11 +108,6 @@ #include <netinet/ip.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #include <net/bpf.h> #include <net/bpfdesc.h> ==== //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ #include <dev/sound/pci/via82c686.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.21 2003/02/21 01:47:59 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.22 2003/03/05 05:56:18 orion Exp $"); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ @@ -475,8 +475,20 @@ pci_write_config(dev, PCIR_COMMAND, data, 2); data = pci_read_config(dev, PCIR_COMMAND, 2); - pci_write_config(dev, VIA_PCICONF_MISC, - VIA_PCICONF_ACLINKENAB | VIA_PCICONF_ACSGD | VIA_PCICONF_ACNOTRST | VIA_PCICONF_ACVSR, 1); + /* Wake up and reset AC97 if necessary */ + if (!(pci_read_config(dev, VIA_AC97STATUS, 1) & VIA_AC97STATUS_RDY)) { + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_EN | VIA_ACLINK_NRST | VIA_ACLINK_SYNC, 1); + DELAY(1000); + pci_write_config(dev, VIA_ACLINKCTRL, 0, 1); + DELAY(1000); + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_DESIRED, 1); + DELAY(1000); + } + + if (pci_read_config(dev, VIA_ACLINKCTRL, 1) != VIA_ACLINK_DESIRED) { + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_DESIRED, 1); + DELAY(1000); + } via->regid = PCIR_MAPS; via->reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &via->regid, 0, ~0, 1, RF_ACTIVE); @@ -503,7 +515,8 @@ if (!via->codec) goto bad; - mixer_init(dev, ac97_getmixerclass(), via->codec); + if (mixer_init(dev, ac97_getmixerclass(), via->codec)) + goto bad; via->codec_caps = ac97_getextcaps(via->codec); ac97_setextmode(via->codec, ==== //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.4 2002/08/17 16:13:29 orion Exp $ + * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.5 2003/03/05 05:56:18 orion Exp $ */ #ifndef _VIA_H @@ -49,14 +49,17 @@ * ftp://ftp.alsa-project.org/pub/manuals/ad/AD1881_0.pdf (example AC'97 codec) */ -#define VIA_PCICONF_MISC 0x41 -#define VIA_PCICONF_ACLINKENAB 0x80 /* ac link enab */ -#define VIA_PCICONF_ACNOTRST 0x40 /* ~(ac reset) */ -#define VIA_PCICONF_ACSYNC 0x20 /* ac sync */ -#define VIA_PCICONF_ACVSR 0x08 /* var. samp. rate */ -#define VIA_PCICONF_ACSGD 0x04 /* SGD enab */ -#define VIA_PCICONF_ACFM 0x02 /* FM enab */ -#define VIA_PCICONF_ACSB 0x01 /* SB enab */ +#define VIA_AC97STATUS 0x40 +#define VIA_AC97STATUS_RDY 0x01 +#define VIA_ACLINKCTRL 0x41 +#define VIA_ACLINK_EN 0x80 /* ac link enab */ +#define VIA_ACLINK_NRST 0x40 /* ~(ac reset) */ +#define VIA_ACLINK_SYNC 0x20 /* ac sync */ +#define VIA_ACLINK_VSR 0x08 /* var. samp. rate */ +#define VIA_ACLINK_SGD 0x04 /* SGD enab */ +#define VIA_ACLINK_FM 0x02 /* FM enab */ +#define VIA_ACLINK_SB 0x01 /* SB enab */ +#define VIA_ACLINK_DESIRED (VIA_ACLINK_EN|VIA_ACLINK_NRST|VIA_ACLINK_VSR|VIA_ACLINK_SGD) #define VIA_PCICONF_FUNC_EN 0x42 #define VIA_PLAY_STAT 0x00 @@ -84,13 +87,4 @@ #define VIA_CODEC_PRIVALID 0x02000000 #define VIA_CODEC_INDEX(x) ((x)<<16) -#define AC97_REG_EXT_AUDIO_ID 0x28 -#define AC97_CODEC_DOES_VRA 0x0001 -#define AC97_CODEC_DOES_MICVRA 0x0008 -#define AC97_REG_EXT_AUDIO_STAT 0x2A -#define AC97_ENAB_VRA 0x0001 -#define AC97_ENAB_MICVRA 0x0008 -#define AC97_REG_EXT_DAC_RATE 0x2C -#define AC97_REG_EXT_ADC_RATE 0x32 - #endif /* _VIA_H */ ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.28 2003/02/23 20:49:45 green Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.29 2003/03/05 14:48:28 orion Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -59,7 +59,7 @@ KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for root feeder: %s\n", fc->name); @@ -84,7 +84,7 @@ i = 0; while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) { /* printf("adding feeder %s, %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); */ - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for feeder '%s', %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); @@ -137,7 +137,7 @@ struct pcm_feeder *f; int err; - f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_WAITOK | M_ZERO); + f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_NOWAIT | M_ZERO); if (f == NULL) return NULL; ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.9 2003/02/23 20:49:45 green Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.10 2003/03/05 14:48:28 orion Exp $"); MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder"); @@ -209,7 +209,7 @@ static int feed_16to8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } @@ -318,7 +318,7 @@ static int feed_stereotomono8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } @@ -363,7 +363,7 @@ static int feed_stereotomono16_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303052050.h25Ko4An097523>