Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Mar 2008 22:21:01 GMT
From:      Kip Macy <kmacy@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 136609 for review
Message-ID:  <200803012221.m21ML1m7086885@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=136609

Change 136609 by kmacy@kmacy:entropy:iwarp on 2008/03/01 22:21:00

	IFC 136608

Affected files ...

.. //depot/projects/iwarp/UPDATING#7 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_close.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_getattr.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_notify.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_open.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_receive.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_send.2#3 integrate
.. //depot/projects/iwarp/lib/libc/sys/mq_setattr.2#3 integrate
.. //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#4 integrate
.. //depot/projects/iwarp/share/man/man4/Makefile#9 integrate
.. //depot/projects/iwarp/share/man/man4/ng_nat.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/uchcom.4#1 branch
.. //depot/projects/iwarp/share/man/man4/ucom.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/ucycom.4#2 integrate
.. //depot/projects/iwarp/share/man/man9/Makefile#9 integrate
.. //depot/projects/iwarp/share/man/man9/lock.9#5 integrate
.. //depot/projects/iwarp/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/iwarp/sys/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/iwarp/sys/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/iwarp/sys/conf/NOTES#9 integrate
.. //depot/projects/iwarp/sys/conf/files#12 integrate
.. //depot/projects/iwarp/sys/dev/em/LICENSE#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82575.c#3 delete
.. //depot/projects/iwarp/sys/dev/em/e1000_82575.h#3 delete
.. //depot/projects/iwarp/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/iwarp/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/iwarp/sys/dev/em/if_em.h#3 integrate
.. //depot/projects/iwarp/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/iwarp/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/iwarp/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/iwarp/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/iwarp/sys/fs/nwfs/nwfs_subr.c#2 integrate
.. //depot/projects/iwarp/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/iwarp/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/iwarp/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/iwarp/sys/kern/kern_lock.c#7 integrate
.. //depot/projects/iwarp/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/iwarp/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/iwarp/sys/modules/Makefile#7 integrate
.. //depot/projects/iwarp/sys/modules/cxgb/Makefile#6 integrate
.. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#12 integrate
.. //depot/projects/iwarp/sys/modules/em/Makefile#2 integrate
.. //depot/projects/iwarp/sys/modules/igb/Makefile#1 branch
.. //depot/projects/iwarp/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/iwarp/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/iwarp/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/iwarp/sys/netgraph/ng_nat.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/iwarp/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/iwarp/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/iwarp/sys/netncp/ncp_conn.h#2 integrate
.. //depot/projects/iwarp/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/iwarp/sys/nfs4client/nfs4_idmap.c#3 integrate
.. //depot/projects/iwarp/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/iwarp/sys/security/audit/audit.c#7 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_bsm_klib.c#5 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_private.h#3 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_worker.c#5 integrate
.. //depot/projects/iwarp/sys/sys/buf.h#4 integrate
.. //depot/projects/iwarp/sys/sys/bufobj.h#2 integrate
.. //depot/projects/iwarp/sys/sys/lockmgr.h#6 integrate
.. //depot/projects/iwarp/sys/sys/mount.h#2 integrate
.. //depot/projects/iwarp/sys/sys/param.h#10 integrate
.. //depot/projects/iwarp/sys/sys/vnode.h#5 integrate
.. //depot/projects/iwarp/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate
.. //depot/projects/iwarp/tools/regression/environ/envctl.c#2 integrate
.. //depot/projects/iwarp/usr.bin/unifdef/unifdef.c#2 integrate

Differences ...

==== //depot/projects/iwarp/UPDATING#7 (text+ko) ====

@@ -22,6 +22,12 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080229:
+	The latest em driver no longer has support in it for the
+	82575 adapter, this is now moved to the igb driver. The
+	split was done to make new features that are incompatible
+	with older hardware easier to do.
+
 20080220:
 	The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4),
 	likewise the kernel option is now GEOM_LINUX_LVM.
@@ -983,4 +989,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.521 2008/02/29 22:08:49 jfv Exp $

==== //depot/projects/iwarp/lib/libc/sys/mq_close.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_CLOSE 2
@@ -95,11 +95,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_getattr.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_GETATTR 2
@@ -117,11 +117,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_notify.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.9 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.10 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_NOTIFY 2
@@ -141,11 +141,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_open.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.9 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.10 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_OPEN 2
@@ -313,11 +313,11 @@
 and contain no other slash characters.
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_receive.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.6 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.7 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_RECEIVE 2
@@ -207,11 +207,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_send.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SEND 2
@@ -226,11 +226,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/lib/libc/sys/mq_setattr.2#3 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.6 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.7 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SETATTR 2
@@ -113,11 +113,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#4 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.145 2007/12/10 02:31:00 sam Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.146 2008/02/29 20:42:17 sam Exp $
 .\"
-.Dd December 8, 2007
+.Dd February 29, 2008
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -779,6 +779,8 @@
 .It Cm deftxkey Ar index
 Set the default key to use for transmission.
 Typically this is only set when using WEP encryption.
+Note that you must set a default transmit key
+for the system to know which key to use in encrypting outbound traffic.
 The
 .Cm weptxkey
 is an alias for this request; it is provided for backwards compatibility.
@@ -1263,6 +1265,10 @@
 If that is the case, then the first four keys
 (1-4) will be the standard temporary keys and any others will be adaptor
 specific keys such as permanent keys stored in NVRAM.
+.Pp
+Note that you must set a default transmit key with
+.Cm deftxkey
+for the system to know which key to use in encrypting outbound traffic.
 .It Cm wme
 Enable Wireless Multimedia Extensions (WME) support, if available,
 for the specified interface.

==== //depot/projects/iwarp/share/man/man4/Makefile#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.409 2008/02/20 07:50:12 thompsa Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.410 2008/03/01 13:05:03 brueffer Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -372,6 +372,7 @@
 	ubsec.4 \
 	ubser.4 \
 	ubtbcmfw.4 \
+	uchcom.4 \
 	ucom.4 \
 	ucycom.4 \
 	udav.4 \

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

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.3 2007/05/22 12:23:39 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.4 2008/03/01 17:14:02 mav Exp $
 .\"
-.Dd May 6, 2005
+.Dd March 1, 2008
 .Dt NG_NAT 4
 .Os
 .Sh NAME
@@ -42,7 +42,6 @@
 node uses
 .Xr libalias 3
 engine for packet aliasing.
-At this moment it supports only the basic functionality of the library.
 .Sh HOOKS
 This node type has two hooks:
 .Bl -tag -width indent
@@ -81,7 +80,194 @@
 Configure target address for a node.
 When an incoming packet not associated with any pre-existing aliasing 
 link arrives at the host machine, it will be sent to the specified address.
+.It Dv NGM_NAT_REDIRECT_PORT Pq Li redirectport
+Redirect incoming connections arriving to given port(s) to
+another host and port(s).
+The following
+.Vt "struct ng_nat_redirect_port"
+must be supplied as argument.
+.Bd -literal
+#define NG_NAT_DESC_LENGTH	64
+struct ng_nat_redirect_port {
+	struct in_addr	local_addr;
+	struct in_addr	alias_addr;
+	struct in_addr	remote_addr;
+	uint16_t	local_port;
+	uint16_t	alias_port;
+	uint16_t	remote_port;
+	uint8_t		proto;
+	char		description[NG_NAT_DESC_LENGTH];
+};
+.Ed
+.Pp
+Redirection is assigned an unique ID which is returned as
+response to this message, and
+information about redirection added to
+list of static redirects which later can be retrieved by
+.Dv NGM_NAT_LIST_REDIRECTS
+message.
+.It Dv NGM_NAT_REDIRECT_ADDR Pq Li redirectaddr
+Redirect traffic for public IP address to a machine on the
+local network.
+This function is known as
+.Em static NAT .
+The following
+.Vt "struct ng_nat_redirect_addr"
+must be supplied as argument.
+.Bd -literal
+struct ng_nat_redirect_addr {
+	struct in_addr	local_addr;
+	struct in_addr	alias_addr;
+	char		description[NG_NAT_DESC_LENGTH];
+};
+.Ed
+.Pp
+Unique ID for this redirection is returned as response to this message.
+.It Dv NGM_NAT_REDIRECT_PROTO Pq Li redirectproto
+Redirect incoming IP packets of protocol
+.Va proto
+(see
+.Xr protocols 5 )
+to a machine on the local network.
+The following
+.Vt "struct ng_nat_redirect_proto"
+must be supplied as argument.
+.Bd -literal
+struct ng_nat_redirect_proto {
+	struct in_addr	local_addr;
+	struct in_addr	alias_addr;
+	struct in_addr	remote_addr;
+	uint8_t		proto;
+	char		description[NG_NAT_DESC_LENGTH];
+};
+.Ed
+.Pp
+Unique ID for this redirection is returned as response to this message.
+.It Dv NGM_NAT_REDIRECT_DYNAMIC Pq Li redirectdynamic
+Mark redirection with specified ID as dynamic, i.e., it will serve
+for exactly one next connection and then will be automatically
+deleted from internal links table.
+Only fully specified links can be made dynamic.
+The redirection with this ID is also immediately deleted from
+user-visible list of static redirects (available through
+.Dv NGM_NAT_LIST_REDIRECTS
+message).
+.It Dv NGM_NAT_REDIRECT_DELETE Pq Li redirectdelete
+Delete redirection with specified ID (currently active
+connections are not affected).
+.It Dv NGM_NAT_ADD_SERVER Pq Li addserver
+Add another server to a pool.
+This is used to transparently offload network load on a single server
+and distribute the load across a pool of servers, also known as
+.Em LSNAT
+(RFC 2391).
+The following
+.Vt "struct ng_nat_add_server"
+must be supplied as argument.
+.Bd -literal
+struct ng_nat_add_server {
+	uint32_t	id;
+	struct in_addr	addr;
+	uint16_t	port;
+};
+.Ed
+.Pp
+First, the redirection is set up by
+.Dv NGM_NAT_REDIRECT_PORT
+or
+.Dv NGM_NAT_REDIRECT_ADDR .
+Then, ID of that redirection is used in multiple
+.Dv NGM_NAT_ADD_SERVER
+messages to add necessary number of servers.
+For redirections created by
+.Dv NGM_NAT_REDIRECT_ADDR ,
+the
+.Va port
+is ignored and could have any value.
+Original redirection's parameters
+.Va local_addr
+and
+.Va local_port
+are also ignored after
+.Dv NGM_NAT_ADD_SERVER
+was used (they are effectively replaced by server pool).
+.It Dv NGM_NAT_LIST_REDIRECTS Pq Li listredirects
+Return list of configured static redirects as
+.Vt "struct ng_nat_list_redirects".
+.Bd -literal
+struct ng_nat_listrdrs_entry {
+	uint32_t	id;		/* Anything except zero */
+	struct in_addr	local_addr;
+	struct in_addr	alias_addr;
+	struct in_addr	remote_addr;
+	uint16_t	local_port;
+	uint16_t	alias_port;
+	uint16_t	remote_port;
+	uint16_t	proto;		/* Valid proto or NG_NAT_REDIRPROTO_ADDR */
+	uint16_t	lsnat;		/* LSNAT servers count */
+	char		description[NG_NAT_DESC_LENGTH];
+};
+struct ng_nat_list_redirects {
+	uint32_t		total_count;
+	struct ng_nat_listrdrs_entry redirects[];
+};
+#define NG_NAT_REDIRPROTO_ADDR	(IPPROTO_MAX + 3)
+.Ed
+.Pp
+Entries of the
+.Va redirects
+array returned in the unified format for all redirect types.
+Ports are meaningful only if protocol is either TCP or UDP
+and
+.Em static NAT
+redirection (created by
+.Dv NGM_NAT_REDIRECT_ADDR )
+is indicated by
+.Va proto
+set to
+.Dv NG_NAT_REDIRPROTO_ADDR .
+If
+.Va lsnat
+servers counter is greater than zero, then
+.Va local_addr
+and
+.Va local_port
+are also meaningless.
+.It Dv NGM_NAT_PROXY_RULE Pq Li proxyrule
+Specify a transparent proxying rule (string must be
+supplied as argument).
+See
+.Xr libalias 3
+for details.
 .El
+.Pp
+In all redirection messages
+.Va local_addr
+and
+.Va local_port
+mean address and port of target machine in the internal network,
+respectively.
+If
+.Va alias_addr
+is zero, then default aliasing address (set by
+.Dv NGM_NAT_SET_IPADDR )
+is used.
+Connections can also be restricted to be accepted only
+from specific external machines by using non-zero
+.Va remote_addr
+and/or
+.Va remote_port .
+Each redirection assigned an ID which can be later used for
+redirection manipulation on individual basis (e.g., removal).
+This ID guaranteed to be unique until the node shuts down
+(it will not be reused after deletion), and is returned to
+user after making each new redirection or can be found in
+the stored list of all redirections.
+The
+.Va description
+passed to and from node unchanged, together with ID providing
+a way for several entities to concurrently manipulate
+redirections in automated way.
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN

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

@@ -34,9 +34,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.8 2007/06/30 14:36:37 imp Exp $
+.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.9 2008/03/01 13:28:27 brueffer Exp $
 .\"
-.Dd November 18, 2006
+.Dd March 1, 2008
 .Dt UCOM 4
 .Os
 .Sh NAME
@@ -91,6 +91,7 @@
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr uark 4 ,
+.Xr uchcom 4 ,
 .Xr uftdi 4 ,
 .Xr umct 4 ,
 .Xr umodem 4 ,

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

@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ucycom.4,v 1.4 2006/11/22 21:30:02 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ucycom.4,v 1.5 2008/03/01 11:35:30 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UCYCOM 4
@@ -47,16 +47,6 @@
 .Bd -literal -offset indent
 ucycom_load="YES"
 .Ed
-.Sh HARDWARE
-The
-.Nm
-driver currently supports the following devices which incorporate
-Cypress USB to RS232 bridge chips:
-.Pp
-.Bl -bullet -compact
-.It
-DeLorme Earthmate USB GPS receiver
-.El
 .Sh DESCRIPTION
 The
 .Nm
@@ -69,6 +59,16 @@
 .Nm
 driver behaves like a
 .Xr tty 4 .
+.Sh HARDWARE
+The
+.Nm
+driver currently supports the following devices which incorporate
+Cypress USB to RS232 bridge chips:
+.Pp
+.Bl -bullet -compact
+.It
+DeLorme Earthmate USB GPS receiver
+.El
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr usb 4

==== //depot/projects/iwarp/share/man/man9/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.330 2008/02/26 21:40:30 davidc Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.331 2008/03/01 20:39:56 attilio Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -718,6 +718,7 @@
 MLINKS+=lock.9 lockdestroy.9 \
 	lock.9 lockinit.9 \
 	lock.9 lockmgr.9 \
+	lock.9 lockmgr_args.9 \
 	lock.9 lockmgr_assert.9 \
 	lock.9 lockmgr_disown.9 \
 	lock.9 lockmgr_printinfo.9 \

==== //depot/projects/iwarp/share/man/man9/lock.9#5 (text+ko) ====

@@ -24,23 +24,25 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.29 2008/03/01 21:24:07 attilio Exp $
 .\"
-.Dd February 25, 2008
+.Dd March 1, 2008
 .Dt LOCK 9
 .Os
 .Sh NAME
 .Nm lockinit ,
 .Nm lockdestroy ,
 .Nm lockmgr ,
-.Nm lockstatus ,
+.Nm lockmgr_args ,
 .Nm lockmgr_disown ,
 .Nm lockmgr_printinfo ,
 .Nm lockmgr_recursed ,
+.Nm lockstatus ,
 .Nm lockmgr_assert
 .Nd "lockmgr family of functions"
 .Sh SYNOPSIS
 .In sys/types.h
+.In sys/lock.h
 .In sys/lockmgr.h
 .Ft void
 .Fn lockinit "struct lock *lkp" "int prio" "const char *wmesg" "int timo" "int flags"
@@ -49,13 +51,15 @@
 .Ft int
 .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp"
 .Ft int
-.Fn lockstatus "struct lock *lkp"
+.Fn lockmgr_args "struct lock *lkp" "u_int flags" "struct mtx *interlkp" "const char *wmesg" "int prio" "int timo"
 .Ft void
 .Fn lockmgr_disown "struct lock *lkp"
 .Ft void
 .Fn lockmgr_printinfo "struct lock *lkp"
 .Ft int
 .Fn lockmgr_recursed "struct lock *lkp"
+.Ft int
+.Fn lockstatus "struct lock *lkp"
 .Pp
 .Cd "options INVARIANTS"
 .Cd "options INVARIANT_SUPPORT"
@@ -81,14 +85,12 @@
 The timeout value passed to
 .Xr sleep 9 .
 .It Fa flags
-The flags the lock is to be initialized with.
+The flags the lock is to be initialized with:
 .Bl -tag -width ".Dv LK_CANRECURSE"
-.It Dv LK_NOWAIT
-Do not sleep while acquiring the lock.
-.It Dv LK_SLEEPFAIL
-Fail after a sleep.
 .It Dv LK_CANRECURSE
 Allow recursive exclusive locks.
+.It Dv LK_NOPROFILE
+Disable lock profiling for this lock.
 .It Dv LK_NOSHARE
 Allow exclusive locks only.
 .It Dv LK_NOWITNESS
@@ -98,6 +100,10 @@
 .It Dv LK_NODUP
 .Xr witness 4
 should log messages about duplicate locks being acquired.
+.It Dv LK_QUIET
+Disable
+.Xr ktr 4
+logging for this lock.
 .It Dv LK_TIMELOCK
 Use
 .Fa timo
@@ -179,8 +185,20 @@
 .El
 .Pp
 The
-.Fn lockstatus
-function returns the status of the lock in relation to the current thread.
+.Fn lockmgr_args
+function works like
+.Fn lockmgr
+but accepting a
+.Fa wmesg ,
+.Fa timo
+and
+.Fa prio
+on a per-instance basis.  The specified values will override the default
+ones, but this can still be used passing, respectively,
+.Dv LK_WMESG_DEFAULT ,
+.Dv LK_PRIO_DEFAULT
+and
+.Dv LK_TIMO_DEFAULT .
 .Pp
 The
 .Fn lockmgr_disown
@@ -200,6 +218,10 @@
 function returns true if the lock is recursed, 0
 otherwise.
 .Pp
+The
+.Fn lockstatus
+function returns the status of the lock in relation to the current thread.
+.Pp
 When compiled with
 .Cd "options INVARIANTS"
 and

==== //depot/projects/iwarp/share/mk/bsd.cpu.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.64 2008/02/29 19:20:05 jhb Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
@@ -133,6 +133,8 @@
 MACHINE_CPU = 3dnow mmx i586 i486 i386
 .  elif ${CPUTYPE} == "c3-2"
 MACHINE_CPU = sse mmx i586 i486 i386
+.  elif ${CPUTYPE} == "c7"
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "prescott"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m"

==== //depot/projects/iwarp/sys/boot/pc98/libpc98/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.24 2006/04/11 20:11:30 jhb Exp $
+# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.25 2008/02/29 05:06:06 nyan Exp $
 #
 LIB=			pc98
 INTERNALLIB=
@@ -10,6 +10,13 @@
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
 	time.c vidconsole.c
 
+# Enable PXE TFTP or NFS support, not both.
+.if defined(LOADER_TFTP_SUPPORT)
+CFLAGS+=	-DLOADER_TFTP_SUPPORT

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803012221.m21ML1m7086885>