PERFORCE change 65933 for review

Sam Leffler sam at FreeBSD.org
Sat Nov 27 12:01:32 PST 2004 

http://perforce.freebsd.org/chv.cgi?CH=65933

Change 65933 by sam at sam_ebb on 2004/11/27 20:00:31

	IFC @ 65932

Affected files ...

.. //depot/projects/wifi/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/wifi/etc/periodic/security/520.pfdenied#1 branch
.. //depot/projects/wifi/etc/periodic/security/Makefile#2 integrate
.. //depot/projects/wifi/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#2 integrate
.. //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#2 integrate
.. //depot/projects/wifi/lib/libc_r/uthread/uthread_jmp.c#2 integrate
.. //depot/projects/wifi/lib/libc_r/uthread/uthread_stack.c#2 integrate
.. //depot/projects/wifi/lib/libthr/thread/thr_init.c#2 integrate
.. //depot/projects/wifi/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/wifi/lib/libthr/thread/thr_stack.c#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate
.. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/wifi/sbin/gvinum/gvinum.c#2 integrate
.. //depot/projects/wifi/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/wifi/sbin/mount/getmntopts.c#2 integrate
.. //depot/projects/wifi/sbin/mount/mntopts.h#2 integrate
.. //depot/projects/wifi/sbin/mount_ufs/Makefile#1 branch
.. //depot/projects/wifi/sbin/mount_ufs/mount_ufs.c#1 branch
.. //depot/projects/wifi/sbin/swapon/swapon.c#2 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#6 integrate
.. //depot/projects/wifi/share/man/man4/amr.4#3 integrate
.. //depot/projects/wifi/share/man/man4/dc.4#2 integrate
.. //depot/projects/wifi/share/man/man4/em.4#3 integrate
.. //depot/projects/wifi/share/man/man4/fxp.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ixgb.4#4 integrate
.. //depot/projects/wifi/share/man/man4/nge.4#2 integrate
.. //depot/projects/wifi/share/man/man4/re.4#3 integrate
.. //depot/projects/wifi/share/man/man4/rl.4#3 integrate
.. //depot/projects/wifi/share/man/man4/sf.4#2 integrate
.. //depot/projects/wifi/share/man/man4/sis.4#2 integrate
.. //depot/projects/wifi/share/man/man4/snd_ich.4#1 branch
.. //depot/projects/wifi/share/man/man4/ste.4#3 integrate
.. //depot/projects/wifi/share/man/man4/vge.4#2 integrate
.. //depot/projects/wifi/share/man/man4/vr.4#2 integrate
.. //depot/projects/wifi/share/man/man4/witness.4#2 integrate
.. //depot/projects/wifi/share/man/man5/periodic.conf.5#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/db_trace.c#3 integrate
.. //depot/projects/wifi/sys/alpha/alpha/fp_emulate.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/machdep.c#4 integrate
.. //depot/projects/wifi/sys/alpha/alpha/mp_machdep.c#4 integrate
.. //depot/projects/wifi/sys/alpha/alpha/pmap.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/prom.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/sys_machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/trap.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/linux/linux_machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/osf1/osf1_misc.c#2 integrate
.. //depot/projects/wifi/sys/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/db_trace.c#4 integrate
.. //depot/projects/wifi/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/wifi/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#3 integrate
.. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#29 edit
.. //depot/projects/wifi/sys/dev/ath/if_athvar.h#10 edit
.. //depot/projects/wifi/sys/dev/mii/mii.c#3 integrate
.. //depot/projects/wifi/sys/dev/mlx/mlx_disk.c#2 integrate
.. //depot/projects/wifi/sys/dev/mlx/mlxreg.h#2 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/nwfs/nwfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/umapfs/umap_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/wifi/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/vm86.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/wifi/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/wifi/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/wifi/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/wifi/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/kern/imgact_aout.c#3 integrate
.. //depot/projects/wifi/sys/kern/init_main.c#4 integrate
.. //depot/projects/wifi/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/wifi/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/wifi/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/wifi/sys/kern/sys_process.c#2 integrate
.. //depot/projects/wifi/sys/kern/syscalls.c#3 integrate
.. //depot/projects/wifi/sys/kern/syscalls.master#3 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/wifi/sys/modules/if_gif/Makefile#2 integrate
.. //depot/projects/wifi/sys/netinet/tcp.h#3 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/wifi/sys/pc98/i386/machdep.c#5 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/fpu.c#2 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/db_trace.c#3 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/rwindow.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/vm_machdep.c#3 integrate
.. //depot/projects/wifi/sys/sys/mount.h#3 integrate
.. //depot/projects/wifi/sys/sys/user.h#3 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/vm/uma_core.c#4 edit
.. //depot/projects/wifi/sys/vm/uma_int.h#2 integrate
.. //depot/projects/wifi/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/wifi/sys/vm/vm_glue.c#5 integrate
.. //depot/projects/wifi/tools/lib32/README#2 integrate
.. //depot/projects/wifi/tools/lib32/build32.sh#2 delete
.. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/make/regress.shell_2B.out#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/make/regress.shell_2j.out#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/make/shell_test#1 branch
.. //depot/projects/wifi/usr.bin/gcore/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/gcore/aoutcore.c#3 delete
.. //depot/projects/wifi/usr.bin/ktrace/subr.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#5 integrate
.. //depot/projects/wifi/usr.bin/make/list.h#2 delete
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstAtEnd.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstAtFront.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstClose.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstDatum.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstEnQueue.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstFind.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstFirst.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEach.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEachFrom.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsAtEnd.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsEmpty.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstMember.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstNext.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstOpen.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstReplace.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstSucc.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/main.c#5 integrate
.. //depot/projects/wifi/usr.sbin/ngctl/main.c#2 integrate
.. //depot/projects/wifi/usr.sbin/pstat/pstat.c#2 integrate

Differences ...

==== //depot/projects/wifi/etc/defaults/periodic.conf#2 (text+ko) ====

@@ -10,7 +10,7 @@
 # values set in this file.  This eases the upgrade path when defaults
 # are changed and new features are added.
 #
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.30 2004/09/23 02:00:51 jkoshy Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.31 2004/11/24 18:41:53 mlaier Exp $
 #
 
 # What files override these defaults ?
@@ -150,6 +150,9 @@
 # 510.ipfdenied
 daily_status_security_ipfdenied_enable="YES"
 
+# 520.pfdenied
+daily_status_security_pfdenied_enable="YES"
+
 # 550.ipfwlimit
 daily_status_security_ipfwlimit_enable="YES"
 

==== //depot/projects/wifi/etc/periodic/security/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $
 
 FILES=	100.chksetuid \
 	200.chkmounts \
@@ -6,6 +6,7 @@
 	400.passwdless \
 	500.ipfwdenied \
 	510.ipfdenied \
+	520.pfdenied \
 	550.ipfwlimit \
 	600.ip6fwdenied \
 	650.ip6fwlimit \

==== //depot/projects/wifi/games/fortune/datfiles/fortunes#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.146 2004/10/27 20:28:56 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $
 
 %
 			-- Gifts for Children --
@@ -1063,6 +1063,10 @@
 If you're wearing a shirt that's red.
 		-- Doris Robin and Karen Trimble of The L.A. Filkharmonics
 %
+The Ken Thompson school of thought on expert systems:
+there's table lookup, fraud, and grand fraud.
+		-- Andrew Hume
+%
 	THE LESSER-KNOWN PROGRAMMING LANGUAGES #10: SIMPLE
 
 SIMPLE is an acronym for Sheer Idiot's Monopurpose Programming Language

==== //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.82 2004/01/22 19:15:08 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
@@ -52,6 +52,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -60,6 +61,10 @@
 #include <spinlock.h>
 #include <ucontext.h>
 #include <pthread_np.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 
 /*
  * Define machine dependent macros to get and set the stack pointer

==== //depot/projects/wifi/lib/libc_r/uthread/uthread_init.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_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -49,7 +49,6 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/ttycom.h>
-#include <sys/user.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <dirent.h>

==== //depot/projects/wifi/lib/libc_r/uthread/uthread_jmp.c#2 (text+ko) ====

@@ -28,13 +28,12 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.9 2001/10/10 17:48:43 bde Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $
  */
 
 #include <unistd.h>
 #include <setjmp.h>
 #include <sys/param.h>
-#include <sys/user.h>
 #include <machine/reg.h>
 #include <pthread.h>
 #include "pthread_private.h"

==== //depot/projects/wifi/lib/libc_r/uthread/uthread_stack.c#2 (text+ko) ====

@@ -24,14 +24,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.5 2002/11/13 18:13:26 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.6 2004/11/27 06:51:31 das Exp $
  */
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/user.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include "un-namespace.h"

==== //depot/projects/wifi/lib/libthr/thread/thr_init.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/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.18 2004/11/27 06:51:31 das Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -49,7 +49,6 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/ttycom.h>
-#include <sys/user.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <dirent.h>

==== //depot/projects/wifi/lib/libthr/thread/thr_private.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.42 2004/11/27 06:51:31 das Exp $
  */
 
 #ifndef _THR_PRIVATE_H
@@ -54,6 +54,7 @@
 #include <sys/errno.h>
 #include <sys/msg.h>
 #include <sys/time.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <pthread_np.h>
 #include <sched.h>
@@ -69,6 +70,10 @@
 #include <machine/atomic.h>
 #include <sys/thr.h>
 #include <sys/umtx.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 
 #if defined(_PTHREADS_INVARIANTS)
 /*

==== //depot/projects/wifi/lib/libthr/thread/thr_stack.c#2 (text+ko) ====

@@ -24,13 +24,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.4 2004/11/27 06:51:31 das Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/user.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include "thr_private.h"

==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.262 2004/11/20 02:46:02 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.263 2004/11/27 13:57:22 simon Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -804,6 +804,8 @@
 
     &hwlist.snd.ds1;
 
+    &hwlist.snd.ich;
+
     <para arch="pc98">NEC PC-9801-73, 86 and compatibles (nss driver)
       <itemizedlist>
         <listitem>

==== //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#4 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.45 2004/11/20 02:44:47 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.46 2004/11/27 13:57:22 simon Exp $
 #
 
 #
@@ -105,6 +105,7 @@
 snd_es137x	i386,amd64
 snd_ess	i386,amd64
 snd_gusc	i386,amd64
+snd_ich	i386,amd64
 snd_solo	i386,amd64
 ste	i386,pc98,alpha,amd64
 stg	i386,pc98

==== //depot/projects/wifi/sbin/gvinum/gvinum.c#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/sbin/gvinum/gvinum.c,v 1.2 2004/08/04 00:23:00 le Exp $
+ * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.4 2004/11/26 12:31:36 le Exp $
  */
 
 #include <sys/param.h>
@@ -55,9 +55,11 @@
 void	gvinum_help(void);
 void	gvinum_init(int, char **);
 void	gvinum_list(int, char **);
+void	gvinum_parityop(int, char **, int);
 void	gvinum_printconfig(int, char **);
 void	gvinum_rm(int, char **);
 void	gvinum_saveconfig(void);
+void	gvinum_setstate(int, char **);
 void	gvinum_start(int, char **);
 void	gvinum_stop(int, char **);
 void	parseline(int, char **);
@@ -481,6 +483,61 @@
 }
 
 void
+gvinum_setstate(int argc, char **argv)
+{
+	struct gctl_req *req;
+	int flags, i;
+	const char *errstr;
+
+	flags = 0;
+
+	optreset = 1;
+	optind = 1;
+
+	while ((i = getopt(argc, argv, "f")) != -1) {
+		switch (i) {
+		case 'f':
+			flags |= GV_FLAG_F;
+			break;
+		case '?':
+		default:
+			warn("invalid flag: %c", i);
+			return;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2) {
+		warnx("usage: setstate [-f] <state> <obj>");
+		return;
+	}
+
+	/*
+	 * XXX: This hack is needed to avoid tripping over (now) invalid
+	 * 'classic' vinum states and will go away later.
+	 */
+	if (strcmp(argv[0], "up") && strcmp(argv[0], "down") &&
+	    strcmp(argv[0], "stale")) {
+		warnx("invalid state '%s'", argv[0]);
+		return;
+	}
+
+	req = gctl_get_handle();
+	gctl_ro_param(req, "class", -1, "VINUM");
+	gctl_ro_param(req, "verb", -1, "setstate");
+	gctl_ro_param(req, "state", -1, argv[0]);
+	gctl_ro_param(req, "object", -1, argv[1]);
+	gctl_ro_param(req, "flags", sizeof(int), &flags);
+
+	errstr = gctl_issue(req);
+	if (errstr != NULL)
+		warnx("%s", errstr);
+	gctl_free(req);
+}
+
+void
 gvinum_list(int argc, char **argv)
 {
 	struct gctl_req *req;
@@ -552,6 +609,89 @@
 }
 
 void
+gvinum_parityop(int argc, char **argv, int rebuild)
+{
+	struct gctl_req *req;
+	int flags, i, rv;
+	off_t offset;
+	const char *errstr;
+	char *op, *msg;
+
+	if (rebuild) {
+		op = "rebuildparity";
+		msg = "Rebuilding";
+	} else {
+		op = "checkparity";
+		msg = "Checking";
+	}
+
+	optreset = 1;
+	optind = 1;
+	flags = 0;
+	while ((i = getopt(argc, argv, "fv")) != -1) {
+		switch (i) {
+		case 'f':
+			flags |= GV_FLAG_F;
+			break;
+		case 'v':
+			flags |= GV_FLAG_V;
+			break;
+		case '?':
+		default:
+			warnx("invalid flag '%c'", i);
+			return;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 1) {
+		warn("usage: %s [-f] [-v] <plex>", op);
+		return;
+	}
+
+	do {
+		rv = 0;
+		req = gctl_get_handle();
+		gctl_ro_param(req, "class", -1, "VINUM");
+		gctl_ro_param(req, "verb", -1, "parityop");
+		gctl_ro_param(req, "flags", sizeof(int), &flags);
+		gctl_ro_param(req, "rebuild", sizeof(int), &rebuild);
+		gctl_rw_param(req, "rv", sizeof(int), &rv);
+		gctl_rw_param(req, "offset", sizeof(off_t), &offset);
+		gctl_ro_param(req, "plex", -1, argv[0]);
+		errstr = gctl_issue(req);
+		if (errstr) {
+			warnx("%s\n", errstr);
+			gctl_free(req);
+			break;
+		}
+		gctl_free(req);
+		if (flags & GV_FLAG_V) {
+			printf("\r%s at %s ... ", msg,
+			    gv_roughlength(offset, 1));
+		}
+		if (rv == 1) {
+			printf("Parity incorrect at offset 0x%jx\n",
+			    (intmax_t)offset);
+			if (!rebuild)
+				break;
+		}
+		fflush(stdout);
+
+		/* Clear the -f flag. */
+		flags &= ~GV_FLAG_F;
+	} while (rv >= 0);
+
+	if ((rv == 2) && (flags & GV_FLAG_V)) {
+		if (rebuild)
+			printf("Rebuilt parity on %s\n", argv[0]);
+		else
+			printf("%s has correct parity\n", argv[0]);
+	}
+}
+
+void
 gvinum_rm(int argc, char **argv)
 {
 	struct gctl_req *req;
@@ -717,10 +857,16 @@
 		gvinum_rm(argc, argv);
 	else if (!strcmp(argv[0], "saveconfig"))
 		gvinum_saveconfig();
+	else if (!strcmp(argv[0], "setstate"))
+		gvinum_setstate(argc, argv);
 	else if (!strcmp(argv[0], "start"))
 		gvinum_start(argc, argv);
 	else if (!strcmp(argv[0], "stop"))
 		gvinum_stop(argc, argv);
+	else if (!strcmp(argv[0], "checkparity"))
+		gvinum_parityop(argc, argv, 0);
+	else if (!strcmp(argv[0], "rebuildparity"))
+		gvinum_parityop(argc, argv, 1);
 	else
 		printf("unknown command '%s'\n", argv[0]);
 

==== //depot/projects/wifi/sbin/ipfw/ipfw2.c#2 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.64 2004/10/08 03:24:10 green Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.65 2004/11/25 01:09:41 brooks Exp $
  */
 
 #include <sys/param.h>
@@ -2083,7 +2083,6 @@
 "	ipttl LIST | ipversion VER | keep-state | layer2 | limit ... |\n"
 "	mac ... | mac-type LIST | proto LIST | {recv|xmit|via} {IF|IPADDR} |\n"
 "	setup | {tcpack|tcpseq|tcpwin} NN | tcpflags SPEC | tcpoptions SPEC |\n"
-"	verrevpath | versrcreach | antispoof\n"
 "	tcpdatalen LIST | verrevpath | versrcreach | antispoof\n"
 );
 exit(0);

==== //depot/projects/wifi/sbin/mount/getmntopts.c#2 (text+ko) ====

@@ -33,10 +33,11 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.12 2004/04/09 19:58:30 markm Exp $");
+__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.15 2004/11/25 16:14:27 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/uio.h>
 
 #include <err.h>
 #include <errno.h>
@@ -84,10 +85,8 @@
 		for (m = m0; m->m_option != NULL; ++m) {
 			len = strlen(m->m_option);
 			if (strncasecmp(opt, m->m_option, len) == 0)
-				if (   m->m_option[len]	== '\0'
-				    || m->m_option[len]	== '='
-				   )
-				break;
+				if (opt[len] == '\0' || opt[len] == '=')
+					break;
 		}
 
 		/* Save flag, or fail if option is not recognized. */
@@ -140,3 +139,26 @@
 	} else
 		errx(EX_USAGE, "%s: %s", resolved, strerror(errno));
 }
+
+void
+build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, int len)
+{
+	int i;
+
+	if (*iovlen < 0)
+		return;
+	i = *iovlen;
+	*iov = realloc(*iov, sizeof **iov * (i + 2));
+	if (*iov == NULL) {
+		*iovlen = -1;
+		return;
+	}
+	(*iov)[i].iov_base = strdup(name);
+	(*iov)[i].iov_len = strlen(name) + 1;
+	i++;
+	(*iov)[i].iov_base = val;
+	if (len < 0)
+		len = strlen(val) + 1;
+	(*iov)[i].iov_len = len;
+	*iovlen = ++i;
+}

==== //depot/projects/wifi/sbin/mount/mntopts.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD: src/sbin/mount/mntopts.h,v 1.21 2004/04/09 19:58:30 markm Exp $
+ * $FreeBSD: src/sbin/mount/mntopts.h,v 1.22 2004/11/25 13:31:46 phk Exp $
  */
 
 struct mntopt {
@@ -92,3 +92,4 @@
 void rmslashes(char *, char *);
 void checkpath(const char *, char resolved_path[]);
 extern int getmnt_silent;
+void build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, int len);

==== //depot/projects/wifi/sbin/swapon/swapon.c#2 (text+ko) ====

@@ -39,12 +39,12 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.20 2004/04/09 19:58:39 markm Exp $");
+__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.21 2004/11/27 06:51:31 das Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/sysctl.h>
+#include <vm/vm_param.h>
 
 #include <err.h>
 #include <errno.h>

==== //depot/projects/wifi/share/man/man4/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.293 2004/11/19 18:24:51 obrien Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -267,6 +267,7 @@
 	snd_es137x.4 \
 	snd_ess.4 \
 	snd_gusc.4 \
+	snd_ich.4 \
 	snd_maestro3.4 \
 	snd_sbc.4 \
 	snd_solo.4 \
@@ -432,6 +433,7 @@
 MLINKS+=tx.4 if_tx.4
 MLINKS+=txp.4 if_txp.4
 MLINKS+=udav.4 if_udav.4
+MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vpo.4 imm.4
 MLINKS+=vr.4 if_vr.4

==== //depot/projects/wifi/share/man/man4/amr.4#3 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" (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/share/man/man4/amr.4,v 1.23 2004/11/23 10:56:45 simon Exp $
+.\" $FreeBSD: src/share/man/man4/amr.4,v 1.24 2004/11/26 18:45:58 simon Exp $
 .\"
-.Dd November 23, 2004
+.Dd November 26, 2004
 .Dt AMR 4
 .Os
 .Sh NAME
@@ -98,6 +98,10 @@
 HP NetRAID-3/Si (D4943A)
 .It
 HP Embedded NetRAID
+.It
+Intel RAID Controller SRCS16
+.It
+Intel RAID Controller SRCU42X
 .El
 .Sh DIAGNOSTICS
 .Ss Driver initialisation/shutdown phase

==== //depot/projects/wifi/share/man/man4/dc.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/dc.4,v 1.31 2004/09/05 00:19:32 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/dc.4,v 1.32 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd August 15, 2004
+.Dd November 24, 2004
 .Dt DC 4
 .Os
 .Sh NAME
@@ -335,6 +335,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr eeprom 8 ,
 .Xr ifconfig 8
 .Rs

==== //depot/projects/wifi/share/man/man4/em.4#3 (text+ko) ====

@@ -29,9 +29,9 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD: src/share/man/man4/em.4,v 1.15 2004/11/08 19:52:21 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/em.4,v 1.16 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd September 5, 2004
+.Dd November 24, 2004
 .Dt EM 4
 .Os
 .Sh NAME
@@ -186,6 +186,7 @@
 .Xr arp 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Sh HISTORY

==== //depot/projects/wifi/share/man/man4/fxp.4#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" (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/share/man/man4/fxp.4,v 1.32 2004/07/04 14:17:41 simon Exp $
+.\" $FreeBSD: src/share/man/man4/fxp.4,v 1.33 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd July 4, 2004
+.Dd November 24, 2004
 .Dt FXP 4
 .Os
 .Sh NAME
@@ -136,6 +136,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The

==== //depot/projects/wifi/share/man/man4/ixgb.4#4 (text+ko) ====

@@ -29,9 +29,9 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.6 2004/11/20 03:10:35 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.8 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd August 19, 2004
+.Dd November 24, 2004
 .Dt IXGB 4
 .Os
 .Sh NAME
@@ -103,12 +103,15 @@
 .Xr em 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
 device driver first appeared in
+.Fx 4.11
+and
 .Fx 5.3 .
 .Sh AUTHORS
 The

==== //depot/projects/wifi/share/man/man4/nge.4#2 (text+ko) ====

@@ -29,9 +29,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/nge.4,v 1.14 2004/09/03 03:58:45 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/nge.4,v 1.15 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd September 3, 2004
+.Dd November 24, 2004
 .Dt NGE 4
 .Os
 .Sh NAME
@@ -197,6 +197,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Rs

==== //depot/projects/wifi/share/man/man4/re.4#3 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/re.4,v 1.11 2004/11/17 21:39:06 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/re.4,v 1.12 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd November 17, 2004
+.Dd November 24, 2004
 .Dt RE 4
 .Os
 .Sh NAME
@@ -177,6 +177,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Rs

==== //depot/projects/wifi/share/man/man4/rl.4#3 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/rl.4,v 1.37 2004/11/17 22:51:46 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/rl.4,v 1.38 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd November 17, 2004
+.Dd November 24, 2004
 .Dt RL 4
 .Os
 .Sh NAME
@@ -230,6 +230,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr ifconfig 8
 .Rs
 .%B The RealTek 8129, 8139 and 8139C+ datasheets

==== //depot/projects/wifi/share/man/man4/sf.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sf.4,v 1.19 2004/08/24 15:56:47 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/sf.4,v 1.20 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd August 24, 2004
+.Dd November 24, 2004
 .Dt SF 4
 .Os
 .Sh NAME
@@ -162,6 +162,7 @@
 .Xr miibus 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr polling 4 ,
 .Xr ifconfig 8
 .Rs
 .%T The Adaptec AIC-6915 Programmer's Manual

==== //depot/projects/wifi/share/man/man4/sis.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sis.4,v 1.17 2004/09/04 23:56:56 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/sis.4,v 1.18 2004/11/24 19:06:43 brueffer Exp $
 .\"
-.Dd September 4, 2004
+.Dd November 24, 2004
 .Dt SIS 4
 .Os
 .Sh NAME
@@ -173,6 +173,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list