[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:37:51 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/71c478d74e2f
changeset: 357:71c478d74e2f
user: ray at terran.dlink.ua
date: Fri Mar 02 16:55:25 2012 +0200
description:
Update to FreeBSD-HEAD @232391
diffstat:
head/share/man/man3/Makefile | 3 +-
head/share/man/man3/pthread_getthreadid_np.3 | 6 +-
head/share/man/man4/Makefile | 4 +-
head/share/man/man4/acpi_panasonic.4 | 6 +-
head/share/man/man4/ada.4 | 5 +-
head/share/man/man4/agp.4 | 14 +-
head/share/man/man4/ahci.4 | 4 +-
head/share/man/man4/amdtemp.4 | 62 +++++++++---
head/share/man/man4/ata.4 | 6 +-
head/share/man/man4/ath.4 | 6 +-
head/share/man/man4/cd.4 | 6 +-
head/share/man/man4/cxgbe.4 | 33 ++++--
head/share/man/man4/da.4 | 6 +-
head/share/man/man4/ed.4 | 12 +-
head/share/man/man4/faith.4 | 6 +-
head/share/man/man4/icmp6.4 | 14 +-
head/share/man/man4/ip6.4 | 32 +++---
head/share/man/man4/isci.4 | 18 ++-
head/share/man/man4/lagg.4 | 24 ++++-
head/share/man/man4/lmc.4 | 6 +-
head/share/man/man4/mac_lomac.4 | 6 +-
head/share/man/man4/mem.4 | 6 +-
head/share/man/man4/mos.4 | 8 +-
head/share/man/man4/mps.4 | 91 +++++++++++++----
head/share/man/man4/mtio.4 | 42 ++++----
head/share/man/man4/natm.4 | 10 +-
head/share/man/man4/net80211.4 | 6 +-
head/share/man/man4/netmap.4 | 24 +++-
head/share/man/man4/ng_async.4 | 8 +-
head/share/man/man4/ng_bridge.4 | 36 +++---
head/share/man/man4/ng_btsocket.4 | 6 +-
head/share/man/man4/ng_car.4 | 32 +++---
head/share/man/man4/ng_ccatm.4 | 6 +-
head/share/man/man4/ng_cisco.4 | 6 +-
head/share/man/man4/ng_etf.4 | 4 +-
head/share/man/man4/ng_hci.4 | 36 +++---
head/share/man/man4/ng_l2cap.4 | 8 +-
head/share/man/man4/ng_l2tp.4 | 16 +-
head/share/man/man4/ng_mppc.4 | 4 +-
head/share/man/man4/ng_netflow.4 | 10 +-
head/share/man/man4/ng_one2many.4 | 14 +-
head/share/man/man4/ng_ppp.4 | 10 +-
head/share/man/man4/ng_pppoe.4 | 12 +-
head/share/man/man4/ng_pptpgre.4 | 10 +-
head/share/man/man4/pcm.4 | 5 +-
head/share/man/man4/ppi.4 | 6 +-
head/share/man/man4/sbp.4 | 6 +-
head/share/man/man4/sdhci.4 | 6 +-
head/share/man/man4/sfxge.4 | 8 +-
head/share/man/man4/tcp.4 | 73 ++++++++++++++-
head/share/man/man4/u3g.4 | 8 +-
head/share/man/man4/umcs.4 | 12 +-
head/share/man/man4/usb.4 | 3 +-
head/share/man/man4/usb_quirk.4 | 8 +-
head/share/man/man4/vr.4 | 6 +-
head/share/man/man4/wlan.4 | 7 +-
head/share/man/man5/devfs.5 | 28 +++++-
head/share/man/man5/fs.5 | 8 +-
head/share/man/man5/passwd.5 | 4 +-
head/share/man/man5/periodic.conf.5 | 26 ++++-
head/share/man/man5/portindex.5 | 6 +-
head/share/man/man5/rc.conf.5 | 61 ++++++++++--
head/share/man/man5/src.conf.5 | 49 +++++++++-
head/share/man/man7/hier.7 | 4 +-
head/share/man/man7/ports.7 | 13 +-
head/share/man/man7/security.7 | 6 +-
head/share/man/man9/DEVICE_PROBE.9 | 6 +-
head/share/man/man9/MD5.9 | 4 +-
head/share/man/man9/Makefile | 6 +-
head/share/man/man9/bios.9 | 6 +-
head/share/man/man9/bus_dma.9 | 4 +-
head/share/man/man9/bus_space.9 | 130 +++++++++++++-------------
head/share/man/man9/byteorder.9 | 4 +-
head/share/man/man9/contigmalloc.9 | 4 +-
head/share/man/man9/crypto.9 | 28 ++--
head/share/man/man9/device_set_flags.9 | 6 +-
head/share/man/man9/devstat.9 | 6 +-
head/share/man/man9/devtoname.9 | 13 +--
head/share/man/man9/domain.9 | 14 +-
head/share/man/man9/eventtimers.9 | 4 +-
head/share/man/man9/get_cyclecount.9 | 4 +-
head/share/man/man9/ifnet.9 | 69 ++++++++++---
head/share/man/man9/kqueue.9 | 6 +-
head/share/man/man9/mbchain.9 | 12 +-
head/share/man/man9/mbuf_tags.9 | 12 +-
head/share/man/man9/mdchain.9 | 20 ++--
head/share/man/man9/namei.9 | 11 +-
head/share/man/man9/netisr.9 | 4 +-
head/share/man/man9/pci.9 | 82 +++++++++++------
head/share/man/man9/random.9 | 4 +-
head/share/man/man9/rijndael.9 | 22 ++--
head/share/man/man9/sysctl.9 | 6 +-
head/share/man/man9/zone.9 | 8 +-
head/share/misc/bsd-family-tree | 5 +-
head/share/misc/committers-doc.dot | 4 +-
head/share/misc/committers-ports.dot | 10 +-
head/share/misc/committers-src.dot | 6 +-
head/share/mk/bsd.kmod.mk | 4 +-
head/share/mk/bsd.own.mk | 20 +++-
head/share/mk/bsd.sys.mk | 18 ++-
100 files changed, 1005 insertions(+), 594 deletions(-)
diffs (4527 lines):
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man3/Makefile
--- a/head/share/man/man3/Makefile Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man3/Makefile Fri Mar 02 16:55:25 2012 +0200
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 12/13/93
-# $FreeBSD: head/share/man/man3/Makefile 228913 2011-12-27 13:01:10Z ed $
+# $FreeBSD: head/share/man/man3/Makefile 231191 2012-02-08 08:42:17Z kevlo $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@
fpgetround.3 \
intro.3 \
makedev.3 \
+ offsetof.3 \
${PTHREAD_MAN} \
queue.3 \
siginfo.3 \
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man3/pthread_getthreadid_np.3
--- a/head/share/man/man3/pthread_getthreadid_np.3 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man3/pthread_getthreadid_np.3 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man3/pthread_getthreadid_np.3 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd February 7, 2011
+.Dd February 25, 2012
.Dt PTHREAD_GETTHREADID_NP 3
.Os
.Sh NAME
@@ -42,7 +42,7 @@
function returns the unique integral ID of the calling thread.
Its semantics is similar to the AIX's
.Fn pthread_getthreadid_np
-functuion.
+function.
.Sh RETURN VALUES
The
.Fn pthread_getthreadid_np
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/Makefile
--- a/head/share/man/man4/Makefile Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/Makefile Fri Mar 02 16:55:25 2012 +0200
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: head/share/man/man4/Makefile 230843 2012-01-31 19:38:18Z jimharris $
+# $FreeBSD: head/share/man/man4/Makefile 232337 2012-03-01 13:10:18Z mav $
MAN= aac.4 \
acpi.4 \
@@ -328,6 +328,7 @@
${_nvram.4} \
${_nvram2env.4} \
${_nxge.4} \
+ oce.4 \
ohci.4 \
orm.4 \
${_padlock.4} \
@@ -413,6 +414,7 @@
snd_fm801.4 \
snd_gusc.4 \
snd_hda.4 \
+ snd_hdspe.4 \
snd_ich.4 \
snd_maestro3.4 \
snd_maestro.4 \
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/acpi_panasonic.4
--- a/head/share/man/man4/acpi_panasonic.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/acpi_panasonic.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/acpi_panasonic.4 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd February 8, 2010
+.Dd February 25, 2012
.Dt ACPI_PANASONIC 4
.Os
.Sh NAME
@@ -66,7 +66,7 @@
sound mute state via
.Xr sysctl 8 .
.Ss Hotkeys
-There are 9 hotkeys available on the supported hardwares:
+There are 9 hotkeys available on the supported hardware:
.Pp
.Bl -tag -compact -offset indent
.It Sy Fn+F1
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ada.4
--- a/head/share/man/man4/ada.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ada.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/ada.4 220454 2011-04-08 14:42:29Z mav $
+.\" $FreeBSD: head/share/man/man4/ada.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd April 8, 2011
+.Dd February 8, 2012
.Dt ADA 4
.Os
.Sh NAME
@@ -139,7 +139,6 @@
ATA device nodes
.El
.Sh SEE ALSO
-.Xr ad 4 ,
.Xr ahci 4 ,
.Xr cam 4 ,
.Xr da 4 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/agp.4
--- a/head/share/man/man4/agp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/agp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/agp.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd November 28, 2007
.Dt AGP 4
@@ -80,8 +80,8 @@
.Bd -literal
typedef struct _agp_info {
agp_version version; /* version of the driver */
- u_int32_t bridge_id; /* bridge vendor/device */
- u_int32_t agp_mode; /* mode info of bridge */
+ uint32_t bridge_id; /* bridge vendor/device */
+ uint32_t agp_mode; /* mode info of bridge */
off_t aper_base; /* base of aperture */
size_t aper_size; /* size of aperture */
size_t pg_total; /* max pages (swap + system) */
@@ -105,7 +105,7 @@
takes the following structure:
.Bd -literal
typedef struct _agp_setup {
- u_int32_t agp_mode; /* mode info of bridge */
+ uint32_t agp_mode; /* mode info of bridge */
} agp_setup;
.Ed
.Pp
@@ -120,8 +120,8 @@
typedef struct _agp_allocate {
int key; /* tag of allocation */
size_t pg_count; /* number of pages */
- u_int32_t type; /* 0 == normal, other devspec */
- u_int32_t physical; /* device specific (some devices
+ uint32_t type; /* 0 == normal, other devspec */
+ uint32_t physical; /* device specific (some devices
* need a phys address of the
* actual page behind the gatt
* table) */
@@ -159,7 +159,7 @@
.Bd -literal
typedef struct _agp_unbind {
int key; /* tag of allocation */
- u_int32_t priority; /* priority for paging out */
+ uint32_t priority; /* priority for paging out */
} agp_unbind;
.Ed
.El
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ahci.4
--- a/head/share/man/man4/ahci.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ahci.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/ahci.4 228305 2011-12-06 09:12:11Z mav $
+.\" $FreeBSD: head/share/man/man4/ahci.4 232380 2012-03-02 08:49:07Z mav $
.\"
.Dd December 6, 2011
.Dt AHCI 4
@@ -146,7 +146,7 @@
.Pp
Also, in cooperation with atamarvell and atajmicron drivers of ata(4),
it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers,
-such as JMicron JMB36x and Marvell 88SX61xx.
+such as JMicron JMB36x and Marvell 88SE61xx.
.Sh FILES
.Bl -tag -width /dev/led/ahcich*.locate
.It Pa /dev/led/ahcich*.act
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/amdtemp.4
--- a/head/share/man/man4/amdtemp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/amdtemp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,14 +23,16 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/amdtemp.4 232119 2012-02-24 17:53:24Z jkim $
.\"
-.Dd April 8, 2008
+.Dd February 23, 2012
.Dt AMDTEMP 4
.Os
.Sh NAME
.Nm amdtemp
-.Nd device driver for AMD K8, K10 and K11 on-die digital thermal sensor
+.Nd device driver for
+.Tn AMD
+processor on-die digital thermal sensor
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following line in your
@@ -49,22 +51,39 @@
The
.Nm
driver provides support for the on-die digital thermal sensor present
-in AMD K8, K10 and K11 processors.
+in
+.Tn AMD
+Family 0Fh, 10h, 11h, 12h, 14h, and 15h processors.
.Pp
-For the K8 family, the
+For Family 0Fh processors, the
.Nm
-driver reports each core's temperature through a sysctl node in the
-corresponding CPU devices's sysctl tree, named
-.Va dev.amdtemp.%d.sensor{0,1}.core{0,1} .
+driver reports each core's temperature through sysctl nodes, named
+.Va dev.amdtemp.%d.core{0,1}.sensor{0,1} .
The driver also creates
.Va dev.cpu.%d.temperature
-displaying the maximum temperature of the two sensors
-located in each CPU core.
+in the corresponding CPU device's sysctl tree, displaying the maximum
+temperature of the two sensors located in each CPU core.
.Pp
-For the K10 and K11 families, the driver creates
+For Family 10h, 11h, 12h, 14h, and 15h processors, the driver reports each
+package's temperature through a sysctl node, named
+.Va dev.amdtemp.%d.core0.sensor0 .
+The driver also creates
.Va dev.cpu.%d.temperature
-with the temperature of each core.
+in the corresponding CPU device's sysctl tree, displaying the temperature
+of the shared sensor located in each CPU package.
+.Sh SYSCTL VARIABLES
+The following variable is available as both
+.Xr sysctl 8
+variable and
+.Xr loader 8
+tunable:
+.Bl -tag -width indent
+.It Va dev.amdtemp.%d.sensor_offset
+.El
+Add the given offset to the temperature of the sensor.
+Default is 0.
.Sh SEE ALSO
+.Xr loader 8 ,
.Xr sysctl 8
.Sh HISTORY
The
@@ -74,6 +93,19 @@
.Sh AUTHORS
.An Rui Paulo Aq rpaulo at FreeBSD.org
.An Norikatsu Shigemura Aq nork at FreeBSD.org
-.Sh BUGS
-AMD K9 is not supported because temperature reporting has been replaced
-by Maltese.
+.An Jung-uk Kim Aq jkim at FreeBSD.org
+.Sh CAVEATS
+For Family 10h and later processors,
+.Do
+(the reported temperature) is a non-physical temperature measured on
+an arbitrary scale and it does not represent an actual physical
+temperature like die or case temperature.
+Instead, it specifies the processor temperature relative to the point
+at which the system must supply the maximum cooling for the processor's
+specified maximum case temperature and maximum thermal power dissipation
+.Dc
+according to
+.Rs
+.%T BIOS and Kernel Developer's Guide (BKDG) for AMD Processors
+.%U http://developer.amd.com/documentation/guides/Pages/default.aspx
+.Re
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ata.4
--- a/head/share/man/man4/ata.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ata.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/ata.4 225352 2011-09-02 18:52:28Z brueffer $
+.\" $FreeBSD: head/share/man/man4/ata.4 232380 2012-03-02 08:49:07Z mav $
.\"
.Dd August 17, 2011
.Dt ATA 4
@@ -193,8 +193,8 @@
.It JMicron:
JMB360, JMB361, JMB363, JMB365, JMB366, JMB368.
.It Marvell
-88SX5040, 88SX5041, 88SX5080, 88SX5081, 88SX6041, 88SX6042, 88SX6081, 88SX6101,
-88SX6102, 88SX6111, 88SX6121, 88SX6141, 88SX6145, 88SX7042.
+88SX5040, 88SX5041, 88SX5080, 88SX5081, 88SX6041, 88SX6042, 88SX6081, 88SE6101,
+88SE6102, 88SE6111, 88SE6121, 88SE6141, 88SE6145, 88SX7042.
.It National:
SC1100.
.It NetCell:
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ath.4
--- a/head/share/man/man4/ath.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ath.4 Fri Mar 02 16:55:25 2012 +0200
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGES.
.\"
-.\" $FreeBSD: head/share/man/man4/ath.4 225228 2011-08-28 10:10:31Z brueffer $
+.\" $FreeBSD: head/share/man/man4/ath.4 232250 2012-02-28 13:19:34Z gavin $
.\"/
.Dd August 28, 2011
.Dt ATH 4
@@ -95,8 +95,8 @@
AR5416-class devices are capable of 802.11n operation
but are supported only in legacy modes (802.11a, 11b, 11g).
Most chips also support an Atheros Turbo Mode (TM) that operates in
-the 5Ghz frequency range with 2x the transmit speeds.
-Some chips also support Turbo mode in the 2.4Ghz range with 802.11g
+the 5GHz frequency range with 2x the transmit speeds.
+Some chips also support Turbo mode in the 2.4GHz range with 802.11g
though this support is not presently available due to regulatory requirements.
(Note that Turbo modes are, however,
only interoperable with other Atheros-based devices.)
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/cd.4
--- a/head/share/man/man4/cd.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/cd.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/cd.4 220617 2011-04-14 08:53:04Z pluknet $
+.\" $FreeBSD: head/share/man/man4/cd.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd January 8, 2009
+.Dd February 8, 2012
.Dt CD 4
.Os
.Sh NAME
@@ -52,7 +52,7 @@
.Tn CD-ROM
is unmounted.
In general the interfaces are similar to those described by
-.Xr ad 4
+.Xr ada 4
and
.Xr da 4 .
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/cxgbe.4
--- a/head/share/man/man4/cxgbe.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/cxgbe.4 Fri Mar 02 16:55:25 2012 +0200
@@ -29,9 +29,9 @@
.\"
.\" * Other names and brands may be claimed as the property of others.
.\"
-.\" $FreeBSD: head/share/man/man4/cxgbe.4 228561 2011-12-16 02:09:51Z np $
+.\" $FreeBSD: head/share/man/man4/cxgbe.4 232158 2012-02-25 15:21:43Z gjb $
.\"
-.Dd February 14, 2011
+.Dd February 25, 2012
.Dt CXGBE 4
.Os
.Sh NAME
@@ -56,7 +56,7 @@
.Nm
driver provides support for PCI Express Ethernet adapters based on
the Chelsio Terminator 4 (T4) ASIC.
-The driver supprts Jumbo Frames, Transmit/Receive checksum offload,
+The driver supports Jumbo Frames, Transmit/Receive checksum offload,
TCP segmentation offload (TSO), Large Receive Offload (LRO), VLAN
tag insertion/extraction, VLAN checksum offload, VLAN TSO, and
Receive Side Steering (RSS).
@@ -100,28 +100,36 @@
.Xr loader.conf 5 .
.Bl -tag -width indent
.It Va hw.cxgbe.ntxq10g
-The number of tx queues to use for a 10Gb port. The default is 16 or the number
+The number of tx queues to use for a 10Gb port.
+The default is 16 or the number
of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nrxq10g
-The number of rx queues to use for a 10Gb port. The default is 8 or the number
+The number of rx queues to use for a 10Gb port.
+The default is 8 or the number
of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.ntxq1g
-The number of tx queues to use for a 1Gb port. The default is 4 or the number
+The number of tx queues to use for a 1Gb port.
+The default is 4 or the number
of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nrxq1g
-The number of rx queues to use for a 1Gb port. The default is 2 or the number
+The number of rx queues to use for a 1Gb port.
+The default is 2 or the number
of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nofldtxq10g
-The number of TOE tx queues to use for a 10Gb port. The default is 8 or the
+The number of TOE tx queues to use for a 10Gb port.
+The default is 8 or the
number of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nofldrxq10g
-The number of TOE rx queues to use for a 10Gb port. The default is 2 or the
+The number of TOE rx queues to use for a 10Gb port.
+The default is 2 or the
number of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nofldtxq1g
-The number of TOE tx queues to use for a 1Gb port. The default is 2 or the
+The number of TOE tx queues to use for a 1Gb port.
+The default is 2 or the
number of CPU cores in the system, whichever is less.
.It Va hw.cxgbe.nofldrxq1g
-The number of TOE rx queues to use for a 1Gb port. The default is 1.
+The number of TOE rx queues to use for a 1Gb port.
+The default is 1.
.It Va hw.cxgbe.holdoff_timer_idx_10G
.It Va hw.cxgbe.holdoff_timer_idx_1G
The timer index value to use to delay interrupts.
@@ -149,7 +157,8 @@
The size, in number of entries, of the descriptor ring used for a tx
queue.
A buf_ring of the same size is also allocated for additional
-software queuing. See
+software queuing.
+See
.Xr ifnet 9 .
The default value is 1024.
Different cxgbe interfaces can be assigned different values via the
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/da.4
--- a/head/share/man/man4/da.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/da.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/da.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd September 2, 2003
+.Dd February 8, 2012
.Dt DA 4
.Os
.Sh NAME
@@ -195,7 +195,7 @@
.Sh DIAGNOSTICS
None.
.Sh SEE ALSO
-.Xr ad 4 ,
+.Xr ada 4 ,
.Xr cam 4 ,
.Xr geom 4 ,
.Xr bsdlabel 8 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ed.4
--- a/head/share/man/man4/ed.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ed.4 Fri Mar 02 16:55:25 2012 +0200
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/ed.4 230525 2012-01-25 04:45:29Z imp $
+.\" $FreeBSD: head/share/man/man4/ed.4 232158 2012-02-25 15:21:43Z gjb $
.\"
-.Dd April 9, 2009
+.Dd February 25, 2012
.Dt ED 4
.Os
.Sh NAME
@@ -289,7 +289,7 @@
.It
Surecom NE-34
.It
-TDK 3000/3400/5670 Fast Etherenet/Modem
+TDK 3000/3400/5670 Fast Ethernet/Modem
.It
TDK LAK-CD031, Grey Cell GCS2000 Ethernet Card
.It
@@ -423,8 +423,8 @@
As a result, it may throw out some good packets which
have been received but not yet transferred from the card to main memory.
.Pp
-The
-.Nm
+The
+.Nm
driver is slow by today's standards.
.Pp
PC Card attachment supports the D-Link DMF650TX LAN/Modem card's Ethernet
@@ -435,7 +435,7 @@
do not generate the link state change events used by
.Xr devd 8
to start
-.Xr dhclinet 8 .
+.Xr dhclient 8 .
If you have problems with
.Xr dhclient 8
not starting and the device is always attached to the network it may
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/faith.4
--- a/head/share/man/man4/faith.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/faith.4 Fri Mar 02 16:55:25 2012 +0200
@@ -27,9 +27,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/faith.4 231852 2012-02-17 02:39:58Z bz $
.\"
-.Dd April 10, 1999
+.Dd January 23, 2012
.Dt FAITH 4
.Os
.Sh NAME
@@ -58,7 +58,7 @@
.Xr rc.conf 5 .
.Pp
Special action will be taken when IPv6 TCP traffic is seen on a router,
-and the routing table suggests to route it to the
+and the default routing table suggests to route it to the
.Nm
interface.
In this case, the packet will be accepted by the router,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/icmp6.4
--- a/head/share/man/man4/icmp6.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/icmp6.4 Fri Mar 02 16:55:25 2012 +0200
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/icmp6.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd December 20, 2004
.Dt ICMP6 4
@@ -140,13 +140,13 @@
structure and has the following definition:
.Bd -literal -offset indent
struct icmp6_hdr {
- u_int8_t icmp6_type; /* type field */
- u_int8_t icmp6_code; /* code field */
- u_int16_t icmp6_cksum; /* checksum field */
+ uint8_t icmp6_type; /* type field */
+ uint8_t icmp6_code; /* code field */
+ uint16_t icmp6_cksum; /* checksum field */
union {
- u_int32_t icmp6_un_data32[1]; /* type-specific */
- u_int16_t icmp6_un_data16[2]; /* type-specific */
- u_int8_t icmp6_un_data8[4]; /* type-specific */
+ uint32_t icmp6_un_data32[1]; /* type-specific */
+ uint16_t icmp6_un_data16[2]; /* type-specific */
+ uint8_t icmp6_un_data8[4]; /* type-specific */
} icmp6_dataun;
} __packed;
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ip6.4
--- a/head/share/man/man4/ip6.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ip6.4 Fri Mar 02 16:55:25 2012 +0200
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ip6.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 13, 2011
.Dt IP6 4
@@ -75,12 +75,12 @@
struct ip6_hdr {
union {
struct ip6_hdrctl {
- u_int32_t ip6_un1_flow; /* 20 bits of flow ID */
- u_int16_t ip6_un1_plen; /* payload length */
- u_int8_t ip6_un1_nxt; /* next header */
- u_int8_t ip6_un1_hlim; /* hop limit */
+ uint32_t ip6_un1_flow; /* 20 bits of flow ID */
+ uint16_t ip6_un1_plen; /* payload length */
+ uint8_t ip6_un1_nxt; /* next header */
+ uint8_t ip6_un1_hlim; /* hop limit */
} ip6_un1;
- u_int8_t ip6_un2_vfc; /* version and class */
+ uint8_t ip6_un2_vfc; /* version and class */
} ip6_ctlun;
struct in6_addr ip6_src; /* source address */
struct in6_addr ip6_dst; /* destination address */
@@ -121,8 +121,8 @@
with the following generic definition:
.Bd -literal -offset indent
struct ip6_ext {
- u_int8_t ip6e_nxt;
- u_int8_t ip6e_len;
+ uint8_t ip6e_nxt;
+ uint8_t ip6e_len;
} __packed;
.Ed
.Ss Options
@@ -281,8 +281,8 @@
returned:
.Bd -literal
struct ip6_hbh {
- u_int8_t ip6h_nxt; /* next header */
- u_int8_t ip6h_len; /* length in units of 8 octets */
+ uint8_t ip6h_nxt; /* next header */
+ uint8_t ip6h_len; /* length in units of 8 octets */
/* followed by options */
} __packed;
.Ed
@@ -301,8 +301,8 @@
returned:
.Bd -literal
struct ip6_dest {
- u_int8_t ip6d_nxt; /* next header */
- u_int8_t ip6d_len; /* length in units of 8 octets */
+ uint8_t ip6d_nxt; /* next header */
+ uint8_t ip6d_len; /* length in units of 8 octets */
/* followed by options */
} __packed;
.Ed
@@ -333,10 +333,10 @@
returned:
.Bd -literal
struct ip6_rthdr {
- u_int8_t ip6r_nxt; /* next header */
- u_int8_t ip6r_len; /* length in units of 8 octets */
- u_int8_t ip6r_type; /* routing type */
- u_int8_t ip6r_segleft; /* segments left */
+ uint8_t ip6r_nxt; /* next header */
+ uint8_t ip6r_len; /* length in units of 8 octets */
+ uint8_t ip6r_type; /* routing type */
+ uint8_t ip6r_segleft; /* segments left */
/* followed by routing-type-specific data */
} __packed;
.Ed
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/isci.4
--- a/head/share/man/man4/isci.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/isci.4 Fri Mar 02 16:55:25 2012 +0200
@@ -31,7 +31,7 @@
.\"
.\" Author: Jim Harris <jimharris at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/isci.4 232056 2012-02-23 18:48:02Z brueffer $
.\"
.Dd January 23, 2012
.Dt ISCI 4
@@ -52,12 +52,12 @@
.Bd -literal -offset indent
isci_load="YES"
.Ed
-.Sh DESCRIPTION
+.Sh HARDWARE
The
.Nm
driver provides support for Intel C600
.Tn SAS
-controller.
+controllers.
.Sh CONFIGURATION
To force legacy interrupts for all
.Nm
@@ -77,9 +77,11 @@
variable to a value between 1 and 4 in
.Xr loader.conf 5 .
.Pp
-The hardware layer in the isci driver has extensive logging capabilities
-which are disabled by default for performance reasons. These can be enabled
-by adding
+The hardware layer in the
+.Nm
+driver has extensive logging capabilities
+which are disabled by default for performance reasons.
+These can be enabled by adding
.Bd -literal -offset indent
options ISCI_LOGGING
.Ed
@@ -91,12 +93,12 @@
.Xr da 4 ,
.Xr pci 4 ,
.Xr sa 4 ,
-.Xr scsi 4 .
+.Xr scsi 4
.Sh HISTORY
The
.Nm
driver first appeared in
-.Fx 10.0 .
+.Fx 8.3 and 9.1 .
.Sh AUTHORS
.An -nosplit
The
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/lagg.4
--- a/head/share/man/man4/lagg.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/lagg.4 Fri Mar 02 16:55:25 2012 +0200
@@ -14,9 +14,9 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/lagg.4 232089 2012-02-23 23:37:29Z thompsa $
.\"
-.Dd October 18, 2010
+.Dd February 23, 2012
.Dt LAGG 4
.Os
.Sh NAME
@@ -88,8 +88,9 @@
which is useful for certain bridged network setups.
.It Ic fec
Supports Cisco EtherChannel.
-This is a static setup and does not negotiate aggregation with the peer or
-exchange frames to monitor the link.
+This is an alias for
+.Ic loadbalance
+mode.
.It Ic lacp
Supports the IEEE 802.3ad Link Aggregation Control Protocol (LACP) and the
Marker Protocol.
@@ -133,6 +134,21 @@
.Pp
The MTU of the first interface to be added is used as the lagg MTU.
All additional interfaces are required to have exactly the same value.
+.Pp
+The
+.Ic loadbalance
+and
+.Ic lacp
+modes will use the RSS hash from the network card if available to avoid
+computing one, this may give poor traffic distribution if the hash is invalid
+or uses less of the protocol header information.
+Local hash computation can be forced per interface by setting the
+.Va net.link.lagg.X.use_flowid
+.Xr sysctl 8
+variable to zero where X is the interface number.
+The default for new interfaces is set via the
+.Va net.link.lagg.default_use_flowid
+.Xr sysctl 8 .
.Sh EXAMPLES
Create a 802.3ad link aggregation using LACP with two
.Xr bge 4
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/lmc.4
--- a/head/share/man/man4/lmc.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/lmc.4 Fri Mar 02 16:55:25 2012 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: head/share/man/man4/lmc.4 224284 2011-07-23 22:55:32Z gjb $
+.\" $FreeBSD: head/share/man/man4/lmc.4 231244 2012-02-09 04:37:30Z gjb $
.\"
.\" Copyright (c) 2002-2005 David Boggs. (boggs at boggs.palo-alto.ca.us)
.\" All rights reserved.
@@ -43,7 +43,7 @@
.\" this program; if not, write to the Free Software Foundation, Inc., 59
.\" Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.\"
-.Dd July 23, 2011
+.Dd February 8, 2012
.Dt LMC 4
.Os
.\"
@@ -179,7 +179,7 @@
This driver is compatible with several line protocol packages:
.Bl -tag -width "Generic HDLC"
.It Sy "Netgraph"
-.Xr Netgraph 4
+.Xr netgraph 4
implements many basic packet-handling functions as kernel loadable modules.
They can be interconnected in a graph to implement many protocols.
Configuration is done from userland without rebuilding the kernel.
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/mac_lomac.4
--- a/head/share/man/man4/mac_lomac.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/mac_lomac.4 Fri Mar 02 16:55:25 2012 +0200
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mac_lomac.4 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd December 11, 2002
+.Dd February 25, 2012
.Dt MAC_LOMAC 4
.Os
.Sh NAME
@@ -63,7 +63,7 @@
an information flow policy coupled with the subject demotion
via floating labels.
In LOMAC, all system subjects and objects are assigned integrity labels, made
-up of one or more hierarchial grades, depending on the their types.
+up of one or more hierarchical grades, depending on the their types.
Together, these label elements permit all labels to be placed in a partial
order, with information flow protections and demotion decisions
based on a dominance operator
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/mem.4
--- a/head/share/man/man4/mem.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/mem.4 Fri Mar 02 16:55:25 2012 +0200
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mem.4 5.3 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mem.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd October 3, 2004
.Dt MEM 4
@@ -101,8 +101,8 @@
Memory ranges are described by
.Vt struct mem_range_desc :
.Bd -literal -offset indent
-u_int64_t mr_base; /\(** physical base address \(**/
-u_int64_t mr_len; /\(** physical length of region \(**/
+uint64_t mr_base; /\(** physical base address \(**/
+uint64_t mr_len; /\(** physical length of region \(**/
int mr_flags; /\(** attributes of region \(**/
char mr_owner[8];
.Ed
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/mos.4
--- a/head/share/man/man4/mos.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/mos.4 Fri Mar 02 16:55:25 2012 +0200
@@ -13,14 +13,14 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mos.4 232257 2012-02-28 15:45:42Z kevlo $
.\"
.Dd February 14, 2011
.Dt MOS 4
.Os
.Sh NAME
.Nm mos
-.Nd Moschip MCS7730/MCS7840 USB Ethernet driver
+.Nd Moschip MCS7730/MCS7830/MCS7832 USB Ethernet driver
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following lines in your
@@ -44,9 +44,9 @@
The
.Nm
driver provides support for USB Ethernet adapters based on the
-Moschip MCS7730/MCS7830 chipset.
+Moschip MCS7730/MCS7830/MCS7832 chipset.
.Pp
-The adapters that contain the Moschip MCS7730/MCS7830 chipset
+The adapters that contain the Moschip MCS7730/MCS7830/MCS7832 chipset
will operate at 100Base-TX and full-duplex.
.Pp
The Moschip contains a 10/100
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/mps.4
--- a/head/share/man/man4/mps.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/mps.4 Fri Mar 02 16:55:25 2012 +0200
@@ -31,10 +31,10 @@
.\"
.\" Author: Ken Merry <ken at FreeBSD.org>
.\"
-.\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#4 $
-.\" $FreeBSD: head/share/man/man4/mps.4 227448 2011-11-11 12:06:09Z brueffer $
+.\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $
+.\" $FreeBSD: head/share/man/man4/mps.4 231170 2012-02-07 23:43:29Z ken $
.\"
-.Dd September 13, 2010
+.Dd February 7, 2012
.Dt MPS 4
.Os
.Sh NAME
@@ -58,7 +58,7 @@
.Nm
driver provides support for LSI Logic Fusion-MPT 2
.Tn SAS
-controllers.
+controllers and WarpDrive solid state storage cards.
.Sh HARDWARE
The
.Nm
@@ -90,6 +90,16 @@
hw.mps.disable_msi=1
.Ed
.Pp
+To disable MSI interrupts for a specific
+.Nm
+driver instance, set the following tunable value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+dev.mps.X.disable_msi=1
+.Ed
+.Pp
+where X is the adapter number.
+.Pp
To disable MSI-X interrupts for all
.Nm
driver instances, set the following tunable value in
@@ -98,19 +108,51 @@
hw.mps.disable_msix=1
.Ed
.Pp
-To allow the driver to send multiple task management commands (like abort,
-LUN reset, etc.), set the following variable:
+To disable MSI-X interrupts for a specific
+.Nm
+driver instance, set the following tunable value in
+.Xr loader.conf 5 :
.Bd -literal -offset indent
-hw.mps.X.allow_multiple_tm_cmds=1
+dev.mps.X.disable_msix=1
.Ed
.Pp
-via
-.Xr loader.conf 5
-or
-.Xr sysctl 8 ,
-where X is the adapter number.
-By default the driver only sends one task management command at a time, to
-avoid causing a potential controller lock-up.
+To set the maximum number of DMA chains allocated for all adapters,
+set the following variable in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+hw.mps.max_chains=NNNN
+.Ed
+.Pp
+To set the maximum number of DMA chains allocated for a specific adapter,
+set the following variable in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+dev.mps.X.max_chains=NNNN
+.Ed
+.Pp
+This variable may also be viewed via
+.Xr sysctl 8
+to see the maximum set for a given adapter.
+.Pp
+The current number of free chain frames may be seen via the
+dev.mps.X.chain_free
+.Xr sysctl 8
+variable.
+.Pp
+The lowest number of free chain frames may be seen via the
+dev.mps.X.chain_free_lowwater
+.Xr sysctl 8
+variable.
+.Pp
+The current number of active I/O commands is shown in the
+dev.mps.X.io_cmds_active
+.Xr sysctl 8
+variable.
+.Pp
+The maximum number of active I/O command seen since boot is shown in the
+dev.mps.X.io_cmds_highwater
+.Xr sysctl 8
+variable.
.Sh DEBUGGING
To enable debugging prints from the
.Nm
@@ -142,7 +184,9 @@
.Xr pci 4 ,
.Xr sa 4 ,
.Xr scsi 4 ,
-.Xr targ 4
+.Xr targ 4 ,
+.Xr loader.conf 5 ,
+.Xr sysctl 8
.Sh HISTORY
The
.Nm
@@ -154,20 +198,19 @@
.Nm
driver was originally written by
.An Scott Long Aq scottl at FreeBSD.org .
+It has been improved and tested by LSI Logic Corporation.
This man page was written by
.An Ken Merry Aq ken at FreeBSD.org .
.Sh BUGS
-This driver is still in development, it has only been tested on the amd64
-architecture and has some known shortcomings:
+This driver has a couple of known shortcomings:
.Bl -bullet -compact
.It
-No IR (Integrated RAID) support.
+Not endian safe.
+It only works on little endian machines (e.g. amd64 and i386).
.It
-No userland utility support (e.g.
-.Xr mptutil 8).
+No userland utility available (e.g.
+.Xr mptutil 8)
.It
-Sometimes the driver gets into a state where devices arrive and depart multiple
-times, without user intervention.
-.It
-The error recovery code isn't complete.
+The driver probes devices sequentially.
+If your system has a large number of devices, the probe will take a while.
.El
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/mtio.4
--- a/head/share/man/man4/mtio.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/mtio.4 Fri Mar 02 16:55:25 2012 +0200
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mtio.4 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: head/share/man/man4/mtio.4 227418 2011-11-10 11:17:40Z pluknet $
+.\" $FreeBSD: head/share/man/man4/mtio.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd November 11, 2011
.Dt MTIO 4
@@ -175,7 +175,7 @@
#if defined (__FreeBSD__)
int32_t mt_blksiz; /* presently operating blocksize */
int32_t mt_density; /* presently operating density */
- u_int32_t mt_comp; /* presently operating compression */
+ uint32_t mt_comp; /* presently operating compression */
int32_t mt_blksiz0; /* blocksize for mode 0 */
int32_t mt_blksiz1; /* blocksize for mode 1 */
int32_t mt_blksiz2; /* blocksize for mode 2 */
@@ -185,10 +185,10 @@
int32_t mt_density2; /* density for mode 2 */
int32_t mt_density3; /* density for mode 3 */
/* the following are not yet implemented */
- u_int32_t mt_comp0; /* compression type for mode 0 */
- u_int32_t mt_comp1; /* compression type for mode 1 */
- u_int32_t mt_comp2; /* compression type for mode 2 */
- u_int32_t mt_comp3; /* compression type for mode 3 */
+ uint32_t mt_comp0; /* compression type for mode 0 */
+ uint32_t mt_comp1; /* compression type for mode 1 */
+ uint32_t mt_comp2; /* compression type for mode 2 */
+ uint32_t mt_comp3; /* compression type for mode 3 */
/* end not yet implemented */
#endif
int32_t mt_fileno; /* relative file number of current position */
@@ -203,23 +203,23 @@
* Check Condition noted for these operations. The act
* of issuing an MTIOCERRSTAT unlatches and clears them.
*/
- u_int8_t io_sense[32]; /* Last Sense Data For Data I/O */
+ uint8_t io_sense[32]; /* Last Sense Data For Data I/O */
int32_t io_resid; /* residual count from last Data I/O */
- u_int8_t io_cdb[16]; /* Command that Caused the Last Data Sense */
- u_int8_t ctl_sense[32]; /* Last Sense Data For Control I/O */
+ uint8_t io_cdb[16]; /* Command that Caused the Last Data Sense */
+ uint8_t ctl_sense[32]; /* Last Sense Data For Control I/O */
int32_t ctl_resid; /* residual count from last Control I/O */
- u_int8_t ctl_cdb[16]; /* Command that Caused the Last Control Sense */
+ uint8_t ctl_cdb[16]; /* Command that Caused the Last Control Sense */
/*
* These are the read and write cumulative error counters.
* (how to reset cumulative error counters is not yet defined).
* (not implemented as yet but space is being reserved for them)
*/
struct {
- u_int32_t retries; /* total # retries performed */
- u_int32_t corrected; /* total # corrections performed */
- u_int32_t processed; /* total # corrections successful */
- u_int32_t failures; /* total # corrections/retries failed */
- u_int64_t nbytes; /* total # bytes processed */
+ uint32_t retries; /* total # retries performed */
+ uint32_t corrected; /* total # corrections performed */
+ uint32_t processed; /* total # corrections successful */
+ uint32_t failures; /* total # corrections/retries failed */
+ uint64_t nbytes; /* total # bytes processed */
} wterr, rderr;
};
@@ -265,18 +265,18 @@
* rethink these ioctls to support all the entities they haul into
* the picture (64 bit blocks, logical file record numbers, etc..).
*/
-#define MTIOCRDSPOS _IOR('m', 5, u_int32_t) /* get logical blk addr */
-#define MTIOCRDHPOS _IOR('m', 6, u_int32_t) /* get hardware blk addr */
-#define MTIOCSLOCATE _IOW('m', 5, u_int32_t) /* seek to logical blk addr */
-#define MTIOCHLOCATE _IOW('m', 6, u_int32_t) /* seek to hardware blk addr */
+#define MTIOCRDSPOS _IOR('m', 5, uint32_t) /* get logical blk addr */
+#define MTIOCRDHPOS _IOR('m', 6, uint32_t) /* get hardware blk addr */
+#define MTIOCSLOCATE _IOW('m', 5, uint32_t) /* seek to logical blk addr */
+#define MTIOCHLOCATE _IOW('m', 6, uint32_t) /* seek to hardware blk addr */
#define MTIOCERRSTAT _IOR('m', 7, union mterrstat) /* get tape errors */
/*
* Set EOT model- argument is number of filemarks to end a tape with.
* Note that not all possible values will be accepted.
*/
-#define MTIOCSETEOTMODEL _IOW('m', 8, u_int32_t)
+#define MTIOCSETEOTMODEL _IOW('m', 8, uint32_t)
/* Get current EOT model */
-#define MTIOCGETEOTMODEL _IOR('m', 8, u_int32_t)
+#define MTIOCGETEOTMODEL _IOR('m', 8, uint32_t)
#ifndef _KERNEL
#define DEFTAPE "/dev/nsa0"
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/natm.4
--- a/head/share/man/man4/natm.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/natm.4 Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/natm.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd December 29, 1997
.Dt NATM 4
@@ -23,11 +23,11 @@
to specify a virtual circuit:
.Bd -literal -offset indent
struct sockaddr_natm {
- u_int8_t snatm_len; /* length */
- u_int8_t snatm_family; /* AF_NATM */
+ uint8_t snatm_len; /* length */
+ uint8_t snatm_family; /* AF_NATM */
char snatm_if[IFNAMSIZ]; /* interface name */
- u_int16_t snatm_vci; /* vci */
- u_int8_t snatm_vpi; /* vpi */
+ uint16_t snatm_vci; /* vci */
+ uint8_t snatm_vpi; /* vpi */
};
.Ed
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/net80211.4
--- a/head/share/man/man4/net80211.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/net80211.4 Fri Mar 02 16:55:25 2012 +0200
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGES.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/net80211.4 232250 2012-02-28 13:19:34Z gavin $
.\"
.Dd July 10, 2009
.Dt NET80211 4
@@ -64,7 +64,7 @@
.Bd -literal
struct ieee80211req {
char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */
- u_int16_t i_type; /* req type */
+ uint16_t i_type; /* req type */
int16_t i_val; /* Index or simple value */
int16_t i_len; /* Index or simple value */
void *i_data; /* Extra data */
@@ -280,7 +280,7 @@
DFS embodies several facilities including detection of overlapping
radar signals, dynamic transmit power control, and channel selection
according to a least-congested criteria.
-DFS support is mandatory for some 5Ghz frequencies in certain
+DFS support is mandatory for some 5GHz frequencies in certain
locales (e.g. ETSI).
By default DFS is enabled according to the regulatory definitions
and the current country code, regdomain, and channel.
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/netmap.4
--- a/head/share/man/man4/netmap.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/netmap.4 Fri Mar 02 16:55:25 2012 +0200
@@ -25,10 +25,10 @@
.\" This document is derived in part from the enet man page (enet.4)
.\" distributed with 4.3BSD Unix.
.\"
-.\" $FreeBSD: head/share/man/man4/netmap.4 228017 2011-11-27 06:55:57Z gjb $
+.\" $FreeBSD: head/share/man/man4/netmap.4 232238 2012-02-27 19:05:01Z luigi $
.\" $Id: netmap.4 9662 2011-11-16 13:18:06Z luigi $: stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $
.\"
-.Dd November 16, 2011
+.Dd February 27, 2012
.Dt NETMAP 4
.Os
.Sh NAME
@@ -123,8 +123,9 @@
struct netmap_ring {
const ssize_t buf_ofs;
const uint32_t num_slots; /* number of slots in the ring. */
- uint32_t avail; /* number of usable slots */
- uint32_t cur; /* 'current' index for the user side */
+ uint32_t avail; /* number of usable slots */
+ uint32_t cur; /* 'current' index for the user side */
+ uint32_t reserved; /* not refilled before current */
const uint16_t nr_buf_size;
uint16_t flags;
@@ -173,10 +174,14 @@
.Bd -literal
struct nmreq {
char nr_name[IFNAMSIZ];
+ uint32_t nr_version; /* API version */
+#define NETMAP_API 2 /* current version */
uint32_t nr_offset; /* nifp offset in the shared region */
uint32_t nr_memsize; /* size of the shared region */
- uint32_t nr_numdescs; /* descriptors per queue */
- uint16_t nr_numqueues;
+ uint32_t nr_tx_slots; /* slots in tx rings */
+ uint32_t nr_rx_slots; /* slots in rx rings */
+ uint16_t nr_tx_rings; /* number of tx rings */
+ uint16_t nr_rx_rings; /* number of tx rings */
uint16_t nr_ringid; /* ring(s) we care about */
#define NETMAP_HW_RING 0x4000 /* low bits indicate one hw ring */
#define NETMAP_SW_RING 0x2000 /* we process the sw ring */
@@ -199,8 +204,10 @@
returns information about the interface named in nr_name.
On return, nr_memsize indicates the size of the shared netmap
memory region (this is device-independent),
-nr_numslots indicates how many buffers are in a ring,
-nr_numrings indicates the number of rings supported by the hardware.
+nr_tx_slots and nr_rx_slots indicates how many buffers are in a
+transmit and receive ring,
+nr_tx_rings and nr_rx_rings indicates the number of transmit
+and receive rings supported by the hardware.
.Pp
If the device does not support netmap, the ioctl returns EINVAL.
.It Dv NIOCREGIF
@@ -266,6 +273,7 @@
fd = open("/dev/netmap", O_RDWR);
bzero(&nmr, sizeof(nmr));
strcpy(nmr.nm_name, "ix0");
+nmr.nm_version = NETMAP_API;
ioctl(fd, NIOCREG, &nmr);
p = mmap(0, nmr.memsize, fd);
nifp = NETMAP_IF(p, nmr.offset);
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_async.4
--- a/head/share/man/man4/ng_async.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_async.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_async.4 231564 2012-02-12 18:29:56Z ed $
.\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
.\"
.Dd January 19, 1999
@@ -118,9 +118,9 @@
.Bd -literal -offset 4n
struct ng_async_cfg {
u_char enabled; /* Turn encoding on/off */
- u_int16_t amru; /* Max receive async frame len */
- u_int16_t smru; /* Max receive sync frame len */
- u_int32_t accm; /* ACCM encoding */
+ uint16_t amru; /* Max receive async frame len */
+ uint16_t smru; /* Max receive sync frame len */
+ uint32_t accm; /* ACCM encoding */
};
.Ed
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_bridge.4
--- a/head/share/man/man4/ng_bridge.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_bridge.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_bridge.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd May 5, 2010
.Dt NG_BRIDGE 4
@@ -108,9 +108,9 @@
struct ng_bridge_config {
u_char ipfw[NG_BRIDGE_MAX_LINKS]; /* enable ipfw */
u_char debugLevel; /* debug level */
- u_int32_t loopTimeout; /* link loopback mute time */
- u_int32_t maxStaleness; /* max host age before nuking */
- u_int32_t minStableAge; /* min time for a stable host */
+ uint32_t loopTimeout; /* link loopback mute time */
+ uint32_t maxStaleness; /* max host age before nuking */
+ uint32_t minStableAge; /* min time for a stable host */
};
.Ed
.Pp
@@ -155,20 +155,20 @@
.Bd -literal -offset 0n
/* Statistics structure (one for each link) */
struct ng_bridge_link_stats {
- u_int64_t recvOctets; /* total octets rec'd on link */
- u_int64_t recvPackets; /* total pkts rec'd on link */
- u_int64_t recvMulticasts; /* multicast pkts rec'd on link */
- u_int64_t recvBroadcasts; /* broadcast pkts rec'd on link */
- u_int64_t recvUnknown; /* pkts rec'd with unknown dest addr */
- u_int64_t recvRunts; /* pkts rec'd less than 14 bytes */
- u_int64_t recvInvalid; /* pkts rec'd with bogus source addr */
- u_int64_t xmitOctets; /* total octets xmit'd on link */
- u_int64_t xmitPackets; /* total pkts xmit'd on link */
- u_int64_t xmitMulticasts; /* multicast pkts xmit'd on link */
- u_int64_t xmitBroadcasts; /* broadcast pkts xmit'd on link */
- u_int64_t loopDrops; /* pkts dropped due to loopback */
- u_int64_t loopDetects; /* number of loop detections */
- u_int64_t memoryFailures; /* times couldn't get mem or mbuf */
+ uint64_t recvOctets; /* total octets rec'd on link */
+ uint64_t recvPackets; /* total pkts rec'd on link */
+ uint64_t recvMulticasts; /* multicast pkts rec'd on link */
+ uint64_t recvBroadcasts; /* broadcast pkts rec'd on link */
+ uint64_t recvUnknown; /* pkts rec'd with unknown dest addr */
+ uint64_t recvRunts; /* pkts rec'd less than 14 bytes */
+ uint64_t recvInvalid; /* pkts rec'd with bogus source addr */
+ uint64_t xmitOctets; /* total octets xmit'd on link */
+ uint64_t xmitPackets; /* total pkts xmit'd on link */
+ uint64_t xmitMulticasts; /* multicast pkts xmit'd on link */
+ uint64_t xmitBroadcasts; /* broadcast pkts xmit'd on link */
+ uint64_t loopDrops; /* pkts dropped due to loopback */
+ uint64_t loopDetects; /* number of loop detections */
+ uint64_t memoryFailures; /* times couldn't get mem or mbuf */
};
.Ed
.It Dv NGM_BRIDGE_CLR_STATS
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_btsocket.4
--- a/head/share/man/man4/ng_btsocket.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_btsocket.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: ng_btsocket.4,v 1.7 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_btsocket.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd July 8, 2002
.Dt NG_BTSOCKET 4
@@ -154,7 +154,7 @@
struct sockaddr_l2cap {
u_char l2cap_len; /* total length */
u_char l2cap_family; /* address family */
- u_int16_t l2cap_psm; /* Protocol/Service Multiplexor */
+ uint16_t l2cap_psm; /* Protocol/Service Multiplexor */
bdaddr_t l2cap_bdaddr; /* address */
};
.Ed
@@ -272,7 +272,7 @@
u_char rfcomm_len; /* total length */
u_char rfcomm_family; /* address family */
bdaddr_t rfcomm_bdaddr; /* address */
- u_int8_t rfcomm_channel; /* channel */
+ uint8_t rfcomm_channel; /* channel */
};
.Ed
.Ss Dv SOCK_STREAM Ss RFCOMM sockets
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_car.4
--- a/head/share/man/man4/ng_car.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_car.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_car.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 11, 2007
.Dt NG_CAR 4
@@ -123,15 +123,15 @@
.Vt "struct ng_car_bulkconf"
.Bd -literal
struct ng_car_hookconf {
- u_int64_t cbs; /* Committed burst size */
- u_int64_t ebs; /* Exceeded/Peak burst size */
- u_int64_t cir; /* Committed information rate */
- u_int64_t pir; /* Peak information rate */
- u_int8_t green_action; /* Action for green packets */
- u_int8_t yellow_action; /* Action for yellow packets */
- u_int8_t red_action; /* Action for red packets */
- u_int8_t mode; /* operation mode */
- u_int8_t opt; /* mode options */
+ uint64_t cbs; /* Committed burst size */
+ uint64_t ebs; /* Exceeded/Peak burst size */
+ uint64_t cir; /* Committed information rate */
+ uint64_t pir; /* Peak information rate */
+ uint8_t green_action; /* Action for green packets */
+ uint8_t yellow_action; /* Action for yellow packets */
+ uint8_t red_action; /* Action for red packets */
+ uint8_t mode; /* operation mode */
+ uint8_t opt; /* mode options */
};
/* possible actions (..._action) */
@@ -161,12 +161,12 @@
.Vt "struct ng_car_bulkstats"
.Bd -literal
struct ng_car_hookstats {
- u_int64_t passed_pkts;
- u_int64_t droped_pkts;
- u_int64_t green_pkts;
- u_int64_t yellow_pkts;
- u_int64_t red_pkts;
- u_int64_t errors;
+ uint64_t passed_pkts;
+ uint64_t droped_pkts;
+ uint64_t green_pkts;
+ uint64_t yellow_pkts;
+ uint64_t red_pkts;
+ uint64_t errors;
};
struct ng_car_bulkstats {
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_ccatm.4
--- a/head/share/man/man4/ng_ccatm.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_ccatm.4 Fri Mar 02 16:55:25 2012 +0200
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_ccatm.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 10, 2005
.Dt NG_CCATM 4
@@ -110,7 +110,7 @@
and uses a structure
.Bd -literal
struct ccatm_op {
- u_int32_t op; /* request code */
+ uint32_t op; /* request code */
u_char data[]; /* optional data */
};
.Ed
@@ -230,7 +230,7 @@
struct ngm_ccatm_address_req addr[0];
};
struct ngm_ccatm_address_req {
- u_int32_t port;
+ uint32_t port;
struct uni_addr addr;
};
.Ed
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_cisco.4
--- a/head/share/man/man4/ng_cisco.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_cisco.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_cisco.4 231564 2012-02-12 18:29:56Z ed $
.\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
.\"
.Dd January 19, 1999
@@ -148,8 +148,8 @@
.Dv "struct ngciscostat" :
.Bd -literal -offset 4n
struct ngciscostat {
- u_int32_t seq_retries; /* # unack'd retries */
- u_int32_t keepalive_period; /* in seconds */
+ uint32_t seq_retries; /* # unack'd retries */
+ uint32_t keepalive_period; /* in seconds */
};
.Ed
.El
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_etf.4
--- a/head/share/man/man4/ng_etf.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_etf.4 Fri Mar 02 16:55:25 2012 +0200
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_etf.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd May 16, 2006
.Dt NG_ETF 4
@@ -102,7 +102,7 @@
.Bd -literal -offset 4n
struct ng_etffilter {
char matchhook[NG_HOOKSIZ]; /* hook name */
- u_int16_t ethertype; /* catch these */
+ uint16_t ethertype; /* catch these */
};
.Ed
.El
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_hci.4
--- a/head/share/man/man4/ng_hci.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_hci.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: ng_hci.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_hci.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd June 25, 2002
.Dt NG_HCI 4
@@ -133,9 +133,9 @@
.Bd -literal -offset indent
#define NG_HCI_CMD_PKT 0x01
typedef struct {
- u_int8_t type; /* MUST be 0x1 */
- u_int16_t opcode; /* OpCode */
- u_int8_t length; /* parameter(s) length in bytes */
+ uint8_t type; /* MUST be 0x1 */
+ uint16_t opcode; /* OpCode */
+ uint8_t length; /* parameter(s) length in bytes */
} __attribute__ ((packed)) ng_hci_cmd_pkt_t;
.Ed
.Pp
@@ -156,9 +156,9 @@
.Bd -literal -offset indent
#define NG_HCI_EVENT_PKT 0x04
typedef struct {
- u_int8_t type; /* MUST be 0x4 */
- u_int8_t event; /* event */
- u_int8_t length; /* parameter(s) length in bytes */
+ uint8_t type; /* MUST be 0x4 */
+ uint8_t event; /* event */
+ uint8_t length; /* parameter(s) length in bytes */
} __attribute__ ((packed)) ng_hci_event_pkt_t;
.Ed
.Pp
@@ -168,9 +168,9 @@
.Bd -literal -offset indent
#define NG_HCI_ACL_DATA_PKT 0x02
typedef struct {
- u_int8_t type; /* MUST be 0x2 */
- u_int16_t con_handle; /* connection handle + PB + BC flags */
- u_int16_t length; /* payload length in bytes */
+ uint8_t type; /* MUST be 0x2 */
+ uint16_t con_handle; /* connection handle + PB + BC flags */
+ uint16_t length; /* payload length in bytes */
} __attribute__ ((packed)) ng_hci_acldata_pkt_t;
.Ed
.Pp
@@ -180,9 +180,9 @@
.Bd -literal -offset indent
#define NG_HCI_SCO_DATA_PKT 0x03
typedef struct {
- u_int8_t type; /* MUST be 0x3 */
- u_int16_t con_handle; /* connection handle + reserved bits */
- u_int8_t length; /* payload length in bytes */
+ uint8_t type; /* MUST be 0x3 */
+ uint16_t con_handle; /* connection handle + reserved bits */
+ uint8_t length; /* payload length in bytes */
} __attribute__ ((packed)) ng_hci_scodata_pkt_t;
.Ed
.Pp
@@ -216,9 +216,9 @@
.Bd -literal -offset indent
#define NGM_HCI_NODE_UP 112 /* HCI -> Upper */
typedef struct {
- u_int16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
- u_int16_t num_pkts; /* ACL/SCO packet queue size */
- u_int16_t reserved; /* place holder */
+ uint16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
+ uint16_t num_pkts; /* ACL/SCO packet queue size */
+ uint16_t reserved; /* place holder */
bdaddr_t bdaddr; /* bdaddr */
} ng_hci_node_up_ep;
.Ed
@@ -244,8 +244,8 @@
.Bd -literal -offset indent
#define NGM_HCI_SYNC_CON_QUEUE 113 /* HCI -> Upper */
typedef struct {
- u_int16_t con_handle; /* connection handle */
- u_int16_t completed; /* number of completed packets */
+ uint16_t con_handle; /* connection handle */
+ uint16_t completed; /* number of completed packets */
} ng_hci_sync_con_queue_ep;
.Ed
.Sh HOOKS
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_l2cap.4
--- a/head/share/man/man4/ng_l2cap.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_l2cap.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: ng_l2cap.4,v 1.4 2003/09/14 23:37:52 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_l2cap.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd July 4, 2002
.Dt NG_L2CAP 4
@@ -310,9 +310,9 @@
.Bd -literal -offset indent
/* L2CA data packet header */
typedef struct {
- u_int32_t token; /* token to use in L2CAP_L2CA_WRITE */
- u_int16_t length; /* length of the data */
- u_int16_t lcid; /* local channel ID */
+ uint32_t token; /* token to use in L2CAP_L2CA_WRITE */
+ uint16_t length; /* length of the data */
+ uint16_t lcid; /* local channel ID */
} __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t;
.Ed
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_l2tp.4
--- a/head/share/man/man4/ng_l2tp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_l2tp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -35,7 +35,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_l2tp.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd August 2, 2004
.Dt NG_L2TP 4
@@ -115,11 +115,11 @@
struct ng_l2tp_config {
u_char enabled; /* enables traffic flow */
u_char match_id; /* tunnel id must match 'tunnel_id' */
- u_int16_t tunnel_id; /* local tunnel id */
- u_int16_t peer_id; /* peer's tunnel id */
- u_int16_t peer_win; /* peer's max recv window size */
- u_int16_t rexmit_max; /* max retransmits before failure */
- u_int16_t rexmit_max_to; /* max delay between retransmits */
+ uint16_t tunnel_id; /* local tunnel id */
+ uint16_t peer_id; /* peer's tunnel id */
+ uint16_t peer_win; /* peer's max recv window size */
+ uint16_t rexmit_max; /* max retransmits before failure */
+ uint16_t rexmit_max_to; /* max delay between retransmits */
};
.Ed
.Pp
@@ -197,8 +197,8 @@
.Bd -literal
/* Configuration for a session hook */
struct ng_l2tp_sess_config {
- u_int16_t session_id; /* local session id */
- u_int16_t peer_id; /* peer's session id */
+ uint16_t session_id; /* local session id */
+ uint16_t peer_id; /* peer's session id */
u_char control_dseq; /* we control data sequencing? */
u_char enable_dseq; /* enable data sequencing? */
u_char include_length; /* include length field? */
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_mppc.4
--- a/head/share/man/man4/ng_mppc.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_mppc.4 Fri Mar 02 16:55:25 2012 +0200
@@ -33,7 +33,7 @@
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
.\" $Whistle: ng_mppc.8,v 1.1 1999/12/08 20:20:39 archie Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_mppc.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd December 8, 1999
.Dt NG_MPPC 4
@@ -106,7 +106,7 @@
/* Configuration for a session */
struct ng_mppc_config {
u_char enable; /* enable */
- u_int32_t bits; /* config bits */
+ uint32_t bits; /* config bits */
u_char startkey[MPPE_KEY_LEN]; /* start key */
};
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_netflow.4
--- a/head/share/man/man4/ng_netflow.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_netflow.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_netflow.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 2, 2011
.Dt NG_NETFLOW 4
@@ -148,8 +148,8 @@
as an argument:
.Bd -literal -offset 4n
struct ng_netflow_setifindex {
- u_int16_t iface; /* which iface to operate on */
- u_int16_t index; /* new index */
+ uint16_t iface; /* which iface to operate on */
+ uint16_t index; /* new index */
};
.Ed
.Pp
@@ -175,8 +175,8 @@
as an argument:
.Bd -literal -offset 4n
struct ng_netflow_setconfig {
- u_int16_t iface;
- u_int32_t conf;
+ uint16_t iface;
+ uint32_t conf;
#define NG_NETFLOW_CONF_INGRESS 1
#define NG_NETFLOW_CONF_EGRESS 2
#define NG_NETFLOW_CONF_ONCE 4
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_one2many.4
--- a/head/share/man/man4/ng_one2many.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_one2many.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_one2many.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 1, 2011
.Dt NG_ONE2MANY 4
@@ -156,8 +156,8 @@
.Bd -literal
/* Node configuration structure */
struct ng_one2many_config {
- u_int32_t xmitAlg; /* how to distribute packets */
- u_int32_t failAlg; /* how to detect link failure */
+ uint32_t xmitAlg; /* how to distribute packets */
+ uint32_t failAlg; /* how to detect link failure */
u_char enabledLinks[NG_ONE2MANY_MAX_LINKS];
};
.Ed
@@ -187,10 +187,10 @@
.Bd -literal
/* Statistics structure (one for each link) */
struct ng_one2many_link_stats {
- u_int64_t recvOctets; /* total octets rec'd on link */
- u_int64_t recvPackets; /* total pkts rec'd on link */
- u_int64_t xmitOctets; /* total octets xmit'd on link */
- u_int64_t xmitPackets; /* total pkts xmit'd on link */
+ uint64_t recvOctets; /* total octets rec'd on link */
+ uint64_t recvPackets; /* total pkts rec'd on link */
+ uint64_t xmitOctets; /* total octets xmit'd on link */
+ uint64_t xmitPackets; /* total pkts xmit'd on link */
};
.Ed
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_ppp.4
--- a/head/share/man/man4/ng_ppp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_ppp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_ppp.4 231564 2012-02-12 18:29:56Z ed $
.\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
.\"
.Dd December 28, 2006
@@ -355,14 +355,14 @@
u_char enableLink; /* enable this link */
u_char enableProtoComp;/* enable protocol field compression */
u_char enableACFComp; /* enable addr/ctrl field compression */
- u_int16_t mru; /* peer MRU */
- u_int32_t latency; /* link latency (in milliseconds) */
- u_int32_t bandwidth; /* link bandwidth (in bytes/second) */
+ uint16_t mru; /* peer MRU */
+ uint32_t latency; /* link latency (in milliseconds) */
+ uint32_t bandwidth; /* link bandwidth (in bytes/second) */
};
/* Bundle config structure */
struct ng_ppp_bund_conf {
- u_int16_t mrru; /* multilink peer MRRU */
+ uint16_t mrru; /* multilink peer MRRU */
u_char enableMultilink; /* enable multilink */
u_char recvShortSeq; /* recv multilink short seq # */
u_char xmitShortSeq; /* xmit multilink short seq # */
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_pppoe.4
--- a/head/share/man/man4/ng_pppoe.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_pppoe.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_pppoe.4 231564 2012-02-12 18:29:56Z ed $
.\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
.\"
.Dd December 27, 2007
@@ -148,7 +148,7 @@
.Bd -literal -offset 4n
struct ngpppoe_init_data {
char hook[NG_HOOKSIZ]; /* hook to monitor on */
- u_int16_t data_len; /* service name length */
+ uint16_t data_len; /* service name length */
char data[0]; /* init data goes here */
};
.Ed
@@ -345,8 +345,8 @@
* The following is available about the node:
* ninfo->name (string)
* ninfo->type (string)
- * ninfo->id (u_int32_t)
- * ninfo->hooks (u_int32_t) (count of hooks)
+ * ninfo->id (uint32_t)
+ * ninfo->hooks (uint32_t) (count of hooks)
* check it is the correct type. and get it's ID for use
* with mkpeer later.
*/
@@ -366,8 +366,8 @@
* link->peerhook (string)
* peer->name (string)
* peer->type (string)
- * peer->id (u_int32_t)
- * peer->hooks (u_int32_t)
+ * peer->id (uint32_t)
+ * peer->hooks (uint32_t)
*/
link = &hlist->link[k];
peer = &hlist->link[k].nodeinfo;
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ng_pptpgre.4
--- a/head/share/man/man4/ng_pptpgre.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ng_pptpgre.4 Fri Mar 02 16:55:25 2012 +0200
@@ -32,7 +32,7 @@
.\"
.\" Author: Archie Cobbs <archie at FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_pptpgre.4 231564 2012-02-12 18:29:56Z ed $
.\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
.\"
.Dd March 29, 2008
@@ -97,10 +97,10 @@
u_char enableDelayedAck; /* enables delayed acks */
u_char enableAlwaysAck; /* always send ack with data */
u_char enableWindowing; /* enable windowing algorithm */
- u_int16_t cid; /* my call id */
- u_int16_t peerCid; /* peer call id */
- u_int16_t recvWin; /* peer recv window size */
- u_int16_t peerPpd; /* peer packet processing delay
+ uint16_t cid; /* my call id */
+ uint16_t peerCid; /* peer call id */
+ uint16_t recvWin; /* peer recv window size */
+ uint16_t peerPpd; /* peer packet processing delay
(in 1/10 of a second) */
};
.Ed
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/pcm.4
--- a/head/share/man/man4/pcm.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/pcm.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/pcm.4 230464 2012-01-22 14:04:42Z stefanf $
+.\" $FreeBSD: head/share/man/man4/pcm.4 232337 2012-03-01 13:10:18Z mav $
.\"
.Dd January 22, 2012
.Dt SOUND 4
@@ -113,6 +113,8 @@
.It
.Xr snd_hda 4 (enabled by default on amd64, i386)
.It
+.Xr snd_hdspe 4
+.It
.Xr snd_ich 4 (enabled by default on amd64, i386)
.It
.Xr snd_maestro 4
@@ -723,6 +725,7 @@
.Xr snd_fm801 4 ,
.Xr snd_gusc 4 ,
.Xr snd_hda 4 ,
+.Xr snd_hdspe 4 ,
.Xr snd_ich 4 ,
.Xr snd_maestro 4 ,
.Xr snd_maestro3 4 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/ppi.4
--- a/head/share/man/man4/ppi.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/ppi.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ppi.4 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd January 2, 1998
.Dt PPI 4
@@ -53,7 +53,7 @@
.Fn ioctl
calls.
Each command takes a single
-.Ft u_int8_t
+.Ft uint8_t
argument, transferring one byte of data.
The following commands are available:
.Bl -tag -width indent
@@ -85,7 +85,7 @@
.Bd -literal -compact
int fd;
- u_int8_t val;
+ uint8_t val;
val = 0x5a;
ioctl(fd, PPISDATA, &val);
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/sbp.4
--- a/head/share/man/man4/sbp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/sbp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -29,9 +29,9 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/sbp.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd May 20, 2002
+.Dd February 8, 2012
.Dt SBP 4
.Os
.Sh NAME
@@ -71,7 +71,7 @@
If you want to force to detach the device, run
.Dq Nm fwcontrol Fl r
several times or set hw.firewire.hold_count=0 by
-.Xr sysctl 1 .
+.Xr sysctl 8 .
.Pp
Some (broken) HDDs do not work well with tagged queuing.
If you have problems with such drives, try
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/sdhci.4
--- a/head/share/man/man4/sdhci.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/sdhci.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/sdhci.4 231266 2012-02-09 10:20:41Z glebius $
.\"
-.Dd January 14, 2009
+.Dd February 9, 2012
.Dt SDHCI 4
.Os
.Sh NAME
@@ -69,6 +69,8 @@
.It
RICOH R5C822
.It
+RICOH R5CE823
+.It
TI PCIXX21/XX11
.El
.Sh SEE ALSO
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/sfxge.4
--- a/head/share/man/man4/sfxge.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/sfxge.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/sfxge.4 227633 2011-11-17 17:57:35Z brueffer $
+.\" $FreeBSD: head/share/man/man4/sfxge.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd November 16, 2011
+.Dd February 8, 2012
.Dt SFXGE 4
.Os
.Sh NAME
@@ -57,7 +57,7 @@
The driver allocates 1 receive queue, transmit queue, event queue and
IRQ per CPU up to a maximum of 64.
IRQ affinities should be spread out using
-.Xr cpuset 8 .
+.Xr cpuset 1 .
Interrupt moderation may be controlled through the sysctl
.Va dev.sfxge.%d.int_mod
(units are microseconds).
@@ -85,7 +85,7 @@
.Xr netintro 4 ,
.Xr ng_ether 4 ,
.Xr vlan 4 ,
-.Xr cpuset 8 ,
+.Xr cpuset 1 ,
.Xr ifconfig 8
.Sh AUTHORS
The
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/tcp.4
--- a/head/share/man/man4/tcp.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/tcp.4 Fri Mar 02 16:55:25 2012 +0200
@@ -36,9 +36,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: head/share/man/man4/tcp.4 227500 2011-11-14 15:14:42Z andre $
+.\" $FreeBSD: head/share/man/man4/tcp.4 231025 2012-02-05 16:53:02Z glebius $
.\"
-.Dd November 14, 2011
+.Dd February 5, 2012
.Dt TCP 4
.Os
.Sh NAME
@@ -146,6 +146,65 @@
See
.Xr mod_cc 4
for details.
+.It Dv TCP_KEEPINIT
+This write-only
+.Xr setsockopt 2
+option accepts a per-socket timeout argument of
+.Vt "u_int"
+in seconds, for new, non-established
+.Tn TCP
+connections.
+For the global default in milliseconds see
+.Va keepinit
+in the
+.Sx MIB Variables
+section further down.
+.It Dv TCP_KEEPIDLE
+This write-only
+.Xr setsockopt 2
+option accepts an argument of
+.Vt "u_int"
+for the amount of time, in seconds, that the connection must be idle
+before keepalive probes (if enabled) are sent for the connection of this
+socket.
+If set on a listening socket, the value is inherited by the newly created
+socket upon
+.Xr accept 2 .
+For the global default in milliseconds see
+.Va keepidle
+in the
+.Sx MIB Variables
+section further down.
+.It Dv TCP_KEEPINTVL
+This write-only
+.Xr setsockopt 2
+option accepts an argument of
+.Vt "u_int"
+to set the per-socket interval, in seconds, between keepalive probes sent
+to a peer.
+If set on a listening socket, the value is inherited by the newly created
+socket upon
+.Xr accept 2 .
+For the global default in milliseconds see
+.Va keepintvl
+in the
+.Sx MIB Variables
+section further down.
+.It Dv TCP_KEEPCNT
+This write-only
+.Xr setsockopt 2
+option accepts an argument of
+.Vt "u_int"
+and allows a per-socket tuning of the number of probes sent, with no response,
+before the connection will be dropped.
+If set on a listening socket, the value is inherited by the newly created
+socket upon
+.Xr accept 2 .
+For the global default see the
+.Va keepcnt
+in the
+.Sx MIB Variables
+section further down.
.It Dv TCP_NODELAY
Under most circumstances,
.Tn TCP
@@ -296,17 +355,21 @@
Timeout, in milliseconds, for new, non-established
.Tn TCP
connections.
+The default is 75000 msec.
.It Va keepidle
Amount of time, in milliseconds, that the connection must be idle
before keepalive probes (if enabled) are sent.
+The default is 7200000 msec (2 hours).
.It Va keepintvl
The interval, in milliseconds, between keepalive probes sent to remote
machines, when no response is received on a
.Va keepidle
probe.
-After
-.Dv TCPTV_KEEPCNT
-(default 8) probes are sent, with no response, the connection is dropped.
+The default is 75000 msec.
+.It Va keepcnt
+Number of probes sent, with no response, before a connection
+is dropped.
+The default is 8 packets.
.It Va always_keepalive
Assume that
.Dv SO_KEEPALIVE
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/u3g.4
--- a/head/share/man/man4/u3g.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/u3g.4 Fri Mar 02 16:55:25 2012 +0200
@@ -16,9 +16,9 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: head/share/man/man4/u3g.4 227750 2011-11-20 12:18:21Z miwi $
+.\" $FreeBSD: head/share/man/man4/u3g.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd November 20, 2011
+.Dd February 8, 2012
.Dt U3G 4
.Os
.Sh NAME
@@ -88,7 +88,7 @@
The device starts up in disk mode (TruInstall, ZeroCD, etc.) and requires
additional commands to switch it to modem mode. If your device is not
switching automatically, please try to add quirks. See
-.Xr usbconfig 5
+.Xr usbconfig 8
and
.Xr usb_quirk 4 .
.Pp
@@ -97,7 +97,7 @@
.Xr ucom 4 ,
.Xr usb 4 ,
.Xr usb_quirk 4 ,
-.Xr usbconfig 5
+.Xr usbconfig 8
.Sh HISTORY
The
.Nm
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/umcs.4
--- a/head/share/man/man4/umcs.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/umcs.4 Fri Mar 02 16:55:25 2012 +0200
@@ -26,9 +26,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/umcs.4 227750 2011-11-20 12:18:21Z miwi $
+.\" $FreeBSD: head/share/man/man4/umcs.4 232158 2012-02-25 15:21:43Z gjb $
.\"
-.Dd November 20, 2011
+.Dd February 25, 2012
.Dt UMCS 4
.Os
.Sh NAME
@@ -54,9 +54,11 @@
The
.Nm
driver provides support for various multiport serial adapters based on the MosCom
-MCS7820 and MCS7840 chips. They are 2- or 4-port adapters with full-featured
-16550-compatible UARTs and very flexible baud generators. Also, these chips
-support RS422/RS485 and IrDA oprations.
+MCS7820 and MCS7840 chips.
+They are 2- or 4-port adapters with full-featured
+16550-compatible UARTs and very flexible baud generators.
+Also, these chips
+support RS422/RS485 and IrDA operations.
.Pp
The device is accessed through the
.Xr ucom 4
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/usb.4
--- a/head/share/man/man4/usb.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/usb.4 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/usb.4 232258 2012-02-28 15:47:39Z kevlo $
.\"
.Dd May 20, 2009
.Dt USB 4
@@ -150,6 +150,7 @@
.Xr cue 4 ,
.Xr ehci 4 ,
.Xr kue 4 ,
+.Xr mos 4 ,
.Xr ohci 4 ,
.Xr pci 4 ,
.Xr rue 4 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/usb_quirk.4
--- a/head/share/man/man4/usb_quirk.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/usb_quirk.4 Fri Mar 02 16:55:25 2012 +0200
@@ -14,9 +14,9 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/usb_quirk.4 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd February 27, 2011
+.Dd February 8, 2012
.Dt USB_QUIRK 4
.Os
.Sh NAME
@@ -41,7 +41,7 @@
.Nm
module provides support for dynamically adding and removing quirks for
USB devices with
-.Xr usbconfig 5 .
+.Xr usbconfig 8 .
.Sh General quirks:
.Bl -tag -width Ds
.It UQ_AUDIO_SWAP_LR
@@ -183,7 +183,7 @@
usbconfig -d ugen0.3 add_quirk UQ_MSC_EJECT_WAIT
.Ed
.Sh SEE ALSO
-.Xr usbconfig 5
+.Xr usbconfig 8
.Sh HISTORY
The
.Nm
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/vr.4
--- a/head/share/man/man4/vr.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/vr.4 Fri Mar 02 16:55:25 2012 +0200
@@ -28,9 +28,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/vr.4 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd February 7, 2010
+.Dd February 25, 2012
.Dt VR 4
.Os
.Sh NAME
@@ -94,7 +94,7 @@
.Ar half-duplex
modes.
.It 100baseTX
-Set 100Mbps (Fast Fthernet) operation.
+Set 100Mbps (Fast Ethernet) operation.
The
.Ar mediaopt
option can also be used to select either
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man4/wlan.4
--- a/head/share/man/man4/wlan.4 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man4/wlan.4 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man4/wlan.4 225348 2011-09-02 18:37:48Z brueffer $
+.\" $FreeBSD: head/share/man/man4/wlan.4 232011 2012-02-22 22:40:20Z gjb $
.\"
-.Dd July 8, 2009
+.Dd February 22, 2012
.Dt WLAN 4
.Os
.Sh NAME
@@ -174,13 +174,16 @@
.Xr an 4 ,
.Xr ath 4 ,
.Xr bwi 4 ,
+.Xr bwn 4 ,
.Xr ipw 4 ,
.Xr iwi 4 ,
.Xr iwn 4 ,
.Xr malo 4 ,
+.Xr mwl 4 ,
.Xr netintro 4 ,
.Xr ral 4 ,
.Xr rum 4 ,
+.Xr run 4 ,
.Xr uath 4 ,
.Xr upgt 4 ,
.Xr ural 4 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/devfs.5
--- a/head/share/man/man5/devfs.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/devfs.5 Fri Mar 02 16:55:25 2012 +0200
@@ -36,9 +36,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/devfs.5 232247 2012-02-28 07:35:07Z mm $
.\"
-.Dd September 18, 2010
+.Dd February 9, 2012
.Dt DEVFS 5
.Os
.Sh NAME
@@ -90,6 +90,30 @@
.Pa 2 .
.Xr fdescfs 5
creates files for all open descriptors.
+.Pp
+The options are as follows:
+.Bl -tag -width indent
+.It Fl o Ar options
+Use the specified mount
+.Ar options ,
+as described in
+.Xr mount 8 .
+The following devfs file system-specific options are available:
+.Bl -tag -width indent
+.It Cm ruleset Ns No = Ns Ar ruleset
+Set ruleset number
+.Ar ruleset
+as the current ruleset for the mount-point and apply all its rules.
+If the ruleset number
+.Ar ruleset
+does not exist, an empty ruleset with the number
+.Ar ruleset
+is created.
+See
+.Xr devfs 8
+for more information on working with devfs rulesets.
+.El
+.El
.Sh FILES
.Bl -tag -width /dev/XXXX -compact
.It Pa /dev
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/fs.5
--- a/head/share/man/man5/fs.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/fs.5 Fri Mar 02 16:55:25 2012 +0200
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fs.5 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/fs.5 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd October 31, 2006
.Dt FS 5
@@ -145,12 +145,12 @@
int8_t fs_old_flags; /* old FS_ flags */
u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */
u_char fs_volname[MAXVOLLEN]; /* volume name */
- u_int64_t fs_swuid; /* system-wide uid */
+ uint64_t fs_swuid; /* system-wide uid */
int32_t fs_pad; /* due to alignment of fs_swuid */
/* these fields retain the current block allocation info */
int32_t fs_cgrotor; /* last cg searched */
void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */
- u_int8_t *fs_contigdirs; /* # of contiguously allocated dirs */
+ uint8_t *fs_contigdirs; /* # of contiguously allocated dirs */
struct csum *fs_csp; /* cg summary info buffer for fs_cs */
int32_t *fs_maxcluster; /* max cluster in each cyl group */
u_int *fs_active; /* used by snapshots to track fs */
@@ -175,7 +175,7 @@
int32_t fs_contigsumsize; /* size of cluster summary array */
int32_t fs_maxsymlinklen; /* max length of an internal symlink */
int32_t fs_old_inodefmt; /* format of on-disk inodes */
- u_int64_t fs_maxfilesize; /* maximum representable file size */
+ uint64_t fs_maxfilesize; /* maximum representable file size */
int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */
int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */
int32_t fs_state; /* validate fs_clean field */
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/passwd.5
--- a/head/share/man/man5/passwd.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/passwd.5 Fri Mar 02 16:55:25 2012 +0200
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)passwd.5 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/passwd.5 232254 2012-02-28 15:07:05Z kevlo $
.\"
.Dd May 8, 2007
.Dt PASSWD 5
@@ -232,7 +232,7 @@
.Pp
The full
.Ar name
-may contain a ampersand
+may contain an ampersand
.Pq Ql &
which will be replaced by
the capitalized login
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/periodic.conf.5
--- a/head/share/man/man5/periodic.conf.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/periodic.conf.5 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man5/periodic.conf.5 228355 2011-12-08 23:58:26Z gjb $
+.\" $FreeBSD: head/share/man/man5/periodic.conf.5 231171 2012-02-08 00:08:21Z gjb $
.\"
-.Dd December 8, 2011
+.Dd February 7, 2012
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -335,6 +335,28 @@
.Va daily_status_disks_enable
is set to
.Dq Li YES .
+.It Va daily_status_zfs_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Nm zpool Cm status
+on your
+.Xr zfs 8
+pools.
+.It Va daily_status_zfs_zpool_list_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Nm zpool Cm list
+on your
+.Xr zfs 8
+pools.
+Requires
+.Va daily_status_zfs_enable
+to be set to
+.Li YES .
.It Va daily_status_ata_raid_enable
.Pq Vt bool
Set to
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/portindex.5
--- a/head/share/man/man5/portindex.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/portindex.5 Fri Mar 02 16:55:25 2012 +0200
@@ -24,9 +24,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/portindex.5 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd January 28, 2009
+.Dd February 8, 2012
.Dt PORTINDEX 5
.Os
.Sh NAME
@@ -90,7 +90,7 @@
vim-6.3.15|/usr/ports/editors/vim|/usr/local|Vi "workalike", with many additional features|/usr/ports/editors/vim/pkg-descr|obrien at FreeBSD.org|editors|libiconv-1.9.2_1|libiconv-1.9.2_1|http://www.vim.org/|||
.Ed
.Sh SEE ALSO
-.Xr build 1 ,
+.Xr build 7 ,
.Xr csup 1 ,
.Xr ports 7
.Sh AUTHORS
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/rc.conf.5
--- a/head/share/man/man5/rc.conf.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/rc.conf.5 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man5/rc.conf.5 228457 2011-12-13 08:23:03Z ru $
+.\" $FreeBSD: head/share/man/man5/rc.conf.5 232243 2012-02-28 03:11:02Z gjb $
.\"
-.Dd December 13, 2011
+.Dd February 27, 2012
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -149,6 +149,19 @@
adequate provisions to recover from a failed boot
(such as physical contact with the machine,
or reliable remote console access).
+.It Va always_force_depends
+.Pq Vt bool
+Various
+.Pa rc.d
+scripts use the force_depend function to check whether required
+services are already running, and to start them if necessary.
+By default during boot time this check is bypassed if the
+required service is enabled in
+.Pa /etc/rc.conf[.local] .
+Setting this option will bypass that check at boot time and
+always test whether or not the service is actually running.
+Enabling this option is likely to increase your boot time if
+services are enabled that utilize the force_depend check.
.It Va swapfile
.Pq Vt str
If set to
@@ -187,7 +200,7 @@
.Pq Vt bool
Run
.Xr ddb 8
-to install
+to install
.Xr ddb 4
scripts at boot time.
.It Va ddb_config
@@ -1260,7 +1273,7 @@
file.
For instance, to configure an
.Xr ath 4
-wireless device in station mode with an address obtained
+wireless device in station mode with an address obtained
via DHCP, using WPA authentication and 802.11b mode, it is
possible to use something like:
.Bd -literal
@@ -1414,7 +1427,7 @@
accepted even when
.Va net.inet6.ip6.forwarding
is 1
-.Pq packet fowarding is enabled
+.Pq packet forwarding is enabled
when
.Va net.inet6.ip6.rfc6204w3
is set to 1.
@@ -1436,7 +1449,8 @@
.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
with
.Dq Li inet6
-keyword. For example:
+keyword.
+For example:
.Bd -literal
ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64"
ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64"
@@ -1539,14 +1553,17 @@
.Dq Li AUTO
is specified, it attempts to read a file
.Pa /etc/ip6addrctl.conf
-first. If this file is found,
+first.
+If this file is found,
.Xr ip6addrctl 8
-reads and installs it. If not found, a policy is automatically set
+reads and installs it.
+If not found, a policy is automatically set
according to
.Va ipv6_activate_all_interfaces
variable; if the variable is set to
.Dq Li YES
-the IPv6-preferred one is used. Otherwise IPv4-preferred.
+the IPv6-preferred one is used.
+Otherwise IPv4-preferred.
.Pp
The default value of
.Va ip6addrctl_enable
@@ -3673,6 +3690,25 @@
these are the flags passed to the
.Xr watchdogd 8
daemon.
+.It Va devfs_rulesets
+.Pq Vt str
+List of files containing sets of rules for
+.Xr devfs 8 .
+.It Va devfs_system_ruleset
+.Pq Vt str
+Rule name(s) to apply to the system
+.Pa /dev
+itself.
+.It Va devfs_set_rulesets
+.Pq Vt str
+Pairs of already-mounted
+.Pa dev
+directories and rulesets that should be applied to them.
+For example: /mount/dev=ruleset_name
+.It Va devfs_load_rulesets
+.Pq Vt bool
+If set, always load the default rulesets listed in
+.Va devfs_rulesets .
.It Va performance_cx_lowest
.Pq Vt str
CPU idle state to use while on AC power.
@@ -3718,11 +3754,11 @@
If set to
.Dq Li NO ,
any configured jails will not be started.
-.It jail_parallel_start
+.It Va jail_parallel_start
.Pq Vt bool
If set to
-.Dq Li YES
-all configured jails will be started in the background (= in parallel).
+.Dq Li YES ,
+all configured jails will be started in the background (in parallel).
.It Va jail_list
.Pq Vt str
A space separated list of names for jails.
@@ -4532,6 +4568,7 @@
.Xr chkprintcap 8 ,
.Xr chown 8 ,
.Xr cron 8 ,
+.Xr devfs 8 ,
.Xr dhclient 8 ,
.Xr ftpd 8 ,
.Xr geli 8 ,
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man5/src.conf.5
--- a/head/share/man/man5/src.conf.5 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man5/src.conf.5 Fri Mar 02 16:55:25 2012 +0200
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
-.\" $FreeBSD: head/share/man/man5/src.conf.5 230061 2012-01-13 15:43:01Z ed $
-.Dd January 13, 2012
+.\" $FreeBSD: head/share/man/man5/src.conf.5 232323 2012-02-29 23:06:48Z dim $
+.Dd February 29, 2012
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -271,12 +271,32 @@
.Pp
It is a default setting on
arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb and sparc64/sparc64.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_CLANG_EXTRAS
+.It
+.Va WITHOUT_CLANG_IS_CC
+.El
.It Va WITH_CLANG
.\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
Set to build the Clang C/C++ compiler.
.Pp
It is a default setting on
amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
+.It Va WITH_CLANG_EXTRAS
+.\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim
+Set to build additional clang and llvm tools, such as bugpoint.
+.It Va WITH_CLANG_IS_CC
+.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 232322 2012-02-29 22:58:51Z dim
+Set to install the Clang C/C++ compiler as
+.Pa /usr/bin/cc
+,
+.Pa /usr/bin/c++
+and
+.Pa /usr/bin/cpp
+.
.It Va WITHOUT_CPP
.\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
Set to not build
@@ -333,6 +353,8 @@
.It
.Va WITHOUT_CLANG
.It
+.Va WITHOUT_CLANG_IS_CC
+.It
.Va WITHOUT_GROFF
.El
.It Va WITHOUT_DICT
@@ -869,6 +891,23 @@
Set to not build the
.Bx 4.4
legacy docs.
+.It Va WITHOUT_SOURCELESS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh
+Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU).
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_SOURCELESS_HOST
+.It
+.Va WITHOUT_SOURCELESS_UCODE
+.El
+.It Va WITHOUT_SOURCELESS_HOST
+.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS_HOST 230972 2012-02-04 00:54:43Z rmh
+Set to not build kernel modules that include sourceless native code for host CPU.
+.It Va WITHOUT_SOURCELESS_UCODE
+.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS_UCODE 230972 2012-02-04 00:54:43Z rmh
+Set to not build kernel modules that include sourceless microcode.
.It Va WITHOUT_SSP
.\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru
Set to not build world with propolice stack smashing protection.
@@ -922,6 +961,8 @@
.It
.Va WITHOUT_CLANG
.It
+.Va WITHOUT_CLANG_IS_CC
+.It
.Va WITHOUT_GCC
.It
.Va WITHOUT_GDB
@@ -930,7 +971,7 @@
.\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru
Set to not build USB-related programs and libraries.
.It Va WITHOUT_UTMPX
-.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 230060 2012-01-13 15:40:49Z ed
+.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed
Set to not build user accounting tools such as
.Xr last 1 ,
.Xr users 1 ,
@@ -938,7 +979,7 @@
.Xr ac 8 ,
.Xr lastlogin 8
and
-.Xr utxrm 8 .
+.Xr utx 8 .
.It Va WITHOUT_WIRELESS
.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam
Set to not build programs used for 802.11 wireless networks; especially
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man7/hier.7
--- a/head/share/man/man7/hier.7 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man7/hier.7 Fri Mar 02 16:55:25 2012 +0200
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man7/hier.7 230977 2012-02-04 08:03:01Z joel $
.\"
.Dd May 25, 2008
.Dt HIER 7
@@ -639,6 +639,8 @@
.Bl -tag -width ".Pa kerberos5/" -compact
.It Pa bin/
source code for files in /bin
+.It Pa cddl/
+Utilities covered by the Common Development and Distribution License
.It Pa contrib/
source code for contributed software
.It Pa crypto/
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man7/ports.7
--- a/head/share/man/man7/ports.7 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man7/ports.7 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man7/ports.7 222492 2011-05-30 10:23:59Z bcr $
+.\" $FreeBSD: head/share/man/man7/ports.7 231331 2012-02-10 03:34:32Z gjb $
.\"
-.Dd May 30, 2011
+.Dd February 9, 2012
.Dt PORTS 7
.Os
.Sh NAME
@@ -408,10 +408,13 @@
.It Va PKGFILE
The full path to the package.
.El
+.It Va LOCALBASE
+Where existing things are installed and where to search for files when
+resolving dependencies (usually
+.Pa /usr/local ) .
.It Va PREFIX
-Where to install things in general
-(usually
-.Pa /usr/local ) .
+Where to install this port (usually set to the same as
+.Va LOCALBASE ) .
.It Va MASTER_SITES
Primary sites for distribution files if not found locally.
.It Va PATCH_SITES
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man7/security.7
--- a/head/share/man/man7/security.7 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man7/security.7 Fri Mar 02 16:55:25 2012 +0200
@@ -21,9 +21,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man7/security.7 226089 2011-10-07 05:47:30Z obrien $
+.\" $FreeBSD: head/share/man/man7/security.7 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd January 7, 2010
+.Dd February 8, 2012
.Dt SECURITY 7
.Os
.Sh NAME
@@ -579,7 +579,7 @@
.El
.Pp
The security level can be configured with variables documented in
-.Xr rc.conf 8 .
+.Xr rc.conf 5 .
.Sh CHECKING FILE INTEGRITY: BINARIES, CONFIG FILES, ETC
When it comes right down to it, you can only protect your core system
configuration and control files so much before the convenience factor
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/DEVICE_PROBE.9
--- a/head/share/man/man9/DEVICE_PROBE.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/DEVICE_PROBE.9 Fri Mar 02 16:55:25 2012 +0200
@@ -26,9 +26,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/DEVICE_PROBE.9 231244 2012-02-09 04:37:30Z gjb $
.\"
-.Dd March 3, 2008
+.Dd February 8, 2012
.Dt DEVICE_PROBE 9
.Os
.Sh NAME
@@ -120,7 +120,7 @@
.It BUS_PROBE_HOOVER
The driver matches all unclaimed devices on a bus.
The
-.Xr ugen 5
+.Xr ugen 4
device is one example.
.It BUS_PROBE_NOWILDCARD
The driver expects its parent to tell it which children to manage
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/MD5.9
--- a/head/share/man/man9/MD5.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/MD5.9 Fri Mar 02 16:55:25 2012 +0200
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/MD5.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd April 17, 1996
.Dt MD5 9
@@ -44,7 +44,7 @@
.Ft void
.Fn MD5Init "MD5_CTX *buf"
.Ft void
-.Fn MD5Transform "u_int32_t buf[4]" "const unsigned char block[64]"
+.Fn MD5Transform "uint32_t buf[4]" "const unsigned char block[64]"
.Sh DESCRIPTION
The
.Nm
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/Makefile
--- a/head/share/man/man9/Makefile Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/Makefile Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/man/man9/Makefile 230787 2012-01-30 21:02:25Z brueffer $
+# $FreeBSD: head/share/man/man9/Makefile 232360 2012-03-01 20:20:55Z jhb $
MAN= accept_filter.9 \
accf_data.9 \
@@ -615,7 +615,7 @@
disk.9 disk_destroy.9 \
disk.9 disk_gone.9
MLINKS+=domain.9 DOMAIN_SET.9 \
- domain.9 net_add_domain.9 \
+ domain.9 domain_add.9 \
domain.9 pfctlinput.9 \
domain.9 pfctlinput2.9 \
domain.9 pffindproto.9 \
@@ -980,6 +980,8 @@
pci.9 pci_find_device.9 \
pci.9 pci_get_powerstate.9 \
pci.9 pci_read_config.9 \
+ pci.9 pci_restore_state.9 \
+ pci.9 pci_save_state.9 \
pci.9 pci_set_powerstate.9 \
pci.9 pci_write_config.9
MLINKS+=pfil.9 pfil_add_hook.9 \
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/bios.9
--- a/head/share/man/man9/bios.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/bios.9 Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bios.9 231564 2012-02-12 18:29:56Z ed $
.\"
.\" Copyright (c) 1997 Michael Smith
.\" All rights reserved.
@@ -40,8 +40,8 @@
.In machine/param.h
.In machine/pmap.h
.In machine/pc/bios.h
-.Ft u_int32_t
-.Fn bios_sigsearch "u_int32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"
+.Ft uint32_t
+.Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"
.Ft int
.Fn bios32_SDlookup "struct bios32_SDentry *ent"
.Ft int
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/bus_dma.9
--- a/head/share/man/man9/bus_dma.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/bus_dma.9 Fri Mar 02 16:55:25 2012 +0200
@@ -57,7 +57,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bus_dma.9 232359 2012-03-01 20:19:21Z jhb $
.\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $
.\"
.Dd May 12, 2009
@@ -82,7 +82,7 @@
.In machine/bus.h
.Ft int
.Fn bus_dma_tag_create "bus_dma_tag_t parent" "bus_size_t alignment" \
-"bus_size_t boundary" "bus_addr_t lowaddr" "bus_addr_t highaddr" \
+"bus_addr_t boundary" "bus_addr_t lowaddr" "bus_addr_t highaddr" \
"bus_dma_filter_t *filtfunc" "void *filtfuncarg" "bus_size_t maxsize" \
"int nsegments" "bus_size_t maxsegsz" "int flags" "bus_dma_lock_t *lockfunc" \
"void *lockfuncarg" "bus_dma_tag_t *dmat"
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/bus_space.9
--- a/head/share/man/man9/bus_space.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/bus_space.9 Fri Mar 02 16:55:25 2012 +0200
@@ -56,7 +56,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bus_space.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd June 13, 2005
.Dt BUS_SPACE 9
@@ -167,77 +167,77 @@
.Fo bus_space_free
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t size"
.Fc
-.Ft u_int8_t
+.Ft uint8_t
.Fo bus_space_read_1
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int16_t
+.Ft uint16_t
.Fo bus_space_read_2
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int32_t
+.Ft uint32_t
.Fo bus_space_read_4
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int64_t
+.Ft uint64_t
.Fo bus_space_read_8
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int8_t
+.Ft uint8_t
.Fo bus_space_read_stream_1
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int16_t
+.Ft uint16_t
.Fo bus_space_read_stream_2
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int32_t
+.Ft uint32_t
.Fo bus_space_read_stream_4
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
-.Ft u_int64_t
+.Ft uint64_t
.Fo bus_space_read_stream_8
.Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset"
.Fc
.Ft void
.Fo bus_space_write_1
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int8_t value"
+.Fa "bus_size_t offset" "uint8_t value"
.Fc
.Ft void
.Fo bus_space_write_2
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int16_t value"
+.Fa "bus_size_t offset" "uint16_t value"
.Fc
.Ft void
.Fo bus_space_write_4
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int32_t value"
+.Fa "bus_size_t offset" "uint32_t value"
.Fc
.Ft void
.Fo bus_space_write_8
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int64_t value"
+.Fa "bus_size_t offset" "uint64_t value"
.Fc
.Ft void
.Fo bus_space_write_stream_1
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int8_t value"
+.Fa "bus_size_t offset" "uint8_t value"
.Fc
.Ft void
.Fo bus_space_write_stream_2
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int16_t value"
+.Fa "bus_size_t offset" "uint16_t value"
.Fc
.Ft void
.Fo bus_space_write_stream_4
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int32_t value"
+.Fa "bus_size_t offset" "uint32_t value"
.Fc
.Ft void
.Fo bus_space_write_stream_8
.Fa "bus_space_tag_t space" "bus_space_handle_t handle"
-.Fa "bus_size_t offset" "u_int64_t value"
+.Fa "bus_size_t offset" "uint64_t value"
.Fc
.Ft void
.Fo bus_space_barrier
@@ -247,97 +247,97 @@
.Ft void
.Fo bus_space_read_region_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_region_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_region_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
@@ -391,193 +391,193 @@
.Ft void
.Fo bus_space_set_region_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_region_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_read_multi_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_write_multi_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_stream_1
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_stream_2
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_stream_4
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value"
.Fa "bus_size_t count"
.Fc
.Ft void
.Fo bus_space_set_multi_stream_8
.Fa "bus_space_tag_t space"
-.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value"
+.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value"
.Fa "bus_size_t count"
.Fc
.Sh DESCRIPTION
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/byteorder.9
--- a/head/share/man/man9/byteorder.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/byteorder.9 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/byteorder.9 232254 2012-02-28 15:07:05Z kevlo $
.\"
.Dd April 29, 2002
.Dt BYTEORDER 9
@@ -123,7 +123,7 @@
.Fn htobe32 ,
and
.Fn htobe64
-functions return a integer in the system's native
+functions return an integer in the system's native
byte order converted to big endian byte order.
The return value will be the same as the argument on big endian systems.
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/contigmalloc.9
--- a/head/share/man/man9/contigmalloc.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/contigmalloc.9 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/contigmalloc.9 232359 2012-03-01 20:19:21Z jhb $
.\"
.Dd July 19, 2007
.Dt CONTIGMALLOC 9
@@ -42,7 +42,7 @@
.Fa "vm_paddr_t low"
.Fa "vm_paddr_t high"
.Fa "unsigned long alignment"
-.Fa "unsigned long boundary"
+.Fa "vm_paddr_t boundary"
.Fc
.Ft void
.Fo contigfree
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/crypto.9
--- a/head/share/man/man9/crypto.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/crypto.9 Fri Mar 02 16:55:25 2012 +0200
@@ -15,7 +15,7 @@
.\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
.\" PURPOSE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/crypto.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd September 19, 2007
.Dt CRYPTO 9
@@ -26,29 +26,29 @@
.Sh SYNOPSIS
.In opencrypto/cryptodev.h
.Ft int32_t
-.Fn crypto_get_driverid u_int8_t
+.Fn crypto_get_driverid uint8_t
.Ft int
-.Fn crypto_register u_int32_t int u_int16_t u_int32_t "int \*[lp]*\*[rp]\*[lp]void *, u_int32_t *, struct cryptoini *\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, u_int64_t\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, struct cryptop *\*[rp]" "void *"
+.Fn crypto_register uint32_t int uint16_t uint32_t "int \*[lp]*\*[rp]\*[lp]void *, uint32_t *, struct cryptoini *\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, uint64_t\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, struct cryptop *\*[rp]" "void *"
.Ft int
-.Fn crypto_kregister u_int32_t int u_int32_t "int \*[lp]*\*[rp]\*[lp]void *, struct cryptkop *\*[rp]" "void *"
+.Fn crypto_kregister uint32_t int uint32_t "int \*[lp]*\*[rp]\*[lp]void *, struct cryptkop *\*[rp]" "void *"
.Ft int
-.Fn crypto_unregister u_int32_t int
+.Fn crypto_unregister uint32_t int
.Ft int
-.Fn crypto_unregister_all u_int32_t
+.Fn crypto_unregister_all uint32_t
.Ft void
.Fn crypto_done "struct cryptop *"
.Ft void
.Fn crypto_kdone "struct cryptkop *"
.Ft int
-.Fn crypto_newsession "u_int64_t *" "struct cryptoini *" int
+.Fn crypto_newsession "uint64_t *" "struct cryptoini *" int
.Ft int
-.Fn crypto_freesession u_int64_t
+.Fn crypto_freesession uint64_t
.Ft int
.Fn crypto_dispatch "struct cryptop *"
.Ft int
.Fn crypto_kdispatch "struct cryptkop *"
.Ft int
-.Fn crypto_unblock u_int32_t int
+.Fn crypto_unblock uint32_t int
.Ft "struct cryptop *"
.Fn crypto_getreq int
.Ft void
@@ -64,7 +64,7 @@
int cri_klen;
int cri_mlen;
caddr_t cri_key;
- u_int8_t cri_iv[EALG_MAX_BLOCK_LEN];
+ uint8_t cri_iv[EALG_MAX_BLOCK_LEN];
struct cryptoini *cri_next;
};
@@ -83,7 +83,7 @@
struct cryptop {
TAILQ_ENTRY(cryptop) crp_next;
- u_int64_t crp_sid;
+ uint64_t crp_sid;
int crp_ilen;
int crp_olen;
int crp_etype;
@@ -108,7 +108,7 @@
u_int krp_status; /* return status */
u_short krp_iparams; /* # of input parameters */
u_short krp_oparams; /* # of output parameters */
- u_int32_t krp_hid;
+ uint32_t krp_hid;
struct crparam krp_param[CRK_MAXPARAM];
int (*krp_callback)(struct cryptkop *);
};
@@ -524,10 +524,10 @@
.Bl -item -compact
.It
.Ft int
-.Fn \*[lp]*newsession\*[rp] "void *" "u_int32_t *" "struct cryptoini *" ;
+.Fn \*[lp]*newsession\*[rp] "void *" "uint32_t *" "struct cryptoini *" ;
.It
.Ft int
-.Fn \*[lp]*freesession\*[rp] "void *" "u_int64_t" ;
+.Fn \*[lp]*freesession\*[rp] "void *" "uint64_t" ;
.It
.Ft int
.Fn \*[lp]*process\*[rp] "void *" "struct cryptop *" ;
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/device_set_flags.9
--- a/head/share/man/man9/device_set_flags.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/device_set_flags.9 Fri Mar 02 16:55:25 2012 +0200
@@ -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$
+.\" $FreeBSD: head/share/man/man9/device_set_flags.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd September 6, 1999
.Dt DEVICE_GET_FLAGS 9
@@ -39,8 +39,8 @@
.In sys/param.h
.In sys/bus.h
.Ft void
-.Fn device_set_flags "device_t dev" "u_int32_t flags"
-.Ft u_int32_t
+.Fn device_set_flags "device_t dev" "uint32_t flags"
+.Ft uint32_t
.Fn device_get_flags "device_t dev"
.Sh DESCRIPTION
Each device supports a set of driver-dependent flags which are often
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/devstat.9
--- a/head/share/man/man9/devstat.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/devstat.9 Fri Mar 02 16:55:25 2012 +0200
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/devstat.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd May 22, 1998
.Dt DEVSTAT 9
@@ -45,7 +45,7 @@
.Fa "struct devstat *ds"
.Fa "const char *dev_name"
.Fa "int unit_number"
-.Fa "u_int32_t block_size"
+.Fa "uint32_t block_size"
.Fa "devstat_support_flags flags"
.Fa "devstat_type_flags device_type"
.Fa "devstat_priority priority"
@@ -57,7 +57,7 @@
.Ft void
.Fo devstat_end_transaction
.Fa "struct devstat *ds"
-.Fa "u_int32_t bytes"
+.Fa "uint32_t bytes"
.Fa "devstat_tag_type tag_type"
.Fa "devstat_trans_flags flags"
.Fc
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/devtoname.9
--- a/head/share/man/man9/devtoname.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/devtoname.9 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man9/devtoname.9 230330 2012-01-19 09:51:07Z ed $
+.\" $FreeBSD: head/share/man/man9/devtoname.9 231376 2012-02-10 11:20:13Z ed $
.\"
-.Dd January 19, 2012
+.Dd February 10, 2012
.Dt DEVTONAME 9
.Os
.Sh NAME
@@ -41,15 +41,6 @@
function returns a pointer to the name of the device passed to it.
The name is whatever was set to it in
.Fn make_dev .
-If no name is associated with
-.Va dev ,
-a pointer to a string consisting of a
-.Dq #
-followed by
-.Dq Va major Ns / Ns Va minor
-as it applies to
-.Va dev
-is returned.
.Sh HISTORY
The
.Fn devtoname
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/domain.9
--- a/head/share/man/man9/domain.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/domain.9 Fri Mar 02 16:55:25 2012 +0200
@@ -24,13 +24,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/domain.9 232051 2012-02-23 17:47:19Z brueffer $
.\"
-.Dd December 23, 2008
+.Dd February 23, 2012
.Dt DOMAIN 9
.Os
.Sh NAME
-.Nm net_add_domain ,
+.Nm domain_add ,
.Nm pfctlinput ,
.Nm pfctlinput2 ,
.Nm pffindproto ,
@@ -43,7 +43,7 @@
.In sys/protosw.h
.In sys/domain.h
.Ft void
-.Fn net_add_domain "void *data"
+.Fn domain_add "void *data"
.Ft void
.Fn pfctlinput "int cmd" "struct sockaddr *sa"
.Ft void
@@ -142,7 +142,7 @@
.Fn pr_ctlinput
function called.
.Pp
-.Fn net_add_domain
+.Fn domain_add
adds a new protocol domain to the system.
The argument
.Fa data
@@ -153,13 +153,13 @@
in order to prevent compiler warnings when new domains are registered with
.Fn SYSINIT .
In most cases
-.Fn net_add_domain
+.Fn domain_add
is not called directly, instead
.Fn DOMAIN_SET
is used.
.Pp
If the new domain has defined an initialization routine, it is called by
-.Fn net_add_domain ;
+.Fn domain_add ;
as well, each of the protocols within the domain that have defined an
initialization routine will have theirs called.
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/eventtimers.9
--- a/head/share/man/man9/eventtimers.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/eventtimers.9 Fri Mar 02 16:55:25 2012 +0200
@@ -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: head/share/man/man9/eventtimers.9 228731 2011-12-20 11:40:22Z mav $
+.\" $FreeBSD: head/share/man/man9/eventtimers.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd December 14, 2011
.Dt EVENTTIMERS 9
@@ -52,7 +52,7 @@
#define ET_FLAGS_POW2DIV 16
int et_quality;
int et_active;
- u_int64_t et_frequency;
+ uint64_t et_frequency;
struct bintime et_min_period;
struct bintime et_max_period;
et_start_t *et_start;
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/get_cyclecount.9
--- a/head/share/man/man9/get_cyclecount.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/get_cyclecount.9 Fri Mar 02 16:55:25 2012 +0200
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/get_cyclecount.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd March 15, 2011
.Dt GET_CYCLECOUNT 9
@@ -34,7 +34,7 @@
.In sys/param.h
.In sys/systm.h
.In machine/cpu.h
-.Ft u_int64_t
+.Ft uint64_t
.Fn get_cyclecount "void"
.Sh DESCRIPTION
The
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/ifnet.9
--- a/head/share/man/man9/ifnet.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/ifnet.9 Fri Mar 02 16:55:25 2012 +0200
@@ -26,9 +26,9 @@
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man9/ifnet.9 230581 2012-01-26 11:08:55Z glebius $
+.\" $FreeBSD: head/share/man/man9/ifnet.9 232384 2012-03-02 09:52:42Z pluknet $
.\"
-.Dd January 26, 2012
+.Dd March 2, 2012
.Dt IFNET 9
.Os
.Sh NAME
@@ -66,6 +66,8 @@
.Fn if_allmulti "struct ifnet *ifp" "int amswitch"
.Ft "struct ifnet *"
.Fn ifunit "const char *name"
+.Ft "struct ifnet *"
+.Fn ifunit_ref "const char *name"
.Ft void
.Fn if_up "struct ifnet *ifp"
.\"
@@ -75,12 +77,13 @@
.Ft "struct ifaddr *"
.Fn ifa_ifwithdstaddr "struct sockaddr *addr"
.Ft "struct ifaddr *"
-.Fn ifa_ifwithnet "struct sockaddr *addr"
+.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp"
.Ft "struct ifaddr *"
.Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp"
.Ft void
-.Fn ifafree "struct ifaddr *ifa"
-.Fn IFAFREE "struct ifaddr *ifa"
+.Fn ifa_ref "struct ifaddr *ifa"
+.Ft void
+.Fn ifa_free "struct ifaddr *ifa"
.\"
.Ss "Interface Multicast Address Functions"
.Ft int
@@ -88,7 +91,7 @@
.Ft int
.Fn if_delmulti "struct ifnet *ifp" "struct sockaddr *sa"
.Ft "struct ifmultiaddr *"
-.Fn ifmaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp"
+.Fn if_findmulti "struct ifnet *ifp" "struct sockaddr *sa"
.Ss "Output queue macros"
.Fn IF_DEQUEUE "struct ifqueue *ifq" "struct mbuf *m"
.\"
@@ -107,7 +110,7 @@
.Ft void
.Fn \*(lp*if_qflush\*(rp "struct ifnet *ifp"
.Ft int
-.Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data"
+.Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "u_long cmd" "caddr_t data"
.Ft void
.Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp"
.Ft void
@@ -256,6 +259,11 @@
(Initialized by driver
(usually via
.Fn if_initname ) . )
+.It Va if_refcount
+.Pq Vt u_int
+The reference count.
+(Initialized by
+.Fn if_alloc . )
.It Va if_addrhead
.Pq Vt "struct ifaddrhead"
The head of the
@@ -340,6 +348,20 @@
.\"(Initialized by driver.)
.El
.Pp
+References to
+.Vt ifnet
+structures are gained by calling the
+.Fn if_ref
+function and released by calling the
+.Fn if_rele
+function.
+They are used to allow kernel code walking global interface lists
+to release the
+.Vt ifnet
+lock yet keep the
+.Vt ifnet
+structure stable.
+.Pp
There are in addition a number of function pointers which the driver
must initialize to complete its interface with the generic interface
layer:
@@ -978,14 +1000,11 @@
.Pp
References to
.Vt ifaddr
-structures are gained manually, by incrementing the
-.Va ifa_refcnt
-member.
-References are released by calling either the
-.Fn ifafree
-function or the
-.Fn IFAFREE
-macro.
+structures are gained by calling the
+.Fn ifa_ref
+function and released by calling the
+.Fn ifa_free
+function.
.Pp
.Fn ifa_rtrequest
is a pointer to a function which receives callouts from the routing
@@ -1132,6 +1151,17 @@
.Vt ifnet
pointer for the interface named
.Fa name .
+.It Fn ifunit_ref
+Return a reference-counted (via
+.Fn ifa_ref )
+.Vt ifnet
+pointer for the interface named
+.Fa name .
+This is the preferred function over
+.Fn ifunit .
+The caller is responsible for releasing the reference with
+.Fn if_rele
+when it is finished with the ifnet.
.It Fn ifioctl
Process the ioctl request
.Fa cmd ,
@@ -1294,6 +1324,9 @@
address whose remote address is
.Fa addr
if one is found.
+If
+.Fa ignore_ptp
+is true, skip point-to-point interface addresses.
.Pp
.Fn ifaof_ifpforaddr
returns the most specific address configured on interface
@@ -1314,7 +1347,7 @@
.Fn if_addmulti ,
.Fn if_delmulti ,
and
-.Fn ifmaof_ifpforaddr
+.Fn if_findmulti
functions provide support for requesting and relinquishing multicast
group memberships, and for querying an interface's membership list,
respectively.
@@ -1371,11 +1404,11 @@
standard error number on failure.
.Pp
The
-.Fn ifmaof_ifpforaddr
+.Fn if_findmulti
function examines the membership list of interface
.Fa ifp
for an address matching
-.Fa addr ,
+.Fa sa ,
and returns a pointer to that
.Vt "struct ifmultiaddr"
if one is found, else it returns a null pointer.
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/kqueue.9
--- a/head/share/man/man9/kqueue.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/kqueue.9 Fri Mar 02 16:55:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man9/kqueue.9 227116 2011-11-05 17:55:49Z jmg $
+.\" $FreeBSD: head/share/man/man9/kqueue.9 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd November 5, 2011
+.Dd February 25, 2012
.Dt KQUEUE 9
.Os
.Sh NAME
@@ -294,7 +294,7 @@
.Pp
The function
.Fn knlist_init_mtx
-may be used to initalize a
+may be used to initialize a
.Vt knlist
when
.Fa lock
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/mbchain.9
--- a/head/share/man/man9/mbchain.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/mbchain.9 Fri Mar 02 16:55:25 2012 +0200
@@ -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$
+.\" $FreeBSD: head/share/man/man9/mbchain.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd February 20, 2001
.Dt MBCHAIN 9
@@ -66,15 +66,15 @@
.Ft caddr_t
.Fn mb_reserve "struct mbchain *mbp" "int size"
.Ft int
-.Fn mb_put_uint8 "struct mbchain *mbp" "u_int8_t x"
+.Fn mb_put_uint8 "struct mbchain *mbp" "uint8_t x"
.Ft int
-.Fn mb_put_uint16be "struct mbchain *mbp" "u_int16_t x"
+.Fn mb_put_uint16be "struct mbchain *mbp" "uint16_t x"
.Ft int
-.Fn mb_put_uint16le "struct mbchain *mbp" "u_int16_t x"
+.Fn mb_put_uint16le "struct mbchain *mbp" "uint16_t x"
.Ft int
-.Fn mb_put_uint32be "struct mbchain *mbp" "u_int32_t x"
+.Fn mb_put_uint32be "struct mbchain *mbp" "uint32_t x"
.Ft int
-.Fn mb_put_uint32le "struct mbchain *mbp" "u_int32_t x"
+.Fn mb_put_uint32le "struct mbchain *mbp" "uint32_t x"
.Ft int
.Fn mb_put_int64be "struct mbchain *mbp" "int64_t x"
.Ft int
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/mbuf_tags.9
--- a/head/share/man/man9/mbuf_tags.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/mbuf_tags.9 Fri Mar 02 16:55:25 2012 +0200
@@ -18,7 +18,7 @@
.\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
.\" PURPOSE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/mbuf_tags.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd January 12, 2008
.Dt MBUF_TAGS 9
@@ -29,7 +29,7 @@
.Sh SYNOPSIS
.In sys/mbuf.h
.Ft "struct m_tag *"
-.Fn m_tag_alloc "u_int32_t cookie" "int type" "int len" "int wait"
+.Fn m_tag_alloc "uint32_t cookie" "int type" "int len" "int wait"
.Ft "struct m_tag *"
.Fn m_tag_copy "struct m_tag *t" "int how"
.Ft int
@@ -51,7 +51,7 @@
.Ft void
.Fn m_tag_init "struct mbuf *m"
.Ft struct m_tag *
-.Fn m_tag_locate "struct mbuf *m" "u_int32_t cookie" "int type" "struct m_tag *t"
+.Fn m_tag_locate "struct mbuf *m" "uint32_t cookie" "int type" "struct m_tag *t"
.Ft "struct m_tag *"
.Fn m_tag_next "struct mbuf *m" "struct m_tag *t"
.Ft void
@@ -100,9 +100,9 @@
.Bd -literal
struct m_tag {
SLIST_ENTRY(m_tag) m_tag_link; /* List of packet tags */
- u_int16_t m_tag_id; /* Tag ID */
- u_int16_t m_tag_len; /* Length of data */
- u_int32_t m_tag_cookie; /* ABI/Module ID */
+ uint16_t m_tag_id; /* Tag ID */
+ uint16_t m_tag_len; /* Length of data */
+ uint32_t m_tag_cookie; /* ABI/Module ID */
void (*m_tag_free)(struct m_tag *);
};
.Ed
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/mdchain.9
--- a/head/share/man/man9/mdchain.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/mdchain.9 Fri Mar 02 16:55:25 2012 +0200
@@ -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$
+.\" $FreeBSD: head/share/man/man9/mdchain.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd February 28, 2001
.Dt MDCHAIN 9
@@ -63,19 +63,19 @@
.Ft int
.Fn md_next_record "struct mdchain *mdp"
.Ft int
-.Fn md_get_uint8 "struct mdchain *mdp" "u_int8_t *x"
+.Fn md_get_uint8 "struct mdchain *mdp" "uint8_t *x"
.Ft int
-.Fn md_get_uint16 "struct mdchain *mdp" "u_int16_t *x"
+.Fn md_get_uint16 "struct mdchain *mdp" "uint16_t *x"
.Ft int
-.Fn md_get_uint16be "struct mdchain *mdp" "u_int16_t *x"
+.Fn md_get_uint16be "struct mdchain *mdp" "uint16_t *x"
.Ft int
-.Fn md_get_uint16le "struct mdchain *mdp" "u_int16_t *x"
+.Fn md_get_uint16le "struct mdchain *mdp" "uint16_t *x"
.Ft int
-.Fn md_get_uint32 "struct mdchain *mdp" "u_int32_t *x"
+.Fn md_get_uint32 "struct mdchain *mdp" "uint32_t *x"
.Ft int
-.Fn md_get_uint32be "struct mdchain *mdp" "u_int32_t *x"
+.Fn md_get_uint32be "struct mdchain *mdp" "uint32_t *x"
.Ft int
-.Fn md_get_uint32le "struct mdchain *mdp" "u_int32_t *x"
+.Fn md_get_uint32le "struct mdchain *mdp" "uint32_t *x"
.Ft int
.Fn md_get_int64 "struct mdchain *mdp" "int64_t *x"
.Ft int
@@ -193,8 +193,8 @@
.Bd -literal
struct mdchain *mdp;
struct mbuf *m;
-u_int16_t length;
-u_int8_t byte;
+uint16_t length;
+uint8_t byte;
receive(so, &m);
md_initm(mdp, m);
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/namei.9
--- a/head/share/man/man9/namei.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/namei.9 Fri Mar 02 16:55:25 2012 +0200
@@ -31,9 +31,9 @@
.\" If you integrate this manpage in another OS, I'd appreciate a note
.\" - eivind at FreeBSD.org
.\"
-.\" $FreeBSD: head/share/man/man9/namei.9 230292 2012-01-18 02:29:11Z kevlo $
+.\" $FreeBSD: head/share/man/man9/namei.9 232350 2012-03-01 18:17:45Z jh $
.\"
-.Dd September 21, 2005
+.Dd March 1, 2012
.Dt NAMEI 9
.Os
.Sh NAME
@@ -340,6 +340,13 @@
Too many symbolic links were encountered in translating the pathname.
.It Bq Er EISDIR
An attempt is made to open a directory with write mode specified.
+.It Bq Er EINVAL
+The last component of the pathname specified for a
+.Dv DELETE
+or
+.Dv RENAME
+operation is
+.Ql \&. .
.It Bq Er EROFS
An attempt is made to modify a file or directory on a read-only file system.
.El
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/netisr.9
--- a/head/share/man/man9/netisr.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/netisr.9 Fri Mar 02 16:55:25 2012 +0200
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/netisr.9 231564 2012-02-12 18:29:56Z ed $
.\"
.Dd February 22, 2010
.Dt NETISR 9
@@ -50,7 +50,7 @@
.Ft void
.Fn netisr_clearqdrops "const struct netisr_handler *nhp"
.Ft void
-.Fn netisr_getqdrops "const struct netisr_handler *nhp" "u_int64_t *qdropsp"
+.Fn netisr_getqdrops "const struct netisr_handler *nhp" "uint64_t *qdropsp"
.Ft void
.Fn netisr_getqlimit "const struct netisr_handler *nhp" "u_int *qlimitp"
.Ft int
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/pci.9
--- a/head/share/man/man9/pci.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/pci.9 Fri Mar 02 16:55:25 2012 +0200
@@ -23,52 +23,58 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/pci.9 232363 2012-03-01 20:36:50Z jhb $
.\"
.Dd September 30, 2007
.Dt PCI 9
.Os
.Sh NAME
.Nm pci ,
-.Nm pci_read_config ,
-.Nm pci_write_config ,
+.Nm pci_disable_busmaster ,
+.Nm pci_disable_io ,
.Nm pci_enable_busmaster ,
-.Nm pci_disable_busmaster ,
.Nm pci_enable_io ,
-.Nm pci_disable_io ,
-.Nm pci_set_powerstate ,
-.Nm pci_get_powerstate ,
.Nm pci_find_bsf ,
.Nm pci_find_dbsf ,
-.Nm pci_find_device
+.Nm pci_find_device ,
+.Nm pci_get_powerstate ,
+.Nm pci_read_config ,
+.Nm pci_restore_state ,
+.Nm pci_save_state ,
+.Nm pci_set_powerstate ,
+.Nm pci_write_config
.Nd PCI bus interface
.Sh SYNOPSIS
.In sys/bus.h
.In dev/pci/pcivar.h
.In dev/pci/pcireg.h
.In machine/pci_cfgreg.h
-.Ft void
-.Fn pci_write_config "device_t dev" "int reg" "uint32_t val" "int width"
+.Ft int
+.Fn pci_disable_busmaster "device_t dev"
+.Ft int
+.Fn pci_disable_io "device_t dev" "int space"
.Ft int
.Fn pci_enable_busmaster "device_t dev"
.Ft int
-.Fn pci_disable_busmaster "device_t dev"
-.Ft int
.Fn pci_enable_io "device_t dev" "int space"
-.Ft int
-.Fn pci_disable_io "device_t dev" "int space"
-.Ft int
-.Fn pci_set_powerstate "device_t dev" "int state"
-.Ft int
-.Fn pci_get_powerstate "device_t dev"
-.Ft uint32_t
-.Fn pci_read_config "device_t dev" "int reg" "int width"
.Ft device_t
.Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
.Ft device_t
.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
.Ft device_t
.Fn pci_find_device "uint16_t vendor" "uint16_t device"
+.Ft int
+.Fn pci_get_powerstate "device_t dev"
+.Ft uint32_t
+.Fn pci_read_config "device_t dev" "int reg" "int width"
+.Ft void
+.Fn pci_restore_state "device_t dev"
+.Ft void
+.Fn pci_save_state "device_t dev"
+.Ft int
+.Fn pci_set_powerstate "device_t dev" "int state"
+.Ft void
+.Fn pci_write_config "device_t dev" "int reg" "uint32_t val" "int width"
.Sh DESCRIPTION
The
.Nm
@@ -139,13 +145,13 @@
.Pp
The
.Fn pci_get_powerstate
-function returns the current ACPI power state of the device
+function returns the current power state of the device
.Fa dev .
If the device does not support power management capabilities, then the default
state of
.Dv PCI_POWERSTATE_D0
is returned.
-The following power states are defined by ACPI:
+The following power states are defined by PCI:
.Bl -hang -width ".Dv PCI_POWERSTATE_UNKNOWN"
.It Dv PCI_POWERSTATE_D0
State in which device is on and running.
@@ -177,15 +183,33 @@
.Fn pci_set_powerstate
function is used to transition the device
.Fa dev
-to the ACPI power state
+to the PCI power state
.Fa state .
-It checks to see if the device is PCI 2.2 compliant.
-If so, it checks the
-capabilities pointer to determine which power states the device supports.
-If the device does not have power management capabilities, the default state
-of
+If the device does not support power management capabilities or
+it does not support the specific power state
+.Fa state ,
+then the function will fail with
+.Er EOPNOTSUPP .
+.Pp
+The
+.Fn pci_save_state
+and
+.Fn pci_restore_state
+functions can be used by a device driver to save and restore standard PCI
+config registers.
+The
+.Fn pci_save_state
+function must be invoked while the device has valid state before
+.Fn pci_restore_state
+can be used.
+If the device is not in the fully-powered state
+.Pq Dv PCI_POWERSTATE_D0
+when
+.Fn pci_restore_state
+is invoked,
+then the device will be transitioned to
.Dv PCI_POWERSTATE_D0
-is set.
+before any config registers are restored.
.Pp
The
.Fn pci_find_bsf
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/random.9
--- a/head/share/man/man9/random.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/random.9 Fri Mar 02 16:55:25 2012 +0200
@@ -24,7 +24,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$
+.\" $FreeBSD: head/share/man/man9/random.9 231564 2012-02-12 18:29:56Z ed $
.\" "
.Dd September 25, 2000
.Dt RANDOM 9
@@ -44,7 +44,7 @@
.Fn random "void"
.Ft void
.Fn arc4rand "void *ptr" "u_int length" "int reseed"
-.Ft u_int32_t
+.Ft uint32_t
.Fn arc4random "void"
.Pp
.In sys/random.h
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/rijndael.9
--- a/head/share/man/man9/rijndael.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/rijndael.9 Fri Mar 02 16:55:25 2012 +0200
@@ -24,7 +24,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$
+.\" $FreeBSD: head/share/man/man9/rijndael.9 231564 2012-02-12 18:29:56Z ed $
.\" "
.Dd February 6, 2002
.Dt RIJNDAEL 9
@@ -43,47 +43,47 @@
.Ft int
.Fo rijndael_makeKey
.Fa "keyInstance *key"
-.Fa "u_int8_t direction"
+.Fa "uint8_t direction"
.Fa "int keyLen"
.Fa "char *keyMaterial"
.Fc
.Ft int
.Fo rijndael_cipherInit
.Fa "cipherInstance *cipher"
-.Fa "u_int8_t mode"
+.Fa "uint8_t mode"
.Fa "char *IV"
.Fc
.Ft int
.Fo rijndael_blockEncrypt
.Fa "cipherInstance *cipher"
.Fa "keyInstance *key"
-.Fa "u_int8_t *input"
+.Fa "uint8_t *input"
.Fa "int inputLen"
-.Fa "u_int8_t *outBuffer"
+.Fa "uint8_t *outBuffer"
.Fc
.Ft int
.Fo rijndael_padEncrypt
.Fa "cipherInstance *cipher"
.Fa "keyInstance *key"
-.Fa "u_int8_t *input"
+.Fa "uint8_t *input"
.Fa "int inputOctets"
-.Fa "u_int8_t *outBuffer"
+.Fa "uint8_t *outBuffer"
.Fc
.Ft int
.Fo rijndael_blockDecrypt
.Fa "cipherInstance *cipher"
.Fa "keyInstance *key"
-.Fa "u_int8_t *input"
+.Fa "uint8_t *input"
.Fa "int inputLen"
-.Fa "u_int8_t *outBuffer"
+.Fa "uint8_t *outBuffer"
.Fc
.Ft int
.Fo rijndael_padDecrypt
.Fa "cipherInstance *cipher"
.Fa "keyInstance *key"
-.Fa "u_int8_t *input"
+.Fa "uint8_t *input"
.Fa "int inputOctets"
-.Fa "u_int8_t *outBuffer"
+.Fa "uint8_t *outBuffer"
.Fc
.Sh DESCRIPTION
The
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/sysctl.9
--- a/head/share/man/man9/sysctl.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/sysctl.9 Fri Mar 02 16:55:25 2012 +0200
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/sysctl.9 232321 2012-02-29 22:41:40Z thompsa $
.\"
.Dd January 16, 2010
.Dt SYSCTL 9
@@ -138,9 +138,9 @@
.It Dv CTLFLAG_SKIP
When iterating the sysctl name space, do not list this sysctl.
.It Dv CTLFLAG_TUN
-Also declare a system tunable with the same name to initialize this variable.
+Advisory flag that a system tunable also exists for this variable.
.It Dv CTLFLAG_RDTUN
-Also declare a system tunable with the same name to initialize this variable;
+Advisory flag that a system tunable also exists for this variable;
however, the run-time variable is read-only.
.El
.Pp
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/man/man9/zone.9
--- a/head/share/man/man9/zone.9 Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/man/man9/zone.9 Fri Mar 02 16:55:25 2012 +0200
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man9/zone.9 222176 2011-05-22 14:03:30Z uqs $
+.\" $FreeBSD: head/share/man/man9/zone.9 232157 2012-02-25 14:31:25Z gjb $
.\"
-.Dd October 9, 2010
+.Dd February 25, 2012
.Dt ZONE 9
.Os
.Sh NAME
@@ -47,7 +47,7 @@
.Fo uma_zcreate
.Fa "char *name" "int size"
.Fa "uma_ctor ctor" "uma_dtor dtor" "uma_init uminit" "uma_fini fini"
-.Fa "int align" "u_int16_t flags"
+.Fa "int align" "uint16_t flags"
.Fc
.Ft "void *"
.Fn uma_zalloc "uma_zone_t zone" "int flags"
@@ -210,7 +210,7 @@
.Fn uma_zone_get_cur
function returns the approximate current occupancy of the zone.
The returned value is approximate because appropriate synchronisation to
-determine an exact value is not performend by the implementation.
+determine an exact value is not performed by the implementation.
This ensures low overhead at the expense of potentially stale data being used
in the calculation.
.Sh RETURN VALUES
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/misc/bsd-family-tree
--- a/head/share/misc/bsd-family-tree Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/misc/bsd-family-tree Fri Mar 02 16:55:25 2012 +0200
@@ -251,7 +251,7 @@
| 10.7 | | |
| | | OpenBSD 5.0 |
+--FreeBSD | | | |
- | 9.0 | | | |
+ | 9.0 | | | DragonFly 3.0.1
| v | | | |
| | | | |
FreeBSD 10 -current | NetBSD -current OpenBSD -current |
@@ -543,6 +543,7 @@
Mac OS X 10.7 2011-07-20 [APL]
OpenBSD 5.0 2011-11-01 [OBD]
FreeBSD 9.0 2012-01-12 [FBD]
+DragonFly 3.0.1 2012-02-21 [DFB]
Bibliography
------------------------
@@ -603,4 +604,4 @@
Copyright (c) 1997-2012 Wolfram Schneider <wosch at FreeBSD.ORG>
URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
-$FreeBSD: head/share/misc/bsd-family-tree 230043 2012-01-13 06:18:23Z maxim $
+$FreeBSD: head/share/misc/bsd-family-tree 232000 2012-02-22 17:52:53Z maxim $
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/misc/committers-doc.dot
--- a/head/share/misc/committers-doc.dot Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/misc/committers-doc.dot Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-doc.dot 226354 2011-10-14 00:34:45Z wblock $
+# $FreeBSD: head/share/misc/committers-doc.dot 232313 2012-02-29 20:13:53Z pluknet $
# This file is meant to list all FreeBSD doc+www committers and describe the
# mentor-mentee relationships between them.
@@ -72,6 +72,7 @@
miwi [label="Martin Wilke\nmiwi at FreeBSD.org\n2007/10/26"]
murray [label="Murray Stokely\nmurray at FreeBSD.org\n2000/04/05"]
pav [label="Pav Lucistnik\npav at FreeBSD.org\n2005/08/12"]
+pluknet [label="Sergey Kandaurov\npluknet at FreeBSD.org\n2012/02/14"]
remko [label="Remko Lodder\nremko at FreeBSD.org\n2004/10/16"]
rene [label="Rene Ladan\nrene at FreeBSD.org\n2008/11/03"]
roam [label="Peter Pentchev\nroam at FreeBSD.org\n2003/02/14"]
@@ -129,6 +130,7 @@
keramida -> pav
marck -> bvs
+marck -> pluknet
marck -> taras
maxim -> taras
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/misc/committers-ports.dot
--- a/head/share/misc/committers-ports.dot Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/misc/committers-ports.dot Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-ports.dot 228752 2011-12-20 21:16:49Z jgh $
+# $FreeBSD: head/share/misc/committers-ports.dot 232357 2012-03-01 20:03:44Z ak $
# This file is meant to list all FreeBSD ports committers and describe the
# mentor-mentee relationships between them.
@@ -44,6 +44,7 @@
ache [label="Andrey Chernov\nache at FreeBSD.org\n1994/11/15"]
acm [label="Jose Alonso Cardenas Marquez\nacm at FreeBSD.org\n2006/07/18"]
ahze [label="Michael Johnson\nahze at FreeBSD.org\n2004/10/29"]
+ak [label="Alex Kozlov\nak at FreeBSD.org\n2012/02/29"]
ale [label="Alex Dupre\nale at FreeBSD.org\n2004/01/12"]
alepulver [label="Alejandro Pulver\nalepulver at FreeBSD.org\n2006/04/01"]
alexbl [label="Alexander Botero-Lowry\nalexbl at FreeBSD.org\n2006/09/11"]
@@ -134,6 +135,7 @@
markus [label="Markus Brueffer\nmarkus at FreeBSD.org\n2004/02/21"]
martymac [label="Ganael Laplanche\nmartymac at FreeBSD.org\n2010/09/24"]
mat [label="Mathieu Arnold\nmat at FreeBSD.org\n2003/08/15"]
+matthew [label="Matthew Seaman\nmatthew at FreeBSD.org\n2012/02/07"]
mezz [label="Jeremy Messenger\nmezz at FreeBSD.org\n2004/04/30"]
miwi [label="Martin Wilke\nmiwi at FreeBSD.org\n2006/06/04"]
mm [label="Martin Matuska\nmm at FreeBSD.org\n2007/04/04"]
@@ -184,6 +186,7 @@
trhodes [label="Tom Rhodes\ntrhodes at FreeBSD.org\n2004/07/06"]
thierry [label="Thierry Thomas\nthierry at FreeBSD.org\n2004/03/15"]
tmclaugh [label="Tom McLaughlin\ntmclaugh at FreeBSD.org\n2005/09/15"]
+uqs [label="Ulrich Spoerlein\nuqs at FreeBSD.org\n2012/01/19"]
vd [label="Vasil Dimov\nvd at FreeBSD.org\n2006/01/19"]
wen [label="Wen Heping\nwen at FreeBSD.org\n2010/12/13"]
wxs [label="Wesley Shields\nwxs at FreeBSD.org\n2008/01/03"]
@@ -220,6 +223,7 @@
bapt -> jlaffaye
beat -> decke
+beat -> uqs
beech -> glarkin
beech -> mva
@@ -242,6 +246,8 @@
demon -> mat
+eadler -> ak
+
edwin -> cperciva
edwin -> erwin
edwin -> linimon
@@ -293,6 +299,7 @@
ijliao -> leeym
+itetcu -> ak
itetcu -> araujo
itetcu -> dryice
itetcu -> sahil
@@ -411,6 +418,7 @@
sem -> stas
shaun -> timur
+shaun -> matthew
sobomax -> demon
sobomax -> glewis
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/misc/committers-src.dot
--- a/head/share/misc/committers-src.dot Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/misc/committers-src.dot Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-src.dot 228946 2011-12-29 08:13:11Z bapt $
+# $FreeBSD: head/share/misc/committers-src.dot 230876 2012-02-01 19:46:12Z davide $
# This file is meant to list all FreeBSD src committers and describe the
# mentor-mentee relationships between them.
@@ -118,6 +118,7 @@
cperciva [label="Colin Percival\ncperciva at FreeBSD.org\n2004/01/20"]
csjp [label="Christian S.J. Peron\ncsjp at FreeBSD.org\n2004/05/04"]
das [label="David Schultz\ndas at FreeBSD.org\n2003/02/21"]
+davide [label="Davide Italiano\ndavide at FreeBSD.org\n2012/01/27"]
davidxu [label="David Xu\ndavidxu at FreeBSD.org\n2002/09/02"]
dchagin [label="Dmitry Chagin\ndchagin at FreeBSD.org\n2009/02/28"]
delphij [label="Xin Li\ndelphij at FreeBSD.org\n2004/09/14"]
@@ -284,6 +285,8 @@
ae -> melifaro
+alc -> davide
+
andre -> qingli
anholt -> jkim
@@ -376,6 +379,7 @@
gnn -> vanhu
gnn -> lstewart
gnn -> np
+gnn -> davide
grog -> edwin
grog -> le
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/mk/bsd.kmod.mk
--- a/head/share/mk/bsd.kmod.mk Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/mk/bsd.kmod.mk Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/share/mk/bsd.kmod.mk 231834 2012-02-16 21:04:47Z imp $
# Search for kernel source tree in standard places.
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
@@ -9,7 +9,7 @@
.endfor
.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
!exists(${SYSDIR}/conf/kmod.mk)
-.error "can't find kernel source tree"
+.error Unable to locate the kernel source tree. Set SYSDIR to override.
.endif
.include "${SYSDIR}/conf/kmod.mk"
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/mk/bsd.own.mk
--- a/head/share/mk/bsd.own.mk Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/mk/bsd.own.mk Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/mk/bsd.own.mk 229319 2012-01-02 21:57:58Z rwatson $
+# $FreeBSD: head/share/mk/bsd.own.mk 232322 2012-02-29 22:58:51Z dim $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -325,6 +325,9 @@
BOOT \
BSD_CPIO \
BSNMP \
+ SOURCELESS \
+ SOURCELESS_HOST \
+ SOURCELESS_UCODE \
BZIP2 \
CALENDAR \
CAPSICUM \
@@ -421,6 +424,8 @@
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+ CLANG_EXTRAS \
+ CLANG_IS_CC \
CTF \
HESIOD \
ICONV \
@@ -517,11 +522,20 @@
MK_BIND_ETC:= no
.endif
+.if ${MK_SOURCELESS} == "no"
+MK_SOURCELESS_HOST:= no
+MK_SOURCELESS_UCODE:= no
+.endif
+
.if ${MK_CDDL} == "no"
MK_ZFS:= no
MK_CTF:= no
.endif
+.if ${MK_CLANG} == "no"
+MK_CLANG_EXTRAS:= no
+.endif
+
.if ${MK_CRYPT} == "no"
MK_OPENSSL:= no
MK_OPENSSH:= no
@@ -567,6 +581,10 @@
MK_GDB:= no
.endif
+.if ${MK_CLANG} == "no"
+MK_CLANG_IS_CC:= no
+.endif
+
#
# Set defaults for the MK_*_SUPPORT variables.
#
diff -r c1b7cc45b1ba -r 71c478d74e2f head/share/mk/bsd.sys.mk
--- a/head/share/mk/bsd.sys.mk Fri Mar 02 16:55:04 2012 +0200
+++ b/head/share/mk/bsd.sys.mk Fri Mar 02 16:55:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/mk/bsd.sys.mk 228677 2011-12-18 00:34:42Z dim $
+# $FreeBSD: head/share/mk/bsd.sys.mk 232322 2012-02-29 22:58:51Z dim $
#
# This file contains common settings used for building FreeBSD
# sources.
@@ -28,7 +28,7 @@
. if defined(WARNS)
. if ${WARNS} >= 1
CWARNFLAGS += -Wsystem-headers
-. if !defined(NO_WERROR)
+. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
CWARNFLAGS += -Werror
. endif
. endif
@@ -42,7 +42,7 @@
. if ${WARNS} >= 4
CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\
-Wshadow -Wunused-parameter
-. if !defined(NO_WCAST_ALIGN)
+. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang))
CWARNFLAGS += -Wcast-align
. endif
. endif
@@ -59,7 +59,7 @@
CWARNFLAGS += -Wno-pointer-sign
# Clang has more warnings enabled by default, and when using -Wall, so if WARNS
# is set to low values, these have to be disabled explicitly.
-. if ${CC:T:Mclang} == "clang"
+. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
. if ${WARNS} <= 3
CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\
-Wno-parentheses-equality -Wno-unused-function\
@@ -84,12 +84,12 @@
. if ${WFORMAT} > 0
#CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args
CWARNFLAGS += -Wformat=2 -Wno-format-extra-args
-. if !defined(NO_WERROR)
+. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
CWARNFLAGS += -Werror
. endif
. endif
. endif
-. if defined(NO_WFORMAT)
+. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang))
CWARNFLAGS += -Wno-format
. endif
.endif
@@ -98,6 +98,12 @@
CWARNFLAGS += -Wno-unknown-pragmas
.endif
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+CLANG_NO_IAS = -no-integrated-as
+CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \
+ -mllvm -enable-load-pre=false
+.endif
+
.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
# Don't use -Wstack-protector as it breaks world with -Werror.
More information about the Zrouter-src-freebsd
mailing list