PERFORCE change 142070 for review
John Birrell
jb at FreeBSD.org
Thu May 22 23:02:28 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142070
Change 142070 by jb at freebsd3 on 2008/05/22 23:01:59
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#76 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#43 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#35 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/ed.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#35 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#34 integrate
.. //depot/projects/dtrace/src/sbin/restore/tape.c#8 integrate
.. //depot/projects/dtrace/src/share/man/man3/Makefile#8 integrate
.. //depot/projects/dtrace/src/share/man/man3/queue.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#31 integrate
.. //depot/projects/dtrace/src/share/man/man9/pmap.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/pmap_addr_hint.9#4 delete
.. //depot/projects/dtrace/src/share/man/man9/taskqueue.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#9 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#2 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#54 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#19 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_share.c#5 integrate
.. //depot/projects/dtrace/src/sys/modules/iwn/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_wds.c#2 integrate
.. //depot/projects/dtrace/src/sys/sys/conf.h#11 integrate
.. //depot/projects/dtrace/src/sys/sys/queue.h#5 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#22 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.h#9 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/siginfo.c#2 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#34 integrate
.. //depot/projects/dtrace/www/en/gnome/index.xsl#12 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#48 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#76 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.795 2008/05/19 22:58:35 flz Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.796 2008/05/22 13:06:08 ed Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -2575,11 +2575,6 @@
</listitem>
<listitem>
- <para>Ed Schouten
- <email>ed at fxq.nl</email></para>
- </listitem>
-
- <listitem>
<para>Ederson de Moura
<email>ederbs at ederbs.org</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#43 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.224 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.226 2008/05/22 19:27:34 ed Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -1146,6 +1146,10 @@
</listitem>
<listitem>
+ <para>&a.ed;</para>
+ </listitem>
+
+ <listitem>
<para>&a.cy;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#35 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.445 2008/04/22 15:26:14 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.446 2008/05/22 12:58:17 ed Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -292,6 +292,8 @@
<!ENTITY a.dwmalone "David Malone <email>dwmalone at FreeBSD.org</email>">
+<!ENTITY a.ed "Ed Schouten <email>ed at FreeBSD.org</email>">
+
<!ENTITY a.edwin "Edwin Groothuis <email>edwin at FreeBSD.org</email>">
<!ENTITY a.ehaupt "Emanuel Haupt <email>ehaupt at FreeBSD.org</email>">
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#35 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.68 2008/04/22 15:26:14 pgj Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.69 2008/05/22 13:16:39 ed Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -944,6 +944,11 @@
&pgpkey.wosch;
</sect2>
+ <sect2 id="pgpkey-ed">
+ <title>&a.ed;</title>
+ &pgpkey.ed;
+ </sect2>
+
<sect2 id="pgpkey-das">
<title>&a.das;</title>
&pgpkey.das;
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#34 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.165 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.166 2008/05/22 13:16:39 ed Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -75,6 +75,7 @@
<!ENTITY pgpkey.dougb SYSTEM "dougb.key">
<!ENTITY pgpkey.dryice SYSTEM "dryice.key">
<!ENTITY pgpkey.dwmalone SYSTEM "dwmalone.key">
+<!ENTITY pgpkey.ed SYSTEM "ed.key">
<!ENTITY pgpkey.ehaupt SYSTEM "ehaupt.key">
<!ENTITY pgpkey.emax SYSTEM "emax.key">
<!ENTITY pgpkey.erwin SYSTEM "erwin.key">
==== //depot/projects/dtrace/src/sbin/restore/tape.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $");
+__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.53 2008/05/22 22:19:33 mckusick Exp $");
#include <sys/param.h>
#include <sys/file.h>
@@ -1379,8 +1379,6 @@
}
if (checksum((int *)buf) == FAIL)
return (FAIL);
- if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate)
- fprintf(stderr, "Header with wrong dumpdate.\n");
if (Bcvt) {
swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf);
swabst((u_char *)"l",(u_char *) &buf->c_level);
@@ -1395,28 +1393,25 @@
/*
* Have to patch up missing information in bit map headers
*/
- buf->c_inumber = 0;
buf->c_size = buf->c_count * TP_BSIZE;
if (buf->c_count > TP_NINDIR)
readmapflag = 1;
else
for (i = 0; i < buf->c_count; i++)
buf->c_addr[i]++;
- break;
+ /* FALL THROUGH */
case TS_TAPE:
- if (buf->c_magic == NFS_MAGIC) {
- if ((buf->c_flags & NFS_DR_NEWINODEFMT) == 0)
- oldinofmt = 1;
- buf->c_date = _time32_to_time(buf->c_old_date);
- buf->c_ddate = _time32_to_time(buf->c_old_ddate);
- buf->c_tapea = buf->c_old_tapea;
- buf->c_firstrec = buf->c_old_firstrec;
- }
+ if (buf->c_magic == NFS_MAGIC &&
+ (buf->c_flags & NFS_DR_NEWINODEFMT) == 0)
+ oldinofmt = 1;
+ /* FALL THROUGH */
+
case TS_END:
buf->c_inumber = 0;
- break;
+ /* FALL THROUGH */
+ case TS_ADDR:
case TS_INODE:
/*
* For old dump tapes, have to copy up old fields to
@@ -1429,16 +1424,18 @@
buf->c_ddate = _time32_to_time(buf->c_old_ddate);
buf->c_atime = _time32_to_time(buf->c_old_atime);
buf->c_mtime = _time32_to_time(buf->c_old_mtime);
+ buf->c_birthtime = 0;
+ buf->c_birthtimensec = 0;
+ buf->c_extsize = 0;
}
break;
- case TS_ADDR:
- break;
-
default:
panic("gethead: unknown inode type %d\n", buf->c_type);
break;
}
+ if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate)
+ fprintf(stderr, "Header with wrong dumpdate.\n");
/*
* If we're restoring a filesystem with the old (FreeBSD 1)
* format inodes, copy the uid/gid to the new location
==== //depot/projects/dtrace/src/share/man/man3/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 12/13/93
-# $FreeBSD: src/share/man/man3/Makefile,v 1.47 2008/03/29 17:44:39 ru Exp $
+# $FreeBSD: src/share/man/man3/Makefile,v 1.48 2008/05/22 14:40:03 ed Exp $
.include <bsd.own.mk>
@@ -63,6 +63,7 @@
queue.3 SLIST_NEXT.3 \
queue.3 SLIST_REMOVE.3 \
queue.3 SLIST_REMOVE_HEAD.3 \
+ queue.3 SLIST_REMOVE_NEXT.3 \
queue.3 STAILQ_CONCAT.3 \
queue.3 STAILQ_EMPTY.3 \
queue.3 STAILQ_ENTRY.3 \
@@ -79,6 +80,7 @@
queue.3 STAILQ_NEXT.3 \
queue.3 STAILQ_REMOVE.3 \
queue.3 STAILQ_REMOVE_HEAD.3 \
+ queue.3 STAILQ_REMOVE_NEXT.3 \
queue.3 TAILQ_CONCAT.3 \
queue.3 TAILQ_EMPTY.3 \
queue.3 TAILQ_ENTRY.3 \
==== //depot/projects/dtrace/src/share/man/man3/queue.3#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)queue.3 8.2 (Berkeley) 1/24/94
-.\" $FreeBSD: src/share/man/man3/queue.3,v 1.41 2007/11/02 00:34:44 obrien Exp $
+.\" $FreeBSD: src/share/man/man3/queue.3,v 1.42 2008/05/22 14:40:03 ed Exp $
.\"
.Dd March 24, 2006
.Dt QUEUE 3
@@ -48,6 +48,7 @@
.Nm SLIST_INSERT_HEAD ,
.Nm SLIST_NEXT ,
.Nm SLIST_REMOVE_HEAD ,
+.Nm SLIST_REMOVE_NEXT ,
.Nm SLIST_REMOVE ,
.Nm STAILQ_CONCAT ,
.Nm STAILQ_EMPTY ,
@@ -64,6 +65,7 @@
.Nm STAILQ_LAST ,
.Nm STAILQ_NEXT ,
.Nm STAILQ_REMOVE_HEAD ,
+.Nm STAILQ_REMOVE_NEXT ,
.Nm STAILQ_REMOVE ,
.Nm LIST_EMPTY ,
.Nm LIST_ENTRY ,
@@ -114,6 +116,7 @@
.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME"
.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME"
.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME"
+.Fn SLIST_REMOVE_NEXT "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME"
.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME"
.\"
.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2"
@@ -131,6 +134,7 @@
.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME"
.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME"
.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME"
+.Fn STAILQ_REMOVE_NEXT "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME"
.\"
.Fn LIST_EMPTY "LIST_HEAD *head"
@@ -387,6 +391,14 @@
macro.
.Pp
The macro
+.Nm SLIST_REMOVE_NEXT
+removes the element after
+.Fa elm
+from the list. Unlike
+.Fa SLIST_REMOVE ,
+this macro does not traverse the entire list.
+.Pp
+The macro
.Nm SLIST_REMOVE
removes the element
.Fa elm
@@ -561,6 +573,14 @@
macro.
.Pp
The macro
+.Nm STAILQ_REMOVE_NEXT
+removes the element after
+.Fa elm
+from the tail queue. Unlike
+.Fa STAILQ_REMOVE ,
+this macro does not traverse the entire tail queue.
+.Pp
+The macro
.Nm STAILQ_REMOVE
removes the element
.Fa elm
==== //depot/projects/dtrace/src/share/man/man9/Makefile#31 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.335 2008/04/06 21:22:12 attilio Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.336 2008/05/22 16:25:25 alc Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -169,7 +169,6 @@
physio.9 \
pmap.9 \
pmap_activate.9 \
- pmap_addr_hint.9 \
pmap_change_wiring.9 \
pmap_clear_modify.9 \
pmap_copy.9 \
==== //depot/projects/dtrace/src/share/man/man9/pmap.9#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/share/man/man9/pmap.9,v 1.10 2005/06/15 00:21:02 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pmap.9,v 1.11 2008/05/22 16:25:25 alc Exp $
.\"
.Dd July 21, 2003
.Dt PMAP 9
@@ -89,7 +89,6 @@
.Sh SEE ALSO
.Xr pmap 9 ,
.Xr pmap_activate 9 ,
-.Xr pmap_addr_hint 9 ,
.Xr pmap_change_wiring 9 ,
.Xr pmap_clear_modify 9 ,
.Xr pmap_clear_reference 9 ,
==== //depot/projects/dtrace/src/share/man/man9/taskqueue.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/taskqueue.9,v 1.21 2007/07/09 06:24:10 jmg Exp $
+.\" $FreeBSD: src/share/man/man9/taskqueue.9,v 1.22 2008/05/22 21:41:19 gonzo Exp $
.\"
.Dd May 19, 2005
.Dt TASKQUEUE 9
@@ -54,7 +54,7 @@
};
.Ed
.Ft struct taskqueue *
-.Fn taskqueue_create "const char *name" "int mflags" "taskqueue_enqueue_fn enqueue" "void *context" "struct proc **"
+.Fn taskqueue_create "const char *name" "int mflags" "taskqueue_enqueue_fn enqueue" "void *context"
.Ft void
.Fn taskqueue_free "struct taskqueue *queue"
.Ft struct taskqueue *
@@ -217,9 +217,6 @@
.Fn TASKQUEUE_DEFINE_THREAD
macro defines a new taskqueue with its own kernel thread to serve tasks.
The variable
-.Vt struct proc *taskqueue_name_proc
-is defined which contains the kernel thread serving the tasks.
-The variable
.Vt struct taskqueue *taskqueue_name
is used to enqueue tasks onto the queue.
.Ss Predefined Task Queues
==== //depot/projects/dtrace/src/share/misc/committers-src.dot#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.72 2008/02/15 18:40:45 olli Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.73 2008/05/22 13:18:09 ed Exp $
# This file is meant to list all FreeBSD src committers and describe the
# mentor-mentee relationships between them.
@@ -80,6 +80,7 @@
dhartmei [label="Daniel Hartmeier\ndhartmei at FreeBSD.org\n2004/04/06"]
dmlb [label="Duncan Barclay\ndmlb at FreeBSD.org\n2001/12/14"]
dwmalone [label="David Malone\ndwmalone at FreeBSD.org\n2000/07/11"]
+ed [label="Ed Schouten\ned at FreeBSD.org\n2008/05/22"]
edwin [label="Edwin Groothuis\nedwin at FreeBSD.org\n2007/06/25"]
eik [label="Oliver Eikemeier\neik at FreeBSD.org\n2004/05/20"]
emaste [label="Ed Maste\nemaste at FreeBSD.org\n2005/10/04"]
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#2 (text+ko) ====
==== //depot/projects/dtrace/src/sys/conf/NOTES#54 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1488 2008/05/19 01:53:47 yongari Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1489 2008/05/22 18:19:49 maxim Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1731,7 +1731,8 @@
# Solaris implements a new BREAK which is initiated by a character
# sequence CR ~ ^b which is similar to a familiar pattern used on
-# Sun servers by the Remote Console.
+# Sun servers by the Remote Console. There are FreeBSD extentions:
+# CR ~ ^p requests force panic and CR ~ ^r requests a clean reboot.
options ALT_BREAK_TO_DEBUGGER
# Serial Communications Controller
==== //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#19 (text+ko) ====
@@ -84,7 +84,7 @@
#define HDA_DRV_TEST_REV "20080420_0052"
#define HDA_WIDGET_PARSER_REV 1
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.53 2008/04/19 22:32:23 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.54 2008/05/22 09:14:12 kevlo Exp $");
#define HDA_BOOTVERBOSE(stmt) do { \
if (bootverbose != 0 || snd_verbose > 3) { \
@@ -557,6 +557,7 @@
#define HDA_CODEC_STAC9227 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7618)
#define HDA_CODEC_STAC9271D HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7627)
#define HDA_CODEC_STAC9205 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x76a0)
+#define HDA_CODEC_STAC9872AK HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7662)
#define HDA_CODEC_STACXXXX HDA_CODEC_CONSTRUCT(SIGMATEL, 0xffff)
/*
@@ -620,6 +621,7 @@
{ HDA_CODEC_STAC9227, "Sigmatel STAC9227" },
{ HDA_CODEC_STAC9271D, "Sigmatel STAC9271D" },
{ HDA_CODEC_STAC9205, "Sigmatel STAC9205" },
+ { HDA_CODEC_STAC9872AK,"Sigmatel STAC9872AK" },
{ HDA_CODEC_CXVENICE, "Conexant Venice" },
{ HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" },
{ HDA_CODEC_VT1708_8, "VIA VT1708_8" },
==== //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_share.c#5 (text+ko) ====
@@ -41,7 +41,7 @@
/* This file is shared between kernel and userland. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_share.c,v 1.5 2007/04/12 17:40:44 le Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_share.c,v 1.6 2008/05/22 10:27:03 lulf Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -525,7 +525,8 @@
break;
}
p->state = gv_plexstatei(token[j]);
- } else if (!strcmp(token[j], "vol")) {
+ } else if (!strcmp(token[j], "vol") ||
+ !strcmp(token[j], "volume")) {
j++;
if (j >= max) {
errors++;
==== //depot/projects/dtrace/src/sys/modules/iwn/Makefile#2 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/modules/iwn/Makefile,v 1.1 2008/04/29 21:36:17 sam Exp $
+# $FreeBSD: src/sys/modules/iwn/Makefile,v 1.2 2008/05/22 21:53:15 sam Exp $
.PATH: ${.CURDIR}/../../dev/iwn
KMOD = if_iwn
-SRCS = if_iwn.c opt_bdg.h device_if.h bus_if.h pci_if.h
-CFLAGS += -g -DWITNESS -DINVARIANT_SUPPORT -DINVARIANTS -I${.CURDIR}/../../
+SRCS = if_iwn.c device_if.h bus_if.h pci_if.h
+
.include <bsd.kmod.mk>
==== //depot/projects/dtrace/src/sys/net80211/ieee80211_adhoc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.1 2008/04/20 20:35:43 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.2 2008/05/22 22:14:58 sam Exp $");
#endif
/*
@@ -115,8 +115,6 @@
if (ostate != IEEE80211_S_SCAN)
ieee80211_cancel_scan(vap); /* background scan */
ni = vap->iv_bss; /* NB: no reference held */
- if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
- callout_stop(&vap->iv_swbmiss);
switch (nstate) {
case IEEE80211_S_INIT:
switch (ostate) {
==== //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.93 2008/05/01 20:26:25 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.94 2008/05/22 22:22:10 sam Exp $");
#include "opt_wlan.h"
@@ -1311,14 +1311,29 @@
((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL)
#define IS_BAR(wh) \
((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_BAR)
+#define IS_PROBEREQ(wh) \
+ ((wh->i_fc[0] & (IEEE80211_FC0_TYPE_MASK|IEEE80211_FC0_SUBTYPE_MASK)) \
+ == (IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ))
+#define IS_BCAST_PROBEREQ(wh) \
+ (IS_PROBEREQ(wh) && IEEE80211_IS_MULTICAST( \
+ ((const struct ieee80211_frame *)(wh))->i_addr3))
+
+static __inline struct ieee80211_node *
+_find_rxnode(struct ieee80211_node_table *nt,
+ const struct ieee80211_frame_min *wh)
+{
+ /* XXX 4-address frames? */
+ if (IS_CTL(wh) && !IS_PSPOLL(wh) && !IS_BAR(wh) /*&& !IS_RTS(ah)*/)
+ return ieee80211_find_node_locked(nt, wh->i_addr1);
+ if (IS_BCAST_PROBEREQ(wh))
+ return NULL; /* spam bcast probe req to all vap's */
+ return ieee80211_find_node_locked(nt, wh->i_addr2);
+}
/*
* Locate the node for sender, track state, and then pass the
- * (referenced) node up to the 802.11 layer for its use. We
- * are required to pass some node so we fall back to ic_bss
- * when this frame is from an unknown sender. The 802.11 layer
- * knows this means the sender wasn't in the node table and
- * acts accordingly.
+ * (referenced) node up to the 802.11 layer for its use. Note
+ * we can return NULL if the sender is not in the table.
*/
struct ieee80211_node *
#ifdef IEEE80211_DEBUG_REFCNT
@@ -1332,13 +1347,9 @@
struct ieee80211_node_table *nt;
struct ieee80211_node *ni;
- /* XXX 4-address frames? */
nt = &ic->ic_sta;
IEEE80211_NODE_LOCK(nt);
- if (IS_CTL(wh) && !IS_PSPOLL(wh) && !IS_BAR(wh) /*&& !IS_RTS(ah)*/)
- ni = ieee80211_find_node_locked(nt, wh->i_addr1);
- else
- ni = ieee80211_find_node_locked(nt, wh->i_addr2);
+ ni = _find_rxnode(nt, wh);
IEEE80211_NODE_UNLOCK(nt);
return ni;
@@ -1372,10 +1383,7 @@
else
ni = NULL;
if (ni == NULL) {
- if (IS_CTL(wh) && !IS_PSPOLL(wh) && !IS_BAR(wh) /*&& !IS_RTS(ah)*/)
- ni = ieee80211_find_node_locked(nt, wh->i_addr1);
- else
- ni = ieee80211_find_node_locked(nt, wh->i_addr2);
+ ni = _find_rxnode(nt, wh);
if (ni != NULL && nt->nt_keyixmap != NULL) {
/*
* If the station has a unicast key cache slot
@@ -1393,12 +1401,18 @@
nt->nt_keyixmap[keyix] = ieee80211_ref_node(ni);
}
}
- } else
- ieee80211_ref_node(ni);
+ } else {
+ if (IS_BCAST_PROBEREQ(wh))
+ ni = NULL; /* spam bcast probe req to all vap's */
+ else
+ ieee80211_ref_node(ni);
+ }
IEEE80211_NODE_UNLOCK(nt);
return ni;
}
+#undef IS_BCAST_PROBEREQ
+#undef IS_PROBEREQ
#undef IS_BAR
#undef IS_PSPOLL
#undef IS_CTL
==== //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.46 2008/04/20 20:35:44 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.47 2008/05/22 22:17:27 sam Exp $");
/*
* IEEE 802.11 protocol support.
@@ -1323,8 +1323,25 @@
ieee80211_swbmiss(void *arg)
{
struct ieee80211vap *vap = arg;
+ struct ieee80211com *ic = vap->iv_ic;
- if (vap->iv_swbmiss_count == 0) {
+ /* XXX sleep state? */
+ KASSERT(vap->iv_state == IEEE80211_S_RUN,
+ ("wrong state %d", vap->iv_state));
+
+ if (ic->ic_flags & IEEE80211_F_SCAN) {
+ /*
+ * If scanning just ignore and reset state. If we get a
+ * bmiss after coming out of scan because we haven't had
+ * time to receive a beacon then we should probe the AP
+ * before posting a real bmiss (unless iv_bmiss_max has
+ * been artifiically lowered). A cleaner solution might
+ * be to disable the timer on scan start/end but to handle
+ * case of multiple sta vap's we'd need to disable the
+ * timers of all affected vap's.
+ */
+ vap->iv_swbmiss_count = 0;
+ } else if (vap->iv_swbmiss_count == 0) {
if (vap->iv_bmiss != NULL)
vap->iv_bmiss(vap);
if (vap->iv_bmiss_count == 0) /* don't re-arm timer */
==== //depot/projects/dtrace/src/sys/net80211/ieee80211_wds.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.1 2008/04/20 20:35:44 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.2 2008/05/22 22:14:58 sam Exp $");
#endif
/*
@@ -403,8 +403,6 @@
if (ostate != IEEE80211_S_SCAN)
ieee80211_cancel_scan(vap); /* background scan */
ni = vap->iv_bss; /* NB: no reference held */
- if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
- callout_stop(&vap->iv_swbmiss);
error = 0;
switch (nstate) {
case IEEE80211_S_INIT:
==== //depot/projects/dtrace/src/sys/sys/conf.h#11 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/conf.h,v 1.237 2008/05/21 09:31:44 kib Exp $
+ * $FreeBSD: src/sys/sys/conf.h,v 1.238 2008/05/22 13:46:41 ed Exp $
*/
#ifndef _SYS_CONF_H_
@@ -293,6 +293,7 @@
#define GID_WHEEL 0
#define GID_KMEM 2
+#define GID_TTY 4
#define GID_OPERATOR 5
#define GID_BIN 7
#define GID_GAMES 13
==== //depot/projects/dtrace/src/sys/sys/queue.h#5 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)queue.h 8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.68 2006/10/24 11:20:29 ru Exp $
+ * $FreeBSD: src/sys/sys/queue.h,v 1.69 2008/05/22 14:40:03 ed Exp $
*/
#ifndef _SYS_QUEUE_H_
@@ -97,6 +97,7 @@
* _INSERT_TAIL - - + +
* _CONCAT - - + +
* _REMOVE_HEAD + - + -
+ * _REMOVE_NEXT + - + -
* _REMOVE + + + +
*
*/
@@ -195,12 +196,16 @@
struct type *curelm = SLIST_FIRST((head)); \
while (SLIST_NEXT(curelm, field) != (elm)) \
curelm = SLIST_NEXT(curelm, field); \
- SLIST_NEXT(curelm, field) = \
- SLIST_NEXT(SLIST_NEXT(curelm, field), field); \
+ SLIST_REMOVE_NEXT(head, curelm, field); \
} \
TRASHIT((elm)->field.sle_next); \
} while (0)
+#define SLIST_REMOVE_NEXT(head, elm, field) do { \
+ SLIST_NEXT(elm, field) = \
+ SLIST_NEXT(SLIST_NEXT(elm, field), field); \
+} while (0)
+
#define SLIST_REMOVE_HEAD(head, field) do { \
SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
} while (0)
@@ -287,9 +292,7 @@
struct type *curelm = STAILQ_FIRST((head)); \
while (STAILQ_NEXT(curelm, field) != (elm)) \
curelm = STAILQ_NEXT(curelm, field); \
- if ((STAILQ_NEXT(curelm, field) = \
- STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
- (head)->stqh_last = &STAILQ_NEXT((curelm), field);\
+ STAILQ_REMOVE_NEXT(head, curelm, field); \
} \
TRASHIT((elm)->field.stqe_next); \
} while (0)
@@ -300,6 +303,12 @@
(head)->stqh_last = &STAILQ_FIRST((head)); \
} while (0)
+#define STAILQ_REMOVE_NEXT(head, elm, field) do { \
+ if ((STAILQ_NEXT(elm, field) = \
+ STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \
+ (head)->stqh_last = &STAILQ_NEXT((elm), field); \
+} while (0)
+
/*
* List declarations.
*/
==== //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#22 (text+ko) ====
@@ -1,7 +1,7 @@
/*
* FreeBSD
*
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.234 2008/05/18 11:05:41 rpaulo Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.235 2008/05/22 13:21:05 ed Exp $
*/
#ifndef _calendar_freebsd_
@@ -104,6 +104,7 @@
04/09 Ceri Davies <ceri at FreeBSD.org> born in Haverfordwest, Pembrokeshire, United Kingdom, 1976
04/11 Bruce A. Mah <bmah at FreeBSD.org> born in Fresno, California, United States, 1969
04/12 Patrick Gardella <patrick at FreeBSD.org> born in Columbus, Ohio, United States, 1967
+04/12 Ed Schouten <ed at FreeBSD.org> born in Oss, the Netherlands, 1986
04/13 Oliver Braun <obraun at FreeBSD.org> born in Nuremberg, Bavaria, Germany, 1972
04/14 Crist J. Clark <cjc at FreeBSD.org> born in Milwaukee, Wisconsin, United States, 1970
04/15 David Malone <dwmalone at FreeBSD.org> born in Dublin, Ireland, 1973
==== //depot/projects/dtrace/src/usr.bin/tar/bsdtar.h#9 (text+ko) ====
@@ -22,7 +22,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/usr.bin/tar/bsdtar.h,v 1.31 2008/05/18 06:24:47 cperciva Exp $
+ * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.32 2008/05/22 21:08:36 cperciva Exp $
*/
#include "bsdtar_platform.h"
@@ -96,7 +96,7 @@
struct matching *matching; /* for matching.c */
struct security *security; /* for read.c */
struct name_cache *uname_cache; /* for write.c */
- struct siginfo *siginfo; /* for siginfo.c */
+ struct siginfo_data *siginfo; /* for siginfo.c */
};
void bsdtar_errc(struct bsdtar *, int _eval, int _code,
==== //depot/projects/dtrace/src/usr.bin/tar/siginfo.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.1 2008/05/18 06:24:47 cperciva Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/siginfo.c,v 1.2 2008/05/22 21:08:36 cperciva Exp $");
#include <errno.h>
#include <signal.h>
@@ -37,7 +37,7 @@
/* Is there a pending SIGINFO or SIGUSR1? */
static volatile sig_atomic_t siginfo_received = 0;
-struct siginfo {
+struct siginfo_data {
/* What sort of operation are we doing? */
char * oper;
@@ -72,7 +72,7 @@
{
/* Allocate space for internal structure. */
- if ((bsdtar->siginfo = malloc(sizeof(struct siginfo))) == NULL)
+ if ((bsdtar->siginfo = malloc(sizeof(struct siginfo_data))) == NULL)
bsdtar_errc(bsdtar, 1, errno, "malloc failed");
/* Set the strings to NULL so that free() is safe. */
==== //depot/projects/dtrace/www/en/developers.sgml#34 (text+ko) ====
@@ -6,7 +6,7 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/en/developers.sgml,v 1.192 2008/04/22 15:29:45 pgj Exp $
+$FreeBSD: www/en/developers.sgml,v 1.193 2008/05/22 13:03:29 ed Exp $
-->
@@ -148,6 +148,7 @@
<!ENTITY a.dwcjr "David W. Chapman Jr.">
<!ENTITY a.dwhite "Doug White">
<!ENTITY a.dwmalone "David Malone">
+<!ENTITY a.ed "Ed Schouten">
<!ENTITY a.edwin "Edwin Groothuis">
<!ENTITY a.ehaupt "Emanuel Haupt">
<!ENTITY a.eik "Oliver Eikemeier">
==== //depot/projects/dtrace/www/en/gnome/index.xsl#12 (text+ko) ====
@@ -4,7 +4,7 @@
<!ENTITY title "The FreeBSD GNOME Project">
<!ENTITY % navinclude.gnome "INCLUDE">
]>
-<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.99 2008/03/30 18:30:45 marcus Exp $ -->
+<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.100 2008/05/22 18:26:21 mezz Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -99,29 +99,32 @@
<img src="&base;/gnome/images/gnome.png" align="right"
border="0" alt="GNOME Logo"/>
- <p>GNOME is a complete desktop environment, and a
- comprehensive suite of applications. In GNOME,
- everything is easy to use, attractive, powerful,
- and works the way you expect.</p>
-
- <p>The
- <a href="http://www.gnome.org">GNOME
- desktop</a> is a window-based desktop
- environment that provides many business,
- productivity, and entertainment
- applications, and makes non-GNOME programs
- faster and easier to run. The
- <a href="http://developer.gnome.org">GNOME development
- platform</a> is a collection of
- application-development tools and libraries
- used by many programs, such as <a
- href="http://www.firefox.com">Mozilla
- Firefox</a>.</p>
+ <p>GNOME is a complete graphical desktop for X,
+ including everything from a window manager to
+ web browsers, audio players, office programs, and
+ more.</p>
<p>The FreeBSD GNOME Project is a team of devoted
developers and users that manage the
integration of GNOME and FreeBSD.</p>
+ <h2>How to install GNOME</h2>
+
+ <p>The easiest way to install GNOME is to install either of
+ the following ports:</p>
+ <ul>
+ <li>x11/gnome2 (the full desktop)</li>
+ <li>x11/gnome2-lite (the minimum desktop environment)</li>
+ </ul>
+
+ <p>And, as desired, one or all of:</p>
+ <ul>
+ <li>x11/gnome2-fifth-toe (common applications)</li>
+ <li>x11/gnome2-power-tools (tools/toys for power users)</li>
+ <li>editors/gnome2-office (office productivity)</li>
+ <li>devel/gnome2-hacker-tools (development tools)</li>
+ </ul>
+
<h2>Upgrading to GNOME 2.22?</h2>
<p>If you are upgrading from GNOME 2.20 to GNOME 2.22, read the
@@ -147,11 +150,11 @@
<h2>Resources</h2>
<ul>
<li><a href="http://www.gnome.org/">GNOME Project</a></li>
+ <li><a href="http://developer.gnome.org">GNOME development platform</a></li>
<li><a href="http://gnomedesktop.org">FootNotes</a></li>
<li><a href="http://www.gnomejournal.org">GNOME Journal</a></li>
- <li><a
- href="http://www.gnomefiles.org">GNOME
- Files</a></li>
+ <li><a href="http://www.gnomefiles.org">GNOME Files</a></li>
+ <li><a href="http://planet.gnome.org">Planet GNOME (blogs)</a></li>
</ul>
<h2>Related Projects</h2>
==== //depot/projects/dtrace/www/share/sgml/news.xml#48 (text+ko) ====
@@ -20,7 +20,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.161 2008/05/14 22:54:14 brd Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.162 2008/05/22 13:11:51 ed Exp $
</cvs:keyword>
</cvs:keywords>
@@ -30,6 +30,16 @@
<month>
<name>5</name>
<day>
+ <name>22</name>
+
+ <event>
+ <p>New committer: <a href="mailto:ed at FreeBSD.org">Ed
+ Schouten</a> (src)</p>
+ </event>
+
+ </day>
+
+ <day>
<name>14</name>
<event>
More information about the p4-projects
mailing list