Date: Sat, 4 May 2002 09:22:26 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10794 for review Message-ID: <200205041622.g44GMQr46278@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10794 Change 10794 by peter@peter_thunder on 2002/05/04 09:21:41 IFC @10793 Affected files ... ... //depot/projects/ia64/MAINTAINERS#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#3 integrate ... //depot/projects/ia64/lib/libc/stdtime/localtime.c#3 integrate ... //depot/projects/ia64/libexec/rexecd/rexecd.c#5 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#11 integrate ... //depot/projects/ia64/share/man/man4/wi.4#3 integrate ... //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#5 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#9 integrate ... //depot/projects/ia64/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/ia64/sys/dev/md/md.c#8 integrate ... //depot/projects/ia64/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/brgphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/ia64/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/ia64/sys/dev/mii/tdkphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/tlphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/ia64/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#7 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#19 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#19 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#13 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#10 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/sys/timetc.h#6 integrate ... //depot/projects/ia64/sys/tools/vnode_if.awk#2 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/extattr.h#2 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#5 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#14 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#6 integrate ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.I.out#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.R.out#1 branch ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.sh#3 integrate ... //depot/projects/ia64/usr.bin/at/at.man#5 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#11 integrate ... //depot/projects/ia64/usr.bin/m4/eval.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/expr.c#5 integrate ... //depot/projects/ia64/usr.bin/m4/look.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/main.c#5 integrate ... //depot/projects/ia64/usr.bin/m4/misc.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/trace.c#3 integrate ... //depot/projects/ia64/usr.bin/xargs/strnsubst.c#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#9 integrate ... //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#6 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/info.h#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.23 2002/05/03 21:02:42 phk Exp $ subsystem login notes ----------------------------- @@ -26,7 +26,6 @@ struct disk phk Pre-commit review requested. specfs phk Pre-commit review requested. devfs phk Pre-commit review requested. -geom phk Pre-commit review requested. timekeeping phk Pre-commit review requested. md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested ==== //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_configure.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#3 $ */ #include <ctype.h> @@ -257,7 +257,7 @@ openpam_configure(pam_handle_t *pamh, const char *service) { - pam_chain_t *other[PAM_NUM_CHAINS]; + pam_chain_t *other[PAM_NUM_CHAINS] = { 0 }; int i, n, r; /* try own configuration first */ ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#3 (text+ko) ==== @@ -9,7 +9,7 @@ #endif /* !defined NOID */ #endif /* !defined lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.30 2002/03/22 21:53:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.31 2002/05/03 17:28:28 wollman Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). @@ -316,8 +316,10 @@ return -1; if ((fid = _open(name, OPEN_MODE)) == -1) return -1; - if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) + if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) { + _close(fid); return -1; + } } { struct tzhead * tzhp; ==== //depot/projects/ia64/libexec/rexecd/rexecd.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rexecd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.29 2002/05/02 05:06:32 des Exp $"; + "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.30 2002/05/03 13:12:06 des Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -80,20 +80,12 @@ struct sockaddr_storage asin; -void doit(struct sockaddr *); -void getstr(char *, int, char *); -void error(const char *fmt, ...); -void pam_fail(void); +static void doit(struct sockaddr *); +static void getstr(char *, int, char *); +static void error(const char *fmt, ...); int no_uid_0 = 1; -void -usage(void) -{ - syslog(LOG_ERR, "usage: rexecd [-i]"); - exit(1); -} - /* * remote execute server: * username\0 @@ -117,7 +109,8 @@ no_uid_0 = 0; break; default: - usage(); + syslog(LOG_ERR, "usage: rexecd [-i]"); + exit(1); } argc -= optind; argv += optind; @@ -133,7 +126,7 @@ return(0); } -void +static void doit(struct sockaddr *fromp) { char cmdbuf[NCARGS+1], *cp; @@ -292,7 +285,7 @@ err(1, "%s", pwd->pw_shell); } -void +static void error(const char *fmt, ...) { char buf[BUFSIZ]; @@ -305,7 +298,7 @@ va_end(ap); } -void +static void getstr(char *buf, int cnt, char *err) { char c; ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 (text+ko) ==== @@ -31,7 +31,7 @@ <sect1> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.86 2002/04/28 04:49:19 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.87 2002/05/03 22:41:35 bmah Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -1745,7 +1745,9 @@ </para> <para arch="i386,alpha">Gigabit Ethernet NICs based on the Intel 82542 and 82543 - controller chips (&man.gx.4; and &man.em.4; drivers) + controller chips (&man.gx.4; and &man.em.4; drivers), plus NICs + supported by the Intel 82540EM and 82544 controller chips + (&man.em.4; driver only) <itemizedlist> <listitem> <para>Intel PRO/1000 Gigabit Ethernet</para> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 (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.337 2002/04/30 19:40:22 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.338 2002/05/03 22:18:30 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -488,7 +488,7 @@ <para arch="i386">The <literal>CPU_ATHLON_SSE_HACK</literal> kernel option has been added, which attempts to enable the SSE feature bit on newer Athlon CPUs if the BIOS has forgotten to - enable it.</para> + enable it. &merged;</para> <para arch="sparc64">The UltraSPARC platform is now supported by &os;. The following machines are supported to at least some @@ -497,6 +497,12 @@ Ultra 2, Ultra 60, Enterprise 220R, and Enterprise 420R.</para> + <para arch="i386">On some systems, the BIOS does not activate + the I/O ports and memory of PC devices, thus making them + unusable. The <literal>PCI_ENABLE_IO_MODES</literal> kernel + option forces &os; to enable these devices so that they can be + used. &merged;</para> + </sect3> <sect3> @@ -984,7 +990,7 @@ <para>The ephemeral port range used for TCP and UDP has been changed to 49152–65535 (the old default was 1024–5000). This increases the number of concurrent - outgoing connections/streams. &merged;</para> + outgoing connections/streams.</para> </sect3> <sect3> @@ -1350,6 +1356,14 @@ <para arch="i386">The ich sound driver now support the SiS 7012 chipset. &merged;</para> + <para arch="i386">Drivers have been added to support the Direct + Rendering Infrastructure, which can used to provide 3D + acceleration within <application>XFree86</application>. Video + cards supported include the 3Dlabs Oxygen GMX 2000 (gammadrm), + AGP Matrox G200/G400/G450/G550 (mgadrm), 3dfx Voodoo + 3/4/5/Banshee (tdfxdrm), AGI ATI Rage 128 (r128drm), and AGP + ATI Radeon (radeondrm).</para> + </sect3> <sect3> @@ -1870,6 +1884,9 @@ <para>A number of buffer overflows in &man.config.8; have been fixed. &merged;</para> + <para>A new &man.csplit.1; utility, which splits files based on + context, has been added.</para> + <para>&man.ctags.1; no longer creates a corrupt tags file if the source file used <literal>//</literal> (C++-style) comments. &merged;</para> @@ -2375,6 +2392,10 @@ <filename>/etc/rc.conf</filename> to the default options in <filename>/etc/defaults/rc.conf</filename>. &merged;</para> + <para>&man.mk.cmds.1; and the associated + <filename>libss</filename> have been removed; they have been + unused for quite some time. &merged;</para> + <para>&man.moused.8; now takes a <option>-a</option> option to control mouse acceleration. &merged;</para> @@ -2776,6 +2797,10 @@ <para>&man.sysinstall.8; no longer mounts the &man.procfs.5; filesystem by default on new installs.</para> + <para>&man.sysinstall.8; now has rudimentary support for + retrieving packages from the correct volume of a multiple-volume + installation (such as a multi-CD distribution). &merged;</para> + <para>&man.syslogd.8; can take a <option>-n</option> option to disable DNS queries for every request. &merged;</para> @@ -3059,7 +3084,7 @@ <application>lukemftpd</application>, has been imported and is available as &man.lukemftpd.8;.</para> - <para>&man.m4.1; has been imported from OpenBSD, as of 19 April + <para>&man.m4.1; has been imported from OpenBSD, as of 26 April 2002.</para> <para><application>ncurses</application> has been updated to @@ -3069,7 +3094,7 @@ been updated to 4.1.0. &merged;</para> <para><application>OpenPAM</application> - (<quote>Cineraria</quote> release) has been imported, + (<quote>Cinnamon</quote> release) has been imported, replacing <application>Linux-PAM</application>.</para> ==== //depot/projects/ia64/sbin/savecore/savecore.c#11 (text+ko) ==== @@ -34,17 +34,20 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.57 2002/04/21 07:18:16 charnier Exp $"); +__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.58 2002/05/04 10:36:35 mux Exp $"); #include <sys/types.h> #include <sys/disk.h> #include <sys/kerneldump.h> +#include <sys/param.h> +#include <sys/mount.h> #include <sys/stat.h> #include <err.h> #include <errno.h> #include <fcntl.h> #include <fstab.h> #include <md5.h> +#include <paths.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -52,7 +55,7 @@ #include <unistd.h> int clear, force, keep, verbose; /* flags */ -int nfound, nsaved; /* statistics */ +int nfound, nsaved, nerr; /* statistics */ static void printheader(FILE *f, const struct kerneldumpheader *h, const char *device, @@ -78,9 +81,58 @@ fflush(f); } +/* + * Check that sufficient space is available on the disk that holds the + * save directory. + */ +static int +check_space(char *savedir, off_t dumpsize) +{ + FILE *fp; + const char *tkernel; + off_t minfree, spacefree, totfree, kernelsize, needed; + struct stat st; + struct statfs fsbuf; + char buf[100], path[MAXPATHLEN]; + tkernel = getbootfile(); + if (stat(tkernel, &st) < 0) + err(1, "%s", tkernel); + kernelsize = st.st_blocks * S_BLKSIZE; + + if (statfs(savedir, &fsbuf) < 0) + err(1, "%s", savedir); + spacefree = ((off_t) fsbuf.f_bavail * fsbuf.f_bsize) / 1024; + totfree = ((off_t) fsbuf.f_bfree * fsbuf.f_bsize) / 1024; + + (void)snprintf(path, sizeof(path), "%s/minfree", savedir); + if ((fp = fopen(path, "r")) == NULL) + minfree = 0; + else { + if (fgets(buf, sizeof(buf), fp) == NULL) + minfree = 0; + else + minfree = atoi(buf); + (void)fclose(fp); + } + + needed = (dumpsize + kernelsize) / 1024; + if (((minfree > 0) ? spacefree : totfree) - needed < minfree) { + warnx("no dump, not enough free space on device" + " (%lld available, need %lld)", + (long long)(minfree > 0 ? spacefree : totfree), + (long long)needed); + return (0); + } + if (spacefree - needed < 0) + warnx("dump performed, but free space threshold crossed"); + return (1); +} + + + static void -DoFile(const char *device) +DoFile(char *savedir, const char *device) { struct kerneldumpheader kdhf, kdhl; char buf[BUFSIZ]; @@ -139,6 +191,7 @@ if (kerneldump_parity(&kdhl)) { warnx("parity error on last dump header on %s", device); + nerr++; goto closefd; } dumpsize = dtoh64(kdhl.dumplength); @@ -148,10 +201,12 @@ if (error != sizeof kdhf) { warn("error reading first dump header at offset %lld in %s", (long long)firsthd, device); + nerr++; goto closefd; } if (memcmp(&kdhl, &kdhf, sizeof kdhl)) { warn("first and last dump headers disagree on %s", device); + nerr++; goto closefd; } md5 = MD5Data((unsigned char *)&kdhl, sizeof kdhl, NULL); @@ -170,15 +225,21 @@ } } else if (errno != ENOENT) { warn("error while checking for pre-saved core file"); + nerr++; goto closefd; } + if (!check_space(savedir, dumpsize)) { + nerr++; + goto closefd; + } /* * Create or overwrite any existing files. */ fdinfo = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fdinfo < 0) { warn("%s", buf); + nerr++; goto closefd; } sprintf(buf, "%s.core", md5); @@ -186,6 +247,7 @@ if (fdcore < 0) { warn("%s", buf); close(fdinfo); + nerr++; goto closefd; } info = fdopen(fdinfo, "w"); @@ -194,7 +256,6 @@ printheader(stdout, &kdhl, device, md5); printf("Saving dump to file %s\n", buf); - nsaved++; printheader(info, &kdhl, device, md5); @@ -205,15 +266,18 @@ error = read(fd, buf, wl); if (error != wl) { warn("read error on %s", device); + nerr++; goto closeall; } error = write(fdcore, buf, wl); if (error != wl) { warn("write error on %s.core file", md5); + nerr++; goto closeall; } dumpsize -= wl; } + nsaved++; close(fdinfo); close(fdcore); @@ -253,7 +317,11 @@ { int i, ch, error; struct fstab *fsp; + char *savedir; + savedir = strdup("."); + if (savedir == NULL) + errx(1, "Cannot allocate memory"); while ((ch = getopt(argc, argv, "cdfkN:vz")) != -1) switch(ch) { case 'c': @@ -281,6 +349,7 @@ error = chdir(argv[0]); if (error) err(1, "chdir(%s)", argv[0]); + savedir = argv[0]; argc--; argv++; } @@ -292,18 +361,22 @@ if (strcmp(fsp->fs_vfstype, "swap") && strcmp(fsp->fs_vfstype, "dump")) continue; - DoFile(fsp->fs_spec); + DoFile(savedir, fsp->fs_spec); } } else { for (i = 0; i < argc; i++) - DoFile(argv[i]); + DoFile(savedir, argv[i]); } /* Emit minimal output. */ if (nfound == 0) printf("No dumps found\n"); - else if (nsaved == 0) - printf("No unsaved dumps found\n"); + else if (nsaved == 0) { + if (nerr != 0) + printf("Unsaved dumps found but not saved\n"); + else + printf("No unsaved dumps found\n"); + } return (0); } ==== //depot/projects/ia64/share/man/man4/wi.4#3 (text+ko) ==== @@ -28,10 +28,10 @@ .\" 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/wi.4,v 1.15 2002/05/02 22:51:40 imp Exp $ -.\" $OpenBSD: wi.4tbl,v 1.9 2002/04/11 20:34:06 millert Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.19 2002/05/04 04:59:20 imp Exp $ +.\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" -.Dd March 29, 2002 +.Dd May 2, 2002 .Dt WI 4 .Os .Sh NAME @@ -49,7 +49,7 @@ .Pp All host/device interaction is via programmed I/O. Supported features include 802.11 and 802.3 frames, power management, BSS, -IBSS, WDS and ad-hoc operation modes. +IBSS, WDS and old-style Lucent ad-hoc operation modes. Cards based on the Intersil PRISM-II and PRISM-2.5 chips also support a host-based access point mode which allows a card to act as a normal access point (with some assistance from the @@ -57,6 +57,7 @@ driver). The Lucent Hermes and Symbol Spectrum24 chipsets do not contain this functionality. +PRISM-II and PRISM-2.5 chips do not support the WDS functionality. .Pp The .Nm @@ -71,7 +72,9 @@ The Lucent WaveLAN/IEEE Bronze cards do not support WEP at all. To enable encryption, use the .Xr wicontrol 8 -utility to set your keys. +utility to set your keys, or use +.Xr ifconfig 8 +as shown below. .Pp By default, the .Nm @@ -81,20 +84,32 @@ .Pp The .Nm -driver also supports an ad-hoc (point-to-point) mode where -the nwid is ignored and stations can communicate amongst -themselves without the aid of an access point. -Note that there are two possible ad-hoc modes. +driver also supports an point-to-point mode where the ssid is +ignored and stations can communicate amongst themselves without the +aid of an access point. +Note that there are two possible point-to-point modes. One mode, referred to as .Dq ad-hoc demo mode , +or +.Dq legacy Lucent ad-hoc mode , predates the IEEE 802.11 specification and so may not interoperate -with cards from other vendors. -The standardized ad-hoc mode, also know as IBSS mode, is not -supported by cards with very old firmware revisions. +with cards from different vendors. +The standardized point-to-point mode, is called IBSS (or confusingly +just ad-hoc mode), but is not supported by cards with very old +firmware revisions. +If your cards supports IBSS mode, it is recommended that you use it in +preference to the +.Dq ad-hoc demo mode +in new installations. .Pp Cards based on the Intersil PRISM-II and PRISM-2.5 chips also have a host-based access point mode which allows the card to act as an access point (base station). +Access points are different than operating in IBSS mode. +They operate in BSS mode. +They allow for easier roaming and bridge all ethernet traffic such +that machines connected via an access point appear to be on the local +ethernet segment. .Pp For more information on configuring this device, see .Xr ifconfig 8 . @@ -118,7 +133,7 @@ Cards in this type of adapter should only be removed when the machine is powered down. .Pp -The following cards are among those supported to by +The following cards are among those supported by the .Nm driver: .Pp @@ -134,7 +149,6 @@ ACTIONTEC HWC01170:Prism-2.5:PCMCIA Addtron AWP-100:Prism-II:PCMCIA Agere Orinoco:Hermes:PCMCIA -Apple Airport:Hermes:macobio Buffalo AirStation:Prism-II:PCMCIA Buffalo AirStation:Prism-II:CF Cabletron RoamAbout:Hermes:PCMCIA @@ -144,6 +158,8 @@ Corega PCCA-11:Prism-II:PCMCIA Corega PCCB-11:Prism-II:PCMCIA Corega CGWLPCIA11:Prism-II:PCI +Dlink DWL520:Prism-2.5:PCI +Dlink DWL650:Prism-2.5:PCMCIA ELSA XI300:Prism-II:PCMCIA ELSA XI800:Prism-II:CF EMTAC A2424i:Prism-II:PCMCIA @@ -151,7 +167,7 @@ Gemtek WL-311:Prism-2.5:PCMCIA Hawking Technology WE110P:Prism-2.5:PCMCIA I-O DATA WN-B11/PCM:Prism-II:PCMCIA -Intel PRO/Wireless 2011:Prism-II:PCMCIA +Intel PRO/Wireless 2011:Spectrum24:PCMCIA Intersil Prism II:Prism-II:PCMCIA Intersil Mini-PCI:Prism-2.5:PCI Linksys Instant Wireless WPC11:Prism-II:PCMCIA @@ -164,8 +180,10 @@ NTT-ME 11Mbps Wireless LAN:Prism-II:PCMCIA Proxim RangeLAN-DS:Prism-II:PCMCIA Samsung MagicLAN SWL-2000N:Prism-II:PCMCIA +Socket Low Power WLAN-CF:Prism-II:CF +SMC 2602 EZ Connect (3.3V):Prism-II:PCI or PCMCIA +SMC 2632 EZ Connect:Prism-II:PCMCIA Symbol Spectrum24:Spectrum24:PCMCIA -SMC 2632 EZ Connect:Prism-II:PCMCIA TDK LAK-CD011WL:Prism-II:PCMCIA .TE .in -\n(dIu @@ -206,26 +224,30 @@ wepkey 0x8736639624 .Ed .Pp -Join an ad-hoc network with network name +Join a Lucent legacy demo ad-hoc network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e mediaopt adhoc .Ed .Pp -Create an IBBS network with network name +Create an IBSS network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - mediaopt create-ibss + mediaopt ibss-master .Ed +Note: The infrastructure for mediaopt ibss-master has not been +committed yet. .Pp -Join an IBBS network with network name +Join an IBSS network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e mediaopt ibss .Ed +Note: The infrastructure for mediaopt ibss has not been +committed yet. .Pp Create a host-based access point (Prism only): .Bd -literal -compact -offset indent @@ -247,6 +269,8 @@ # sysctl net.link.ether.bridge_cfg="wi0 fxp0" # sysctl net.inet.ip.forwarding=1 .Ed +This will give you approximately the same functionality as an access +point. .Sh DIAGNOSTICS .Bl -diag .It "wi%d: init failed" @@ -287,6 +311,7 @@ newer cards use channel 10 by default. Non-Lucent cards vary, for instance the Addtron cards use channel 11 by default. +Different regulatory domains have different default channels. See .Xr wicontrol 8 for information on how to change the channel. @@ -295,3 +320,6 @@ .Pp Prism2 host-based access point mode has bugs for firmware versions prior to 0.8.3. +.Pp +Lucent cards prior to firmware version 6.0.4 do not support ibss +mode. ==== //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#5 (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/VOP_ATTRIB.9,v 1.16 2002/03/28 12:57:48 dd Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.17 2002/05/03 20:28:38 rwatson Exp $ .\" .Dd July 24, 1996 .Os @@ -62,19 +62,27 @@ Attributes which are not being modified by .Xr VOP_SETATTR 9 should be set to the value -.Dv VNOVAL . +.Dv VNOVAL ; +.Fn VOP_NULL "" +may be used to clear all the values, and should generally be used to reset +the contents of +.Ar *vap +prior to setting specific values. .Sh LOCKS .Xr VOP_GETATTR 9 expects the vnode to be locked on entry and will leave the vnode locked on return. +The lock type can be either shared or exclusive. .Pp .Xr VOP_SETATTR 9 expects the vnode to be locked on entry and will leave the vnode locked on return. +The lock type must be exclusive. .Sh RETURN VALUES .Xr VOP_GETATTR 9 -returns information about the file in -.Fa *vap . +returns 0 if it was able to retrieve the attribute data via +.Fa *vap , +otherwise an appropriate error is returned. .Xr VOP_SETATTR 9 returns zero if the attributes were changed successfully, otherwise an appropriate error is returned. @@ -151,7 +159,8 @@ .El .Sh SEE ALSO .Xr vnode 9 , -.Xr VOP_ACCESS 9 +.Xr VOP_ACCESS 9 , +.Xr VFS 9 .Sh AUTHORS This man page was written by .An Doug Rabson . ==== //depot/projects/ia64/sys/alpha/conf/GENERIC#9 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/ia64/sys/dev/drm/drm_fops.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.3 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.4 2002/05/03 07:45:26 tanimura Exp $ */ #define __NO_VERSION__ @@ -315,7 +315,7 @@ DRM_DEBUG("dev->buf_sigio=%p\n", dev->buf_sigio); if (dev->buf_sigio) { DRM_DEBUG("dev->buf_sigio->sio_pgid=%d\n", dev->buf_sigio->sio_pgid); - pgsigio(dev->buf_sigio, SIGIO, 0); + pgsigio(&dev->buf_sigio, SIGIO, 0); } DRM_DEBUG("waking\n"); wakeup(&dev->buf_rp); ==== //depot/projects/ia64/sys/dev/md/md.c#8 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.57 2002/03/20 09:55:07 jeff Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.58 2002/05/03 17:55:10 phk Exp $ * */ @@ -609,18 +609,6 @@ struct nameidata nd; int error, flags; - if (mdio->md_options & MD_AUTOUNIT) { - sc = mdnew(-1); - mdio->md_unit = sc->unit; - } else { - sc = mdnew(mdio->md_unit); - } - if (sc == NULL) - return (EBUSY); - - sc->type = MD_VNODE; - sc->flags = mdio->md_options & MD_FORCE; - flags = FREAD|FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); @@ -628,7 +616,6 @@ if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - sc->flags |= MD_READONLY; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); if (error) @@ -642,6 +629,22 @@ return (error ? error : EINVAL); } VOP_UNLOCK(nd.ni_vp, 0, td); + + if (mdio->md_options & MD_AUTOUNIT) { + sc = mdnew(-1); + mdio->md_unit = sc->unit; + } else { + sc = mdnew(mdio->md_unit); + } + if (sc == NULL) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); + return (EBUSY); + } + + sc->type = MD_VNODE; + sc->flags = mdio->md_options & MD_FORCE; + if (!(flags & FWRITE)) + sc->flags |= MD_READONLY; sc->secsize = DEV_BSIZE; sc->vnode = nd.ni_vp; ==== //depot/projects/ia64/sys/dev/mii/acphy.c#5 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.9 2002/05/04 11:00:30 phk Exp $"; #endif static int acphy_probe (device_t); @@ -213,7 +213,7 @@ if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) return (0); - (void) mii_phy_auto(sc, 1); + (void) mii_phy_auto(sc); break; default: ==== //depot/projects/ia64/sys/dev/mii/amphy.c#4 (text+ko) ==== @@ -29,7 +29,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/mii/amphy.c,v 1.9 2002/04/29 13:07:31 phk Exp $ + * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.10 2002/05/04 11:00:30 phk Exp $ */ /* @@ -57,7 +57,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/amphy.c,v 1.9 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/amphy.c,v 1.10 2002/05/04 11:00:30 phk Exp $"; #endif static int amphy_probe (device_t); @@ -190,7 +190,7 @@ */ if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) return (0); - (void) mii_phy_auto(sc, 1); + (void) mii_phy_auto(sc); break; case IFM_100_T4: /* ==== //depot/projects/ia64/sys/dev/mii/brgphy.c#5 (text+ko) ==== @@ -29,7 +29,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/mii/brgphy.c,v 1.12 2002/04/29 13:07:31 phk Exp $ + * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.13 2002/05/04 11:00:30 phk Exp $ */ /* @@ -59,7 +59,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.12 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.13 2002/05/04 11:00:30 phk Exp $"; #endif static int brgphy_probe (device_t); @@ -86,8 +86,7 @@ static int brgphy_service(struct mii_softc *, struct mii_data *, int); static void brgphy_status(struct mii_softc *); -static int brgphy_mii_phy_auto(struct mii_softc *, int); -extern void mii_phy_auto_timeout(void *); +static int brgphy_mii_phy_auto(struct mii_softc *); static int brgphy_probe(dev) device_t dev; @@ -228,7 +227,7 @@ if (PHY_READ(sc, BRGPHY_MII_BMCR) & BRGPHY_BMCR_AUTOEN) >>> 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?200205041622.g44GMQr46278>