PERFORCE change 50895 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Apr 11 18:06:13 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=50895
Change 50895 by marcel at marcel_nfs on 2004/04/11 18:05:20
IFC @50894
Affected files ...
.. //depot/projects/gdb/UPDATING#8 integrate
.. //depot/projects/gdb/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate
.. //depot/projects/gdb/etc/defaults/rc.conf#8 integrate
.. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/Makefile#2 edit
.. //depot/projects/gdb/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/gdb/lib/libc/gen/getvfsent.3#2 delete
.. //depot/projects/gdb/lib/libc/gen/getvfsent.c#2 delete
.. //depot/projects/gdb/lib/libc/locale/mblen.3#3 integrate
.. //depot/projects/gdb/lib/libc/locale/mbtowc.3#3 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#8 integrate
.. //depot/projects/gdb/share/man/man9/DEVICE_ATTACH.9#2 integrate
.. //depot/projects/gdb/share/man/man9/DEVICE_PROBE.9#2 integrate
.. //depot/projects/gdb/share/timedef/Makefile#5 integrate
.. //depot/projects/gdb/sys/alpha/alpha/pmap.c#4 integrate
.. //depot/projects/gdb/sys/alpha/include/pmap.h#5 integrate
.. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#7 integrate
.. //depot/projects/gdb/sys/amd64/include/md_var.h#4 integrate
.. //depot/projects/gdb/sys/amd64/include/pmap.h#5 integrate
.. //depot/projects/gdb/sys/conf/NOTES#10 integrate
.. //depot/projects/gdb/sys/conf/files#15 integrate
.. //depot/projects/gdb/sys/conf/options#11 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/gdb/sys/dev/cardbus/cardbus_cis.c#3 integrate
.. //depot/projects/gdb/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/gdb/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/gdb/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/gdb/sys/dev/random/probe.c#2 integrate
.. //depot/projects/gdb/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/gdb/sys/dev/sx/cd1865.h#1 branch
.. //depot/projects/gdb/sys/dev/sx/sx.c#1 branch
.. //depot/projects/gdb/sys/dev/sx/sx.h#1 branch
.. //depot/projects/gdb/sys/dev/sx/sx_pci.c#1 branch
.. //depot/projects/gdb/sys/dev/sx/sx_util.c#1 branch
.. //depot/projects/gdb/sys/dev/sx/sx_util.h#1 branch
.. //depot/projects/gdb/sys/dev/sx/sxvar.h#1 branch
.. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#8 integrate
.. //depot/projects/gdb/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/gdb/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/gdb/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/gdb/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/gdb/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/gdb/sys/modules/random/Makefile#3 integrate
.. //depot/projects/gdb/sys/net/if.h#3 integrate
.. //depot/projects/gdb/sys/net/if_var.h#6 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs.h#6 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_subs.c#5 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs.h#5 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#4 integrate
.. //depot/projects/gdb/sys/pci/if_dc.c#3 integrate
.. //depot/projects/gdb/sys/pci/if_rl.c#5 integrate
.. //depot/projects/gdb/sys/pci/if_sis.c#3 integrate
.. //depot/projects/gdb/sys/pci/if_ste.c#8 integrate
.. //depot/projects/gdb/sys/pci/if_vr.c#4 integrate
.. //depot/projects/gdb/sys/powerpc/include/pmap.h#4 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#6 integrate
.. //depot/projects/gdb/sys/sparc64/include/pmap.h#4 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/gdb/sys/sys/mount.h#6 integrate
.. //depot/projects/gdb/sys/sys/param.h#10 integrate
.. //depot/projects/gdb/sys/vm/pmap.h#5 integrate
.. //depot/projects/gdb/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.c#3 integrate
.. //depot/projects/gdb/usr.bin/tar/matching.c#2 integrate
.. //depot/projects/gdb/usr.bin/tar/read.c#2 integrate
.. //depot/projects/gdb/usr.bin/tar/write.c#3 integrate
Differences ...
==== //depot/projects/gdb/UPDATING#8 (text+ko) ====
@@ -1379,9 +1379,13 @@
To just build a kernel when you know that it won't mess you up
--------------------------------------------------------------
- cd src/sys/{i386,alpha}/conf
+ This assumes you are already running a 5.X system. Replace
+ ${arch} with the architecture of your machine (e.g. "i386",
+ "alpha", "amd64", "ia64", "pc98", "sparc64", etc).
+
+ cd src/sys/${arch}/conf
config KERNEL_NAME_HERE
- cd ../../compile/KERNEL_NAME_HERE
+ cd ../compile/KERNEL_NAME_HERE
make depend
make
make install
@@ -1559,4 +1563,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.301 2004/03/22 16:37:32 rwatson Exp $
+$FreeBSD: src/UPDATING,v 1.302 2004/04/11 03:30:09 kensmith Exp $
==== //depot/projects/gdb/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
- * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.3 2004/04/11 21:07:26 mux Exp $
*/
#include <sys/param.h>
#include <sys/stat.h>
@@ -75,16 +75,14 @@
#ifdef APPLE
extern void dropsuid();
extern int loadsmbvfs();
-#else
- struct xvfsconf vfc;
-#endif /* APPLE */
+#endif
char *next;
int opt, error, mntflags, caseopt;
#ifdef APPLE
dropsuid();
-#endif /* APPLE */
+#endif
if (argc == 2) {
if (strcmp(argv[1], "-h") == 0) {
usage();
@@ -99,17 +97,9 @@
#ifdef APPLE
error = loadsmbvfs();
-#else
- error = getvfsbyname(SMBFS_VFSNAME, &vfc);
- if (error && vfsisloadable(SMBFS_VFSNAME)) {
- if(vfsload(SMBFS_VFSNAME))
- err(EX_OSERR, "vfsload("SMBFS_VFSNAME")");
- endvfsent();
- error = getvfsbyname(SMBFS_VFSNAME, &vfc);
- }
-#endif /* APPLE */
if (error)
errx(EX_OSERR, "SMB filesystem is not available");
+#endif
if (smb_lib_init() != 0)
exit(1);
==== //depot/projects/gdb/etc/defaults/rc.conf#8 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.204 2004/04/05 16:22:14 fjoe Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.205 2004/04/10 22:13:27 green Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -456,6 +456,8 @@
devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
# devfs(8) rules.
devfs_system_ruleset="" # The name of a ruleset to apply to /dev
+devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
+ # apply (must be mounted already, i.e. fstab(5))
performance_cx_lowest="HIGH" # Online CPU idle state
performance_throttle_state="HIGH" # Online throttling state
economy_cx_lowest="LOW" # Offline CPU idle state
==== //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/Makefile#2 (text+ko) ====
@@ -10,7 +10,7 @@
GENSRCS=
SRCS= argv.c concat.c cp-demangle.c cplus-dem.c floatformat.c \
getruntime.c hashtab.c hex.c lbasename.c objalloc.c obstack.c \
- safe-ctype.c splay-tree.c xexit.c xstrdup.c xstrerror.c \
+ regex.c safe-ctype.c splay-tree.c xexit.c xstrdup.c xstrerror.c \
${GENSRCS}
CLEANFILES+= ${GENSRCS}
==== //depot/projects/gdb/lib/libc/gen/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.109 2004/01/15 17:27:28 ru Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.110 2004/04/11 21:36:31 mux Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -15,7 +15,7 @@
gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
getobjformat.c getosreldate.c getpagesize.c \
getpeereid.c getprogname.c getpwent.c getttyent.c \
- getusershell.c getvfsbyname.c getvfsent.c glob.c \
+ getusershell.c getvfsbyname.c glob.c \
initgroups.c isatty.c jrand48.c lcong48.c \
lockf.c lrand48.c mrand48.c nice.c \
nlist.c nrand48.c ntp_gettime.c opendir.c \
@@ -48,7 +48,7 @@
getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
getmntinfo.3 getnetgrent.3 getobjformat.3 getosreldate.3 \
getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \
- getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \
+ getttyent.3 getusershell.3 getvfsbyname.3 \
glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \
modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \
nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \
@@ -103,9 +103,6 @@
getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \
getttyent.3 setttyent.3
MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
-MLINKS+=getvfsent.3 endvfsent.3 getvfsent.3 getvfsbytype.3 \
- getvfsent.3 setvfsent.3 getvfsent.3 vfsisloadable.3 \
- getvfsent.3 vfsload.3
MLINKS+=glob.3 globfree.3
MLINKS+=isgreater.3 isgreaterequal.3 isgreater.3 isless.3 \
isgreater.3 islessequal.3 isgreater.3 islessgreater.3 \
==== //depot/projects/gdb/lib/libc/locale/mblen.3#3 (text+ko) ====
@@ -35,9 +35,9 @@
.\"
.\" From @(#)multibyte.3 8.1 (Berkeley) 6/4/93
.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: src/lib/libc/locale/mblen.3,v 1.2 2004/04/08 09:59:02 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/mblen.3,v 1.3 2004/04/11 05:19:19 tjr Exp $
.\"
-.Dd April 7, 2004
+.Dd April 11, 2004
.Dt MBLEN 3
.Os
.Sh NAME
@@ -79,9 +79,12 @@
.Fa mbchar
is not a null pointer,
.Fn mblen
-returns the number of bytes processed in
+either returns 0 if
+.Fa mbchar
+represents the null wide character, or returns
+the number of bytes processed in
.Fa mbchar ,
-or \-1 if no multibyte character
+or returns \-1 if no multibyte character
could be recognized or converted.
In this case,
.Fn mblen Ns No 's
==== //depot/projects/gdb/lib/libc/locale/mbtowc.3#3 (text+ko) ====
@@ -35,9 +35,9 @@
.\"
.\" From @(#)multibyte.3 8.1 (Berkeley) 6/4/93
.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: src/lib/libc/locale/mbtowc.3,v 1.2 2004/04/08 09:59:02 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/mbtowc.3,v 1.3 2004/04/11 05:19:19 tjr Exp $
.\"
-.Dd April 7, 2004
+.Dd April 11, 2004
.Dt MBTOWC 3
.Os
.Sh NAME
@@ -81,10 +81,12 @@
.Fa mbchar
is not a null pointer,
.Fn mbtowc
-returns
+either returns 0 if
+.Fa mbchar
+represents the null wide character, or returns
the number of bytes processed in
.Fa mbchar ,
-or \-1 if no multibyte character
+or returns \-1 if no multibyte character
could be recognized or converted.
In this case,
.Fn mbtowc Ns No 's
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.707 2004/04/08 15:47:30 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.710 2004/04/11 23:49:16 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -164,16 +164,21 @@
More details can be found in security advisory <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:05.openssl.asc">FreeBSD-SA-04:05</ulink>.
&merged;</para>
+
+ <para>A programming error in the handling of some IPv6
+ socket options within the &man.setsockopt.2; system call
+ has been fixed. This allows a local attacker to cause a
+ system panic, and may allow to gain unauthorized access to
+ parts of kernel memory, possibly resulting in disclosure
+ of sensitive information, bypass of access control
+ mechanisms, or privilege escalation.
+ More details can be found in security advisory <ulink
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:06.ipv6.asc">FreeBSD-SA-04:06</ulink>.</para>
</sect2>
<sect2 id="kernel">
<title>Kernel Changes</title>
- <para arch="i386">The &man.ctau.4; driver has been added for Cronyx Tau
- synchronous serial adapters. This driver was known for a long time as "ct"
- in its previous life outside FreeBSD source tree. Note: only driver name
- has changed. Network interface still has "ct" name.</para>
-
<para arch="i386">The &man.acpi.toshiba.4; driver has been added
to use Toshiba's Hardware Control Interface to manipulate
certain hardware features on Toshiba laptops.</para>
@@ -182,6 +187,16 @@
control display switching and backlight brightness using the
ACPI Video Extensions.</para>
+ <para arch="i386">The &man.ctau.4; driver has been added for Cronyx-Tau
+ synchronous serial adapters. This driver was known for a long time as
+ <quote>ct</quote> in its previous life outside the &os; source tree. &merged;
+
+ <note>
+ <para>The driver name has changed, but the network interface still
+ has the <quote>ct</quote> name.</para>
+ </note>
+ </para>
+
<para>&man.devfs.5; path rules now work correctly on
directories.</para>
@@ -254,6 +269,10 @@
<sect3 id="proc">
<title>Platform-Specific Hardware Support</title>
+ <para arch="i386">The entropy device &man.random.4; now
+ supports a hardware random number generator (RNG)
+ in the VIA C3 Nehemiah (Stepping 3 and above) CPU.</para>
+
<para arch="i386">Several old drivers for ISA cards have been removed,
including
the asc driver for GI1904-based hand scanners,
@@ -325,14 +344,25 @@
<para>The &man.ng.vlan.4; NetGraph node type, which supports
IEEE 802.1Q VLAN tagging has been added. &merged;</para>
+ <para>A bug that prevents VLAN support in the &man.nge.4; driver
+ from working has been fixed. &merged;</para>
+
+ <para>Several bugs related to &man.polling.4; support
+ in the &man.rl.4; driver have been fixed. &merged;</para>
+
<para>Several bugs related to multicast and promiscuous mode
handling in the &man.sk.4; driver have been fixed.</para>
+ <para>The &man.ste.4; driver now supports &man.polling.4;.
+ &merged;</para>
+
<para>The &man.udav.4; driver has been added. It provides
support for USB Ethernet adapters based on the Davicom DM9601
chipset.</para>
- <para>The hardware TX checksum support of the &man.xl.4; driver
+ <para>The &man.vr.4; driver now supports &man.polling.4;.</para>
+
+ <para>The hardware TX checksum support in the &man.xl.4; driver
has been disabled as it does not work correctly and slows down
the transmission rate. &merged;</para>
</sect3>
@@ -390,6 +420,9 @@
work better, and some problems with timeouts should be
resolved.</para>
+ <para arch="pc98">A bug of the automatic density selection code
+ in the &man.fd.4; driver has been fixed.</para>
+
<para>The &man.ips.4; driver now supports the recent
Adaptec ServeRAID series SCSI controller cards.</para>
@@ -397,6 +430,9 @@
which prevents the cards on SBus from working correctly,
has been fixed.</para>
+ <para arch="i386">The twa driver, which supports
+ 3ware's 9000 series PATA/SATA RAID controllers has been added. &merged;</para>
+
<para>The &man.umass.4; driver now supports the missing
ATAPI MMC commands and handles the timeout properly. &merged;</para>
</sect3>
@@ -446,6 +482,23 @@
<sect2 id="userland">
<title>Userland Changes</title>
+ <para>&man.bsdlabel.8; now supports a <option>-f</option> option
+ to work on files instead of disk partitions.</para>
+
+ <para>The <command>bthidcontrol</command> command and the
+ <command>bthidd</command> command, which support Bluetooth
+ HID (Human Interface Device), have been added.</para>
+
+ <para>The <command>doscmd</command> utility has been
+ removed from the &os; base system, and has been available
+ in the &os; Ports Collection instead.</para>
+
+ <para arch="pc98">The &man.fdcontrol.8;, &man.fdformat.1;, and
+ &man.fdread.1; utilities now work on &os;/pc98.</para>
+
+ <para>The &man.find.1; now supports a option
+ <option>-acl</option> to locate files with &man.acl.3;.</para>
+
<para>&man.indent.1; now supports a <option>-ldi</option> option
to control indentation of local variables. A number of other
tunings were made to this utility.</para>
@@ -516,6 +569,11 @@
</note>
<para>
+ <para>Initial support for UTF-8 versions of all the currently
+ supported system locales has been added. This is primarily
+ for the benefit of the <filename role="package">misc/utf8locale</filename>
+ port.</para>
+
<para>The &man.logins.1; utility has been added to display
information about user and system accounts.</para>
@@ -523,6 +581,9 @@
which allows users to specify a known port for use
in firewall rulesets.</para>
+ <para>&man.netstat.1; now displays the multicast group
+ memberships present in the system.</para>
+
<para>&man.newfs.8; and &man.mdmfs.8; now support a
<option>-l</option> flag to enable them to set the MAC
multilabel flag on new filesystems without requiring the use of
@@ -541,6 +602,22 @@
role="package">net/nss_ldap</filename>) and groups with large
membership lists.</para>
+ <para>The &man.pgrep.1; and &man.pkill.1; commands, which come from NetBSD,
+ have been added. They also support a <option>-M</option> option
+ to extract values associated with the name list from the
+ specified core instead of the default <filename>/dev/kmem</filename>,
+ and a <option>-N</option> option to extract the name list from
+ the specified system instead of the default kernel.</para>
+
+ <para>&man.ps.1; compatibility with POSIX/SUSv3 has been improved.
+ The changes include <option>-p</option> for a list of process IDs,
+ <option>-t</option> for a list of terminal names,
+ <option>-A</option> which is equivalent to <option>-ax</option>,
+ <option>-G</option> for a list of group IDs,
+ <option>-X</option> which is the opposite of <option>-x</option>,
+ and some minor improvements. For more information, see &man.ps.1;.
+ &merged;</para>
+
<para>&man.pw.8; now supports a <option>-H</option> option, which
accepts an encrypted password on a file descriptor. &merged;</para>
@@ -604,8 +681,8 @@
It saves the current settings of all audio mixers present
in the system on shutdown and restores the settings on boot.</para>
- <para>The <filename>pf</filename> script for &man.pf.4;
- has been added.</para>
+ <para>The <filename>pf</filename> and <filename>pflog</filename>
+ scripts for &man.pf.4; has been added.</para>
</sect3>
</sect2>
@@ -645,6 +722,12 @@
<filename>tar</filename> being a link to
<filename>gtar</filename>.</para>
+ <para><application>Heimdal Kerberos</application> has been
+ updated from 0.6 to 0.6.1.
+
+ <para><application>libpcap</application> has been updated from
+ version 0.7.1 to version 0.8.3.</para>
+
<para><application>OpenPAM</application> has been updated from the
Dogwood release to the Eelgrass release.</para>
@@ -660,6 +743,9 @@
</para>
+ <para><application>OpenSSL</application> has been updated from
+ 0.9.7c to 0.9.7d. &merged;</para>
+
<para><application>pf</application>, OpenBSD's packet filter as of
OpenBSD 3.4, has been imported into &os; source tree and is now installed
by default. A new user <username>proxy</username>, and two new
@@ -695,6 +781,8 @@
<para><application>sendmail</application> has been updated from
version 8.12.10 to version 8.12.11. &merged;</para>
+ <para><application>tcpdump</application> has been updated from
+ version 3.7.1 to version 3.8.3.</para>
</sect2>
<sect2 id="ports">
==== //depot/projects/gdb/sbin/ifconfig/ifconfig.8#6 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.77 2004/04/09 19:58:29 markm Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.79 2004/04/11 13:44:57 ru Exp $
.\"
-.Dd March 30, 2004
+.Dd April 11, 2004
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -332,6 +332,14 @@
If the driver supports user-configurable checksum offloading,
disable receive (or transmit) checksum offloading on the interface.
These settings may not always be independent of each other.
+.It Cm polling
+If the driver has user-configurable
+.Xr polling 4
+support, select the polling mode on the interface.
+.It Fl polling
+If the driver has user-configurable
+.Xr polling 4
+support, select the interrupt mode on the interface.
.It Cm tunnel Ar src_addr dest_addr
(IP tunnel devices only.)
Configure the physical source and destination address for IP tunnel
@@ -761,7 +769,7 @@
.Fl m
flag is passed before an interface name,
.Nm
-will display all
+will display the capability list and all
of the supported media for the specified interface.
If
.Fl L
==== //depot/projects/gdb/sbin/ifconfig/ifconfig.c#8 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.101 2004/04/09 19:58:30 markm Exp $";
+ "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.102 2004/04/11 13:36:52 ru Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -283,6 +283,8 @@
{ "-txcsum", -IFCAP_TXCSUM, setifcap },
{ "netcons", IFCAP_NETCONS, setifcap },
{ "-netcons", -IFCAP_NETCONS, setifcap },
+ { "polling", IFCAP_POLLING, setifcap },
+ { "-polling", -IFCAP_POLLING, setifcap },
{ "normal", -IFF_LINK0, setifflags },
{ "compress", IFF_LINK0, setifflags },
{ "noicmp", IFF_LINK1, setifflags },
@@ -1074,7 +1076,7 @@
"\20MULTICAST\21POLLING\23MONITOR\24STATICARP"
#define IFCAPBITS \
-"\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU"
+"\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING"
/*
* Print the status of the interface. If an address family was
==== //depot/projects/gdb/share/man/man9/DEVICE_ATTACH.9#2 (text+ko) ====
@@ -26,7 +26,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/share/man/man9/DEVICE_ATTACH.9,v 1.7 2001/10/01 16:09:23 ru Exp $
+.\" $FreeBSD: src/share/man/man9/DEVICE_ATTACH.9,v 1.8 2004/04/11 06:37:50 imp Exp $
.\"
.Dd June 16, 1998
.Dt DEVICE_ATTACH 9
@@ -45,6 +45,13 @@
the device exists.
This routine should initialise the hardware and allocate other
system resources (such as devfs entries).
+.Pp
+Devices which implement busses should use this method to probe for
+the existence of devices attached to the bus and add them as
+children.
+If this is combined with the use of
+.Xr bus_generic_attach 9
+the child devices will be automatically probed and attached.
.Sh RETURN VALUES
Zero is returned on success, otherwise an appropriate error is returned.
.Sh SEE ALSO
==== //depot/projects/gdb/share/man/man9/DEVICE_PROBE.9#2 (text+ko) ====
@@ -26,7 +26,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/share/man/man9/DEVICE_PROBE.9,v 1.16 2003/10/23 01:31:25 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.17 2004/04/11 06:37:21 imp Exp $
.\"
.Dd June 16, 1998
.Dt DEVICE_PROBE 9
@@ -64,15 +64,14 @@
the softc structure will be available for its attach method and any
resources allocated during probe must be released and re-allocated
if the attach method is called.
+In addition it is an absolute requirement that the probe routine have
+no side effects whatsoever.
+The probe routine may be called more than once before the attach
+routine is called.
+.Pp
If a success code of zero is
-returned, the driver can assume that it will be the one attached.
-.Pp
-Devices which implement busses should use this method to probe for
-the existence of devices attached to the bus and add them as
-children.
-If this is combined with the use of
-.Xr bus_generic_attach 9
-the child devices will be automatically probed and attached.
+returned, the driver can assume that it will be the one attached, but
+must not hold any resources when the probe routine returns.
.Sh RETURN VALUES
A value equal to or less than zero indicates success, greater than
zero indicates an error (errno). For values equal to or less than
@@ -81,6 +80,7 @@
priority, e.g. -100 indicates a lower priority than -50.
.Sh SEE ALSO
.Xr device 9 ,
+.Xr DEVICE_ATTACH 9 ,
.Xr DEVICE_DETACH 9 ,
.Xr DEVICE_IDENTIFY 9 ,
.Xr DEVICE_SHUTDOWN 9
==== //depot/projects/gdb/share/timedef/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/timedef/Makefile,v 1.42 2004/04/04 12:24:05 tjr Exp $
+# $FreeBSD: src/share/timedef/Makefile,v 1.43 2004/04/11 08:07:22 marcus Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -102,8 +102,8 @@
IT_LINKS= it_CH
LN_LINKS= la_LN.US-ASCII la_LN.ISO8859-2 la_LN.ISO8859-4
NL_LINKS= nl_BE
-US_LINKS= en_CA
-GB_LINKS= en_AU en_NZ
+US_LINKS=
+GB_LINKS= en_AU en_CA en_NZ
.SUFFIXES: .src .out
==== //depot/projects/gdb/sys/alpha/alpha/pmap.c#4 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.142 2004/04/05 04:07:58 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,7 +301,6 @@
*/
struct pmap kernel_pmap_store;
-vm_offset_t avail_end; /* PA of last available physical page */
vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */
vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */
static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */
@@ -511,9 +510,6 @@
Lev2map[i] = newpte;
}
- for (i = 0; phys_avail[i+2]; i+= 2) ;
- avail_end = phys_avail[i+1];
-
virtual_avail = VM_MIN_KERNEL_ADDRESS;
virtual_end = VPTBASE;
==== //depot/projects/gdb/sys/alpha/include/pmap.h#5 (text+ko) ====
@@ -39,7 +39,7 @@
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.28 2004/04/05 21:00:50 imp Exp $
+ * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.30 2004/04/11 05:08:26 alc Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -204,7 +204,6 @@
#ifdef _KERNEL
-extern vm_offset_t avail_end;
extern vm_offset_t phys_avail[];
extern vm_offset_t virtual_avail;
extern vm_offset_t virtual_end;
@@ -214,6 +213,7 @@
vm_offset_t pmap_steal_memory(vm_size_t);
void pmap_bootstrap(vm_offset_t, u_int);
void pmap_kenter(vm_offset_t va, vm_offset_t pa);
+void *pmap_kenter_temporary(vm_offset_t pa, int i);
void pmap_kremove(vm_offset_t);
void pmap_setdevram(unsigned long long basea, vm_offset_t sizea);
int pmap_uses_prom_console(void);
==== //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.232 2004/04/03 09:16:25 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.233 2004/04/11 04:26:58 alc Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -522,8 +522,7 @@
*/
int
-is_physical_memory(addr)
- vm_offset_t addr;
+is_physical_memory(vm_paddr_t addr)
{
#ifdef DEV_ISA
==== //depot/projects/gdb/sys/amd64/include/md_var.h#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.72 2004/03/31 02:03:49 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.73 2004/04/11 04:26:58 alc Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -66,7 +66,7 @@
void enable_sse(void);
void fillw(int /*u_short*/ pat, void *base, size_t cnt);
void fpstate_drop(struct thread *td);
-int is_physical_memory(vm_offset_t addr);
+int is_physical_memory(vm_paddr_t addr);
int isa_nmi(int cd);
void pagecopy(void *from, void *to);
void pagezero(void *addr);
==== //depot/projects/gdb/sys/amd64/include/pmap.h#5 (text+ko) ====
@@ -39,7 +39,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.112 2004/04/05 23:55:14 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.113 2004/04/10 22:41:45 alc Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -264,6 +264,7 @@
void pmap_bootstrap(vm_paddr_t *);
void pmap_kenter(vm_offset_t va, vm_paddr_t pa);
+void *pmap_kenter_temporary(vm_offset_t pa, int i);
void pmap_kremove(vm_offset_t);
void *pmap_mapdev(vm_paddr_t, vm_size_t);
void pmap_unmapdev(vm_offset_t, vm_size_t);
==== //depot/projects/gdb/sys/conf/NOTES#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1212 2004/04/02 18:50:56 vkashyap Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1213 2004/04/11 20:17:34 imp Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1904,6 +1904,8 @@
hint.si.0.at="isa"
hint.si.0.maddr="0xd0000"
hint.si.0.irq="12"
+device sx
+options SX_DEBUG
device nmdm
#
==== //depot/projects/gdb/sys/conf/files#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.884 2004/04/10 19:43:15 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.885 2004/04/11 20:01:18 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -716,6 +716,10 @@
dev/stg/tmc18c30_pccard.c optional stg pccard
dev/stg/tmc18c30_pci.c optional stg pci
dev/stg/tmc18c30_isa.c optional stg isa
+dev/sx/sx.c optional sx
+dev/sx/sx_util.c optional sx
+#dev/sx/sx_isa.c optional sx isa
+dev/sx/sx_pci.c optional sx pci
dev/sym/sym_hipd.c optional sym \
dependency "$S/dev/sym/sym_{conf,defs}.h"
dev/syscons/blank/blank_saver.c optional blank_saver
==== //depot/projects/gdb/sys/conf/options#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.439 2004/04/06 19:12:24 jhb Exp $
+# $FreeBSD: src/sys/conf/options,v 1.440 2004/04/11 20:01:18 imp Exp $
#
# On the handling of kernel options
#
@@ -432,6 +432,7 @@
NPX_DEBUG opt_debug_npx.h
NETATALKDEBUG opt_atalk.h
SI_DEBUG opt_debug_si.h
+SX_DEBUG opt_debug_sx.h
# Fb options
FB_DEBUG opt_fb.h
==== //depot/projects/gdb/sys/contrib/pf/net/pf.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.6 2004/03/30 18:28:30 mlaier Exp $ */
-/* $OpenBSD: pf.c,v 1.389.2.2 2004/03/14 00:13:42 brad Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.7 2004/04/11 17:35:40 mlaier Exp $ */
+/* $OpenBSD: pf.c,v 1.389.2.3 2004/04/10 09:38:19 brad Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -4312,6 +4312,7 @@
struct pf_tree_node key;
struct pf_state_peer *src, *dst;
u_int8_t dws;
+ int copyback = 0;
/*
* Only the first 8 bytes of the TCP header can be
@@ -4349,9 +4350,11 @@
/* Demodulate sequence number */
seq = ntohl(th.th_seq) - src->seqdiff;
- if (src->seqdiff)
- pf_change_a(&th.th_seq, &th.th_sum,
+ if (src->seqdiff) {
+ pf_change_a(&th.th_seq, icmpsum,
htonl(seq), 0);
+ copyback = 1;
+ }
if (!SEQ_GEQ(src->seqhi, seq) ||
!SEQ_GEQ(seq, src->seqlo - (dst->max_win << dws))) {
@@ -4371,7 +4374,7 @@
if (STATE_TRANSLATE(*state)) {
if (direction == PF_IN) {
pf_change_icmp(pd2.src, &th.th_sport,
- saddr, &(*state)->lan.addr,
+ daddr, &(*state)->lan.addr,
(*state)->lan.port, NULL,
pd2.ip_sum, icmpsum,
pd->ip_sum, 0, pd2.af);
@@ -4382,6 +4385,10 @@
pd2.ip_sum, icmpsum,
pd->ip_sum, 0, pd2.af);
}
+ copyback = 1;
+ }
+
+ if (copyback) {
switch (pd2.af) {
#ifdef INET
case AF_INET:
@@ -4402,8 +4409,6 @@
#endif /* INET6 */
}
m_copyback(m, off2, 8, (caddr_t)&th);
- } else if (src->seqdiff) {
- m_copyback(m, off2, 8, (caddr_t)&th);
}
return (PF_PASS);
==== //depot/projects/gdb/sys/dev/cardbus/cardbus_cis.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.45 2004/03/17 17:50:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.46 2004/04/11 19:22:25 imp Exp $");
/*
* CIS Handling for the Cardbus Bus
@@ -374,6 +374,25 @@
if (reg & TPL_BAR_REG_PREFETCHABLE)
dinfo->mprefetchable |= BARBIT(bar);
#if 0
+ /*
+ * XXX: It appears from a careful reading of the spec
+ * that we're not supposed to honor this when the bridge
+ * is not on the main system bus. PCI spec doesn't appear
+ * to allow for memory ranges not listed in the bridge's
+ * decode range to be decoded. The PC Card spec seems to
+ * indicate that this should only be done on x86 based
+ * machines, which seems to imply that on non-x86 machines
+ * the adddresses can be anywhere. This further implies that
+ * since the hardware can do it on non-x86 machines, it should
+ * be able to do it on x86 machines. Therefore, we can and
+ * should ignore this hint. Furthermore, the PC Card spec
+ * recommends always allocating memory above 1MB, contradicting
+ * the other part of the PC Card spec.
+ *
+ * NetBSD ignores this bit, but it also ignores the
+ * prefetchable bit too, so that's not an indication of
+ * correctness.
+ */
if (reg & TPL_BAR_REG_BELOW1MB)
dinfo->mbelow1mb |= BARBIT(bar);
#endif
==== //depot/projects/gdb/sys/dev/em/if_em.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.38 2004/03/17 17:50:31 njl Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.39 2004/04/11 21:01:12 ru Exp $*/
#include <dev/em/if_em.h>
@@ -727,11 +727,10 @@
case SIOCSIFCAP:
IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFCAP (Set Capabilities)");
mask = ifr->ifr_reqcap ^ ifp->if_capenable;
+ if (mask & IFCAP_POLLING)
+ ifp->if_capenable ^= IFCAP_POLLING;
if (mask & IFCAP_HWCSUM) {
- if (IFCAP_HWCSUM & ifp->if_capenable)
- ifp->if_capenable &= ~IFCAP_HWCSUM;
- else
- ifp->if_capenable |= IFCAP_HWCSUM;
+ ifp->if_capenable ^= IFCAP_HWCSUM;
if (ifp->if_flags & IFF_RUNNING)
em_init(adapter);
}
@@ -888,6 +887,10 @@
mtx_assert(&adapter->mtx, MA_OWNED);
+ if (!(ifp->if_capenable & IFCAP_POLLING)) {
+ ether_poll_deregister(ifp);
+ cmd = POLL_DEREGISTER;
+ }
if (cmd == POLL_DEREGISTER) { /* final call, enable interrupts */
em_enable_intr(adapter);
return;
@@ -945,7 +948,8 @@
return;
}
- if (ether_poll_register(em_poll, ifp)) {
+ if ((ifp->if_capenable & IFCAP_POLLING) &&
+ ether_poll_register(em_poll, ifp)) {
em_disable_intr(adapter);
em_poll_locked(ifp, 0, 1);
EM_UNLOCK(adapter);
@@ -1864,6 +1868,10 @@
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
#endif
+#ifdef DEVICE_POLLING
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list