svn commit: r227542 - in user/attilio/vmcontention:
cddl/contrib/opensolaris/cmd/zpool contrib/top etc
etc/periodic/daily include lib/libc/gen lib/msun/src release
rescue/rescue sbin/geom/class/mul...
Attilio Rao
attilio at FreeBSD.org
Tue Nov 15 23:32:31 UTC 2011
Author: attilio
Date: Tue Nov 15 23:32:30 2011
New Revision: 227542
URL: http://svn.freebsd.org/changeset/base/227542
Log:
MFC
Added:
user/attilio/vmcontention/sys/boot/fdt/dts/p1020rdb.dts
- copied unchanged from r227541, head/sys/boot/fdt/dts/p1020rdb.dts
user/attilio/vmcontention/sys/boot/fdt/dts/p3041ds.dts
- copied unchanged from r227541, head/sys/boot/fdt/dts/p3041ds.dts
user/attilio/vmcontention/tools/build/atomic.c
- copied unchanged from r227541, head/tools/build/atomic.c
user/attilio/vmcontention/tools/regression/lib/libc/gen/test-arc4random.c
- copied unchanged from r227541, head/tools/regression/lib/libc/gen/test-arc4random.c
Modified:
user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
user/attilio/vmcontention/etc/periodic/daily/310.accounting
user/attilio/vmcontention/etc/rc.resume
user/attilio/vmcontention/include/ctype.h
user/attilio/vmcontention/include/stdio.h
user/attilio/vmcontention/include/wchar.h
user/attilio/vmcontention/include/wctype.h
user/attilio/vmcontention/lib/libc/gen/arc4random.c
user/attilio/vmcontention/lib/msun/src/math.h
user/attilio/vmcontention/release/generate-release.sh
user/attilio/vmcontention/rescue/rescue/Makefile
user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c
user/attilio/vmcontention/sbin/gvinum/gvinum.c
user/attilio/vmcontention/sbin/ifconfig/ifconfig.8
user/attilio/vmcontention/sbin/ipfw/main.c
user/attilio/vmcontention/sbin/md5/md5.1
user/attilio/vmcontention/sbin/md5/md5.c
user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.8
user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.c
user/attilio/vmcontention/share/man/man4/ip.4
user/attilio/vmcontention/share/man/man4/mvs.4
user/attilio/vmcontention/share/man/man4/tcp.4
user/attilio/vmcontention/share/man/man4/ti.4
user/attilio/vmcontention/share/man/man7/release.7
user/attilio/vmcontention/share/man/man9/Makefile
user/attilio/vmcontention/share/man/man9/kobj.9
user/attilio/vmcontention/share/misc/committers-ports.dot
user/attilio/vmcontention/sys/amd64/include/_stdint.h
user/attilio/vmcontention/sys/cam/scsi/scsi_ch.h
user/attilio/vmcontention/sys/cam/scsi/scsi_ses.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_misc.c
user/attilio/vmcontention/sys/dev/bktr/bktr_reg.h
user/attilio/vmcontention/sys/dev/ofw/openfirm.c
user/attilio/vmcontention/sys/dev/puc/pucdata.c
user/attilio/vmcontention/sys/dev/sio/sio_pci.c
user/attilio/vmcontention/sys/dev/ti/if_ti.c
user/attilio/vmcontention/sys/dev/ti/if_tireg.h
user/attilio/vmcontention/sys/dev/usb/controller/xhci.c
user/attilio/vmcontention/sys/fs/devfs/devfs_rule.c
user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvfsops.c
user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvnops.c
user/attilio/vmcontention/sys/fs/pseudofs/pseudofs_vnops.c
user/attilio/vmcontention/sys/geom/geom_dev.c
user/attilio/vmcontention/sys/kern/kern_descrip.c
user/attilio/vmcontention/sys/kern/subr_kobj.c
user/attilio/vmcontention/sys/kern/subr_uio.c
user/attilio/vmcontention/sys/kern/sys_generic.c
user/attilio/vmcontention/sys/kern/uipc_socket.c
user/attilio/vmcontention/sys/kern/vfs_syscalls.c
user/attilio/vmcontention/sys/net/if_spppfr.c
user/attilio/vmcontention/sys/netinet/sctp_pcb.c
user/attilio/vmcontention/sys/netinet/sctp_structs.h
user/attilio/vmcontention/sys/netinet6/in6_mcast.c
user/attilio/vmcontention/sys/nfsclient/nfs_vfsops.c
user/attilio/vmcontention/sys/powerpc/powerpc/platform.c
user/attilio/vmcontention/sys/powerpc/powerpc/pmap_dispatch.c
user/attilio/vmcontention/sys/sparc64/include/pcpu.h
user/attilio/vmcontention/sys/sys/cdefs.h
user/attilio/vmcontention/sys/sys/kobj.h
user/attilio/vmcontention/sys/sys/syscallsubr.h
user/attilio/vmcontention/sys/sys/uio.h
user/attilio/vmcontention/sys/vm/device_pager.c
user/attilio/vmcontention/sys/vm/vm_object.h
user/attilio/vmcontention/sys/vm/vm_pager.c
user/attilio/vmcontention/sys/vm/vm_pager.h
user/attilio/vmcontention/tools/build/Makefile
user/attilio/vmcontention/tools/regression/lib/libc/gen/Makefile
user/attilio/vmcontention/usr.sbin/mtree/mtree.5
user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh
user/attilio/vmcontention/usr.sbin/pmccontrol/pmccontrol.c
user/attilio/vmcontention/usr.sbin/pmcstat/pmcpl_calltree.c
user/attilio/vmcontention/usr.sbin/pmcstat/pmcpl_gprof.c
user/attilio/vmcontention/usr.sbin/pmcstat/pmcstat.c
user/attilio/vmcontention/usr.sbin/pmcstat/pmcstat_log.c
user/attilio/vmcontention/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
user/attilio/vmcontention/ (props changed)
user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/contrib/bind9/ (props changed)
user/attilio/vmcontention/contrib/binutils/ (props changed)
user/attilio/vmcontention/contrib/bzip2/ (props changed)
user/attilio/vmcontention/contrib/com_err/ (props changed)
user/attilio/vmcontention/contrib/compiler-rt/ (props changed)
user/attilio/vmcontention/contrib/dialog/ (props changed)
user/attilio/vmcontention/contrib/ee/ (props changed)
user/attilio/vmcontention/contrib/expat/ (props changed)
user/attilio/vmcontention/contrib/file/ (props changed)
user/attilio/vmcontention/contrib/gcc/ (props changed)
user/attilio/vmcontention/contrib/gdb/ (props changed)
user/attilio/vmcontention/contrib/gdtoa/ (props changed)
user/attilio/vmcontention/contrib/gnu-sort/ (props changed)
user/attilio/vmcontention/contrib/groff/ (props changed)
user/attilio/vmcontention/contrib/less/ (props changed)
user/attilio/vmcontention/contrib/libpcap/ (props changed)
user/attilio/vmcontention/contrib/libstdc++/ (props changed)
user/attilio/vmcontention/contrib/llvm/ (props changed)
user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed)
user/attilio/vmcontention/contrib/ncurses/ (props changed)
user/attilio/vmcontention/contrib/netcat/ (props changed)
user/attilio/vmcontention/contrib/ntp/ (props changed)
user/attilio/vmcontention/contrib/one-true-awk/ (props changed)
user/attilio/vmcontention/contrib/openbsm/ (props changed)
user/attilio/vmcontention/contrib/openpam/ (props changed)
user/attilio/vmcontention/contrib/openresolv/ (props changed)
user/attilio/vmcontention/contrib/pf/ (props changed)
user/attilio/vmcontention/contrib/sendmail/ (props changed)
user/attilio/vmcontention/contrib/tcpdump/ (props changed)
user/attilio/vmcontention/contrib/tcsh/ (props changed)
user/attilio/vmcontention/contrib/tnftp/ (props changed)
user/attilio/vmcontention/contrib/top/ (props changed)
user/attilio/vmcontention/contrib/top/install-sh (props changed)
user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed)
user/attilio/vmcontention/contrib/tzcode/zic/ (props changed)
user/attilio/vmcontention/contrib/tzdata/ (props changed)
user/attilio/vmcontention/contrib/wpa/ (props changed)
user/attilio/vmcontention/contrib/xz/ (props changed)
user/attilio/vmcontention/crypto/heimdal/ (props changed)
user/attilio/vmcontention/crypto/openssh/ (props changed)
user/attilio/vmcontention/crypto/openssl/ (props changed)
user/attilio/vmcontention/gnu/lib/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed)
user/attilio/vmcontention/lib/libc/ (props changed)
user/attilio/vmcontention/lib/libc/stdtime/ (props changed)
user/attilio/vmcontention/lib/libutil/ (props changed)
user/attilio/vmcontention/lib/libz/ (props changed)
user/attilio/vmcontention/sbin/ (props changed)
user/attilio/vmcontention/sbin/ipfw/ (props changed)
user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed)
user/attilio/vmcontention/share/zoneinfo/ (props changed)
user/attilio/vmcontention/sys/ (props changed)
user/attilio/vmcontention/sys/amd64/include/xen/ (props changed)
user/attilio/vmcontention/sys/boot/ (props changed)
user/attilio/vmcontention/sys/boot/i386/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed)
user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/sys/conf/ (props changed)
user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed)
user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed)
user/attilio/vmcontention/sys/contrib/pf/ (props changed)
user/attilio/vmcontention/sys/contrib/x86emu/ (props changed)
user/attilio/vmcontention/usr.bin/calendar/ (props changed)
user/attilio/vmcontention/usr.bin/csup/ (props changed)
user/attilio/vmcontention/usr.bin/procstat/ (props changed)
user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed)
user/attilio/vmcontention/usr.sbin/rtsold/ (props changed)
user/attilio/vmcontention/usr.sbin/zic/ (props changed)
Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
*/
#include <solaris.h>
@@ -2206,10 +2207,15 @@ print_vdev_stats(zpool_handle_t *zhp, co
return;
for (c = 0; c < children; c++) {
- uint64_t ishole = B_FALSE;
+ uint64_t ishole = B_FALSE, islog = B_FALSE;
- if (nvlist_lookup_uint64(newchild[c],
- ZPOOL_CONFIG_IS_HOLE, &ishole) == 0 && ishole)
+ (void) nvlist_lookup_uint64(newchild[c], ZPOOL_CONFIG_IS_HOLE,
+ &ishole);
+
+ (void) nvlist_lookup_uint64(newchild[c], ZPOOL_CONFIG_IS_LOG,
+ &islog);
+
+ if (ishole || islog)
continue;
vname = zpool_vdev_name(g_zfs, zhp, newchild[c], B_FALSE);
@@ -2219,6 +2225,31 @@ print_vdev_stats(zpool_handle_t *zhp, co
}
/*
+ * Log device section
+ */
+
+ if (num_logs(newnv) > 0) {
+ (void) printf("%-*s - - - - - "
+ "-\n", cb->cb_namewidth, "logs");
+
+ for (c = 0; c < children; c++) {
+ uint64_t islog = B_FALSE;
+ (void) nvlist_lookup_uint64(newchild[c],
+ ZPOOL_CONFIG_IS_LOG, &islog);
+
+ if (islog) {
+ vname = zpool_vdev_name(g_zfs, zhp, newchild[c],
+ B_FALSE);
+ print_vdev_stats(zhp, vname, oldnv ?
+ oldchild[c] : NULL, newchild[c],
+ cb, depth + 2);
+ free(vname);
+ }
+ }
+
+ }
+
+ /*
* Include level 2 ARC devices in iostat output
*/
if (nvlist_lookup_nvlist_array(newnv, ZPOOL_CONFIG_L2CACHE,
@@ -3565,10 +3596,16 @@ print_dedup_stats(nvlist_t *config)
* table continue processing the stats.
*/
if (nvlist_lookup_uint64_array(config, ZPOOL_CONFIG_DDT_OBJ_STATS,
- (uint64_t **)&ddo, &c) != 0 || ddo->ddo_count == 0)
+ (uint64_t **)&ddo, &c) != 0)
return;
(void) printf("\n");
+ (void) printf(gettext(" dedup: "));
+ if (ddo->ddo_count == 0) {
+ (void) printf(gettext("no DDT entries\n"));
+ return;
+ }
+
(void) printf("DDT entries %llu, size %llu on disk, %llu in core\n",
(u_longlong_t)ddo->ddo_count,
(u_longlong_t)ddo->ddo_dspace,
Modified: user/attilio/vmcontention/etc/periodic/daily/310.accounting
==============================================================================
--- user/attilio/vmcontention/etc/periodic/daily/310.accounting Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/etc/periodic/daily/310.accounting Tue Nov 15 23:32:30 2011 (r227542)
@@ -30,8 +30,13 @@ case "$daily_accounting_enable" in
cd /var/account
rc=0
- n=$daily_accounting_save
- rm -f acct.$n.gz acct.$n || rc=3
+ n=$(( $daily_accounting_save - 1 ))
+ for f in acct.*; do
+ case "$f" in acct.\*) continue ;; esac # No files match
+ m=${f%.gz} ; m=${m#acct.}
+ [ $m -ge $n ] && { rm $f || rc=3; }
+ done
+
m=$n
n=$(($n - 1))
while [ $n -ge 0 ]
@@ -44,13 +49,14 @@ case "$daily_accounting_enable" in
/etc/rc.d/accounting rotate_log || rc=3
+ rm -f acct.merge && cp acct.0 acct.merge || rc=3
+ sa -s $daily_accounting_flags /var/account/acct.merge || rc=3
+ rm acct.merge
+
case "$daily_accounting_compress" in
[Yy][Ee][Ss])
- gzip --keep -f acct.0 || rc=3;;
+ gzip -f acct.0 || rc=3;;
esac
-
- sa -s $daily_accounting_flags /var/account/acct.0 &&
- unlink acct.0 || rc=3
fi;;
*) rc=0;;
Modified: user/attilio/vmcontention/etc/rc.resume
==============================================================================
--- user/attilio/vmcontention/etc/rc.resume Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/etc/rc.resume Tue Nov 15 23:32:30 2011 (r227542)
@@ -49,6 +49,10 @@ if [ -r /var/run/rc.suspend.tch ]; then
/bin/rm -f /var/run/rc.suspend.tch
fi
+if [ -r /var/run/moused.pid ]; then
+ kill -HUP `head -1 /var/run/moused.pid`
+fi
+
# Turns on a power supply of a card in the slot inactivated.
# See also contrib/pccardq.c (only for PAO users).
# pccardq | awk -F '~' '$5 == "inactive" \
Modified: user/attilio/vmcontention/include/ctype.h
==============================================================================
--- user/attilio/vmcontention/include/ctype.h Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/include/ctype.h Tue Nov 15 23:32:30 2011 (r227542)
@@ -80,6 +80,7 @@ int isspecial(int);
#endif
__END_DECLS
+#ifndef __cplusplus
#define isalnum(c) __sbistype((c), _CTYPE_A|_CTYPE_D)
#define isalpha(c) __sbistype((c), _CTYPE_A)
#define iscntrl(c) __sbistype((c), _CTYPE_C)
@@ -93,6 +94,7 @@ __END_DECLS
#define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */
#define tolower(c) __sbtolower(c)
#define toupper(c) __sbtoupper(c)
+#endif /* !__cplusplus */
#if __XSI_VISIBLE
/*
@@ -112,7 +114,7 @@ __END_DECLS
#define toascii(c) ((c) & 0x7F)
#endif
-#if __ISO_C_VISIBLE >= 1999
+#if __ISO_C_VISIBLE >= 1999 && !defined(__cplusplus)
#define isblank(c) __sbistype((c), _CTYPE_B)
#endif
Modified: user/attilio/vmcontention/include/stdio.h
==============================================================================
--- user/attilio/vmcontention/include/stdio.h Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/include/stdio.h Tue Nov 15 23:32:30 2011 (r227542)
@@ -107,7 +107,7 @@ struct __sbuf {
* inline functions. To preserve ABI compat, these members must not
* be disturbed. These members are marked below with (*).
*/
-typedef struct __sFILE {
+struct __sFILE {
unsigned char *_p; /* (*) current position in (some) buffer */
int _r; /* (*) read space left for getc() */
int _w; /* (*) write space left for putc() */
@@ -144,8 +144,11 @@ typedef struct __sFILE {
int _fl_count; /* recursive lock count */
int _orientation; /* orientation for fwide() */
__mbstate_t _mbstate; /* multibyte conversion state */
-} FILE;
-
+};
+#ifndef _STDFILE_DECLARED
+#define _STDFILE_DECLARED
+typedef struct __sFILE FILE;
+#endif
#ifndef _STDSTREAM_DECLARED
__BEGIN_DECLS
extern FILE *__stdinp;
@@ -467,6 +470,7 @@ static __inline int __sputc(int _c, FILE
__swbuf((int)(c), p) : \
(*(p)->_p = (c), (int)*(p)->_p++))
#endif
+#ifndef __cplusplus
#define __sfeof(p) (((p)->_flags & __SEOF) != 0)
#define __sferror(p) (((p)->_flags & __SERR) != 0)
@@ -506,6 +510,7 @@ extern int __isthreaded;
#define getchar_unlocked() getc_unlocked(stdin)
#define putchar_unlocked(x) putc_unlocked(x, stdout)
#endif
+#endif /* __cplusplus */
__END_DECLS
#endif /* !_STDIO_H_ */
Modified: user/attilio/vmcontention/include/wchar.h
==============================================================================
--- user/attilio/vmcontention/include/wchar.h Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/include/wchar.h Tue Nov 15 23:32:30 2011 (r227542)
@@ -97,20 +97,23 @@ typedef __wint_t wint_t;
#define WEOF ((wint_t)-1)
#endif
-struct __sFILE;
+#ifndef _STDFILE_DECLARED
+#define _STDFILE_DECLARED
+typedef struct __sFILE FILE;
+#endif
struct tm;
__BEGIN_DECLS
wint_t btowc(int);
-wint_t fgetwc(struct __sFILE *);
+wint_t fgetwc(FILE *);
wchar_t *
- fgetws(wchar_t * __restrict, int, struct __sFILE * __restrict);
-wint_t fputwc(wchar_t, struct __sFILE *);
-int fputws(const wchar_t * __restrict, struct __sFILE * __restrict);
-int fwide(struct __sFILE *, int);
-int fwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, ...);
-int fwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, ...);
-wint_t getwc(struct __sFILE *);
+ fgetws(wchar_t * __restrict, int, FILE * __restrict);
+wint_t fputwc(wchar_t, FILE *);
+int fputws(const wchar_t * __restrict, FILE * __restrict);
+int fwide(FILE *, int);
+int fwprintf(FILE * __restrict, const wchar_t * __restrict, ...);
+int fwscanf(FILE * __restrict, const wchar_t * __restrict, ...);
+wint_t getwc(FILE *);
wint_t getwchar(void);
size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
@@ -118,13 +121,13 @@ size_t mbrtowc(wchar_t * __restrict, con
int mbsinit(const mbstate_t *);
size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
mbstate_t * __restrict);
-wint_t putwc(wchar_t, struct __sFILE *);
+wint_t putwc(wchar_t, FILE *);
wint_t putwchar(wchar_t);
int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
...);
int swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...);
-wint_t ungetwc(wint_t, struct __sFILE *);
-int vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict,
+wint_t ungetwc(wint_t, FILE *);
+int vfwprintf(FILE * __restrict, const wchar_t * __restrict,
__va_list);
int vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
__va_list);
@@ -167,9 +170,9 @@ int wprintf(const wchar_t * __restrict,
int wscanf(const wchar_t * __restrict, ...);
#ifndef _STDSTREAM_DECLARED
-extern struct __sFILE *__stdinp;
-extern struct __sFILE *__stdoutp;
-extern struct __sFILE *__stderrp;
+extern FILE *__stdinp;
+extern FILE *__stdoutp;
+extern FILE *__stderrp;
#define _STDSTREAM_DECLARED
#endif
@@ -179,7 +182,7 @@ extern struct __sFILE *__stderrp;
#define putwchar(wc) fputwc(wc, __stdoutp)
#if __ISO_C_VISIBLE >= 1999
-int vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict,
+int vfwscanf(FILE * __restrict, const wchar_t * __restrict,
__va_list);
int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
__va_list);
@@ -217,7 +220,7 @@ size_t wcsnrtombs(char * __restrict, con
#endif
#if __BSD_VISIBLE
-wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict);
+wchar_t *fgetwln(FILE * __restrict, size_t * __restrict);
size_t wcslcat(wchar_t *, const wchar_t *, size_t);
size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
#endif
Modified: user/attilio/vmcontention/include/wctype.h
==============================================================================
--- user/attilio/vmcontention/include/wctype.h Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/include/wctype.h Tue Nov 15 23:32:30 2011 (r227542)
@@ -89,6 +89,7 @@ wint_t nextwctype(wint_t, wctype_t);
#endif
__END_DECLS
+#ifndef __cplusplus
#define iswalnum(wc) __istype((wc), _CTYPE_A|_CTYPE_D)
#define iswalpha(wc) __istype((wc), _CTYPE_A)
#define iswblank(wc) __istype((wc), _CTYPE_B)
@@ -113,6 +114,7 @@ __END_DECLS
#define iswphonogram(wc) __istype((wc), _CTYPE_Q)
#define iswrune(wc) __istype((wc), 0xFFFFFF00L)
#define iswspecial(wc) __istype((wc), _CTYPE_T)
-#endif
+#endif /* __BSD_VISIBLE */
+#endif /* __cplusplus */
#endif /* _WCTYPE_H_ */
Modified: user/attilio/vmcontention/lib/libc/gen/arc4random.c
==============================================================================
--- user/attilio/vmcontention/lib/libc/gen/arc4random.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/lib/libc/gen/arc4random.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -1,3 +1,5 @@
+/* $OpenBSD: arc4random.c,v 1.22 2010/12/22 08:23:42 otto Exp $ */
+
/*
* Copyright (c) 1996, David Mazieres <dm at uun.org>
* Copyright (c) 2008, Damien Miller <djm at openbsd.org>
@@ -24,11 +26,6 @@
* which is a trade secret). The same algorithm is used as a stream
* cipher called "arcfour" in Tatu Ylonen's ssh package.
*
- * Here the stream cipher has been modified always to include the time
- * when initializing the state. That makes it impossible to
- * regenerate the same random sequence twice, so this can't be used
- * for encryption, but will generate good random numbers.
- *
* RC4 is a registered trademark of RSA Laboratories.
*/
@@ -36,16 +33,24 @@
__FBSDID("$FreeBSD$");
#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdlib.h>
#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
#include <unistd.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
#include <pthread.h>
#include "libc_private.h"
#include "un-namespace.h"
+#ifdef __GNUC__
+#define inline __inline
+#else /* !__GNUC__ */
+#define inline
+#endif /* !__GNUC__ */
+
struct arc4_stream {
u_int8_t i;
u_int8_t j;
@@ -55,22 +60,22 @@ struct arc4_stream {
static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
#define RANDOMDEV "/dev/random"
-#define KEYSIZE 128
-#define THREAD_LOCK() \
+#define KEYSIZE 128
+#define _ARC4_LOCK() \
do { \
if (__isthreaded) \
_pthread_mutex_lock(&arc4random_mtx); \
} while (0)
-#define THREAD_UNLOCK() \
+#define _ARC4_UNLOCK() \
do { \
if (__isthreaded) \
_pthread_mutex_unlock(&arc4random_mtx); \
} while (0)
-static struct arc4_stream rs;
static int rs_initialized;
-static int rs_stired;
+static struct arc4_stream rs;
+static pid_t arc4_stir_pid;
static int arc4_count;
static inline u_int8_t arc4_getbyte(void);
@@ -107,20 +112,24 @@ arc4_addrandom(u_char *dat, int datlen)
static void
arc4_stir(void)
{
- int done, fd, n;
+ int done, fd, i;
struct {
struct timeval tv;
- pid_t pid;
- u_int8_t rnd[KEYSIZE];
+ pid_t pid;
+ u_char rnd[KEYSIZE];
} rdat;
+ if (!rs_initialized) {
+ arc4_init();
+ rs_initialized = 1;
+ }
fd = _open(RANDOMDEV, O_RDONLY, 0);
done = 0;
if (fd >= 0) {
if (_read(fd, &rdat, KEYSIZE) == KEYSIZE)
done = 1;
(void)_close(fd);
- }
+ }
if (!done) {
(void)gettimeofday(&rdat.tv, NULL);
rdat.pid = getpid();
@@ -130,17 +139,26 @@ arc4_stir(void)
arc4_addrandom((u_char *)&rdat, KEYSIZE);
/*
- * Throw away the first N bytes of output, as suggested in the
- * paper "Weaknesses in the Key Scheduling Algorithm of RC4"
- * by Fluher, Mantin, and Shamir. N=1024 is based on
- * suggestions in the paper "(Not So) Random Shuffles of RC4"
- * by Ilya Mironov.
+ * Discard early keystream, as per recommendations in:
+ * "(Not So) Random Shuffles of RC4" by Ilya Mironov.
*/
- for (n = 0; n < 1024; n++)
- (void) arc4_getbyte();
+ for (i = 0; i < 1024; i++)
+ (void)arc4_getbyte();
arc4_count = 1600000;
}
+static void
+arc4_stir_if_needed(void)
+{
+ pid_t pid = getpid();
+
+ if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid)
+ {
+ arc4_stir_pid = pid;
+ arc4_stir();
+ }
+}
+
static inline u_int8_t
arc4_getbyte(void)
{
@@ -152,7 +170,6 @@ arc4_getbyte(void)
sj = rs.s[rs.j];
rs.s[rs.i] = sj;
rs.s[rs.j] = si;
-
return (rs.s[(si + sj) & 0xff]);
}
@@ -160,81 +177,55 @@ static inline u_int32_t
arc4_getword(void)
{
u_int32_t val;
-
val = arc4_getbyte() << 24;
val |= arc4_getbyte() << 16;
val |= arc4_getbyte() << 8;
val |= arc4_getbyte();
-
- return (val);
-}
-
-static void
-arc4_check_init(void)
-{
- if (!rs_initialized) {
- arc4_init();
- rs_initialized = 1;
- }
-}
-
-static inline void
-arc4_check_stir(void)
-{
- if (!rs_stired || arc4_count <= 0) {
- arc4_stir();
- rs_stired = 1;
- }
+ return val;
}
void
arc4random_stir(void)
{
- THREAD_LOCK();
- arc4_check_init();
+ _ARC4_LOCK();
arc4_stir();
- rs_stired = 1;
- THREAD_UNLOCK();
+ _ARC4_UNLOCK();
}
void
arc4random_addrandom(u_char *dat, int datlen)
{
- THREAD_LOCK();
- arc4_check_init();
- arc4_check_stir();
+ _ARC4_LOCK();
+ if (!rs_initialized)
+ arc4_stir();
arc4_addrandom(dat, datlen);
- THREAD_UNLOCK();
+ _ARC4_UNLOCK();
}
u_int32_t
arc4random(void)
{
- u_int32_t rnd;
-
- THREAD_LOCK();
- arc4_check_init();
- arc4_check_stir();
- rnd = arc4_getword();
+ u_int32_t val;
+ _ARC4_LOCK();
arc4_count -= 4;
- THREAD_UNLOCK();
-
- return (rnd);
+ arc4_stir_if_needed();
+ val = arc4_getword();
+ _ARC4_UNLOCK();
+ return val;
}
void
arc4random_buf(void *_buf, size_t n)
{
u_char *buf = (u_char *)_buf;
-
- THREAD_LOCK();
- arc4_check_init();
+ _ARC4_LOCK();
+ arc4_stir_if_needed();
while (n--) {
- arc4_check_stir();
+ if (--arc4_count <= 0)
+ arc4_stir();
buf[n] = arc4_getbyte();
- arc4_count--;
}
- THREAD_UNLOCK();
+ _ARC4_UNLOCK();
}
/*
@@ -253,7 +244,7 @@ arc4random_uniform(u_int32_t upper_bound
u_int32_t r, min;
if (upper_bound < 2)
- return (0);
+ return 0;
#if (ULONG_MAX > 0xffffffffUL)
min = 0x100000000UL % upper_bound;
@@ -279,7 +270,7 @@ arc4random_uniform(u_int32_t upper_bound
break;
}
- return (r % upper_bound);
+ return r % upper_bound;
}
#if 0
Modified: user/attilio/vmcontention/lib/msun/src/math.h
==============================================================================
--- user/attilio/vmcontention/lib/msun/src/math.h Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/lib/msun/src/math.h Tue Nov 15 23:32:30 2011 (r227542)
@@ -395,32 +395,32 @@ float significandf(float);
* long double versions of ISO/POSIX math functions
*/
#if __ISO_C_VISIBLE >= 1999
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double acoshl(long double);
#endif
long double acosl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double asinhl(long double);
#endif
long double asinl(long double);
long double atan2l(long double, long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double atanhl(long double);
#endif
long double atanl(long double);
long double cbrtl(long double);
long double ceill(long double);
long double copysignl(long double, long double) __pure2;
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double coshl(long double);
#endif
long double cosl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double erfcl(long double);
long double erfl(long double);
#endif
long double exp2l(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double expl(long double);
long double expm1l(long double);
#endif
@@ -435,18 +435,18 @@ long double frexpl(long double value, in
long double hypotl(long double, long double);
int ilogbl(long double) __pure2;
long double ldexpl(long double, int);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double lgammal(long double);
#endif
long long llrintl(long double);
long long llroundl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double log10l(long double);
long double log1pl(long double);
long double log2l(long double);
#endif
long double logbl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double logl(long double);
#endif
long lrintl(long double);
@@ -458,7 +458,7 @@ long double nextafterl(long double, long
double nexttoward(double, long double);
float nexttowardf(float, long double);
long double nexttowardl(long double, long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double powl(long double, long double);
#endif
long double remainderl(long double, long double);
@@ -467,16 +467,16 @@ long double rintl(long double);
long double roundl(long double);
long double scalblnl(long double, long);
long double scalbnl(long double, int);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double sinhl(long double);
#endif
long double sinl(long double);
long double sqrtl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double tanhl(long double);
#endif
long double tanl(long double);
-#if 0
+#if _DECLARE_C99_LDBL_MATH
long double tgammal(long double);
#endif
long double truncl(long double);
Modified: user/attilio/vmcontention/release/generate-release.sh
==============================================================================
--- user/attilio/vmcontention/release/generate-release.sh Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/release/generate-release.sh Tue Nov 15 23:32:30 2011 (r227542)
@@ -14,6 +14,7 @@
# SVNROOT: SVN URL to FreeBSD source repository (by default,
# svn://svn.freebsd.org/base)
# MAKE_FLAGS: optional flags to pass to make (e.g. -j)
+# RELSTRING: optional base name for media images (e.g. FreeBSD-9.0-RC2-amd64)
#
# Note: Since this requires a chroot, release cross-builds will not work!
#
@@ -65,3 +66,12 @@ chroot $2 make -C /usr/src $MAKE_FLAGS b
chroot $2 make -C /usr/src/release release
chroot $2 make -C /usr/src/release install DESTDIR=/R
+: ${RELSTRING=`chroot $2 uname -s`-`chroot $2 uname -r`-`chroot $2 uname -p`}
+
+cd $2/R
+for i in release.iso bootonly.iso memstick; do
+ mv $i $RELSTRING-$i
+done
+sha256 $RELSTRING-* > CHECKSUM.SHA256
+md5 $RELSTRING-* > CHECKSUM.MD5
+
Modified: user/attilio/vmcontention/rescue/rescue/Makefile
==============================================================================
--- user/attilio/vmcontention/rescue/rescue/Makefile Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/rescue/rescue/Makefile Tue Nov 15 23:32:30 2011 (r227542)
@@ -181,7 +181,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRU
#
CRUNCH_SRCDIRS+= usr.bin
-CRUNCH_PROGS_usr.bin= head mt sed tail tee
+CRUNCH_PROGS_usr.bin= head mt nc sed tail tee
CRUNCH_PROGS_usr.bin+= gzip
CRUNCH_ALIAS_gzip= gunzip gzcat zcat
Modified: user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -133,7 +133,8 @@ mp_label(struct gctl_req *req)
uint8_t *sector, *rsector;
char *ptr;
uuid_t uuid;
- uint32_t secsize = 0, ssize, status;
+ ssize_t secsize = 0, ssize;
+ uint32_t status;
const char *name, *name2, *mpname;
int error, i, nargs, fd;
@@ -161,8 +162,8 @@ mp_label(struct gctl_req *req)
disksize = msize;
} else {
if (secsize != ssize) {
- gctl_error(req, "%s sector size %u different.",
- name, ssize);
+ gctl_error(req, "%s sector size %ju different.",
+ name, (intmax_t)ssize);
return;
}
if (disksize != msize) {
@@ -240,7 +241,7 @@ mp_label(struct gctl_req *req)
continue;
}
if (pread(fd, rsector, secsize, disksize - secsize) !=
- secsize) {
+ (ssize_t)secsize) {
fprintf(stderr, "Unable to read metadata from %s: %s.\n",
name2, strerror(errno));
g_close(fd);
Modified: user/attilio/vmcontention/sbin/gvinum/gvinum.c
==============================================================================
--- user/attilio/vmcontention/sbin/gvinum/gvinum.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/gvinum/gvinum.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -557,7 +557,7 @@ find_pattern(char *line, char *pattern)
return (NULL);
}
-/* Find a free name for an object given a a prefix. */
+/* Find a free name for an object given a prefix. */
char *
find_name(const char *prefix, int type, int namelen)
{
Modified: user/attilio/vmcontention/sbin/ifconfig/ifconfig.8
==============================================================================
--- user/attilio/vmcontention/sbin/ifconfig/ifconfig.8 Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/ifconfig/ifconfig.8 Tue Nov 15 23:32:30 2011 (r227542)
@@ -28,7 +28,7 @@
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
.\" $FreeBSD$
.\"
-.Dd September 13, 2011
+.Dd November 12, 2011
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -1088,6 +1088,38 @@ The
specifies the number of beacon intervals between DTIM
and must be in the range 1 to 15.
By default DTIM is 1 (i.e., DTIM occurs at each beacon).
+.It Cm quiet
+Enable the use of quiet IE. Hostap will use this to silent other
+stations to reduce interference for radar detection when
+operating on 5Ghz frequency and doth support is enabled.
+Use
+.Fl quiet
+to disable this functionality.
+.It Cm quiet_period Ar period
+Set the QUIET
+.Ar period
+to the number of beacon intervals between the start of regularly
+scheduled quiet intervals defined by Quiet element.
+.It Cm quiet_count Ar count
+Set the QUIET
+.Ar count
+to the number of TBTTs until the beacon interval during which the
+next quiet interval shall start. A value of 1 indicates the quiet
+interval will start during the beacon interval starting at the next
+TBTT. A value 0 is reserved.
+.It Cm quiet_offset Ar offset
+Set the QUIET
+.Ar offset
+to the offset of the start of the quiet interval from the TBTT
+specified by the Quiet count, expressed in TUs.
+The value of the
+.Ar offset
+shall be less than one beacon interval.
+.It Cm quiet_duration Ar dur
+Set the QUIET
+.Ar dur
+to the duration of the Quiet interval, expressed in TUs.
+The value should be less than beacon interval.
.It Cm dturbo
Enable the use of Atheros Dynamic Turbo mode when communicating with
another Dynamic Turbo-capable station.
Modified: user/attilio/vmcontention/sbin/ipfw/main.c
==============================================================================
--- user/attilio/vmcontention/sbin/ipfw/main.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/ipfw/main.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -87,7 +87,7 @@ help(void)
* which includes the program name and a NULL entry at the end.
* If we are called with a single string, we split it on whitespace.
* Also, arguments with a trailing ',' are joined to the next one.
- * The pointers (av[]) and data are in a a single chunk of memory.
+ * The pointers (av[]) and data are in a single chunk of memory.
* av[0] points to the original program name, all other entries
* point into the allocated chunk.
*/
Modified: user/attilio/vmcontention/sbin/md5/md5.1
==============================================================================
--- user/attilio/vmcontention/sbin/md5/md5.1 Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/md5/md5.1 Tue Nov 15 23:32:30 2011 (r227542)
@@ -8,18 +8,22 @@
.Sh SYNOPSIS
.Nm md5
.Op Fl pqrtx
+.Op Fl c Ar string
.Op Fl s Ar string
.Op Ar
.Nm sha1
.Op Fl pqrtx
+.Op Fl c Ar string
.Op Fl s Ar string
.Op Ar
.Nm sha256
.Op Fl pqrtx
+.Op Fl c Ar string
.Op Fl s Ar string
.Op Ar
.Nm rmd160
.Op Fl pqrtx
+.Op Fl c Ar string
.Op Fl s Ar string
.Op Ar
.Sh DESCRIPTION
@@ -73,6 +77,9 @@ precede any files named on the command l
The hexadecimal checksum of each file listed on the command line is printed
after the options are processed.
.Bl -tag -width indent
+.It Fl c Ar string
+Compare files to this md5 string.
+(Note that this option is not yet useful if multiple files are specified.)
.It Fl s Ar string
Print a checksum of the given
.Ar string .
@@ -101,7 +108,8 @@ The
and
.Nm rmd160
utilities exit 0 on success,
-and 1 if at least one of the input files could not be read.
+1 if at least one of the input files could not be read,
+and 2 if at least one file does not have the same hash as the -c option.
.Sh SEE ALSO
.Xr cksum 1 ,
.Xr md5 3 ,
Modified: user/attilio/vmcontention/sbin/md5/md5.c
==============================================================================
--- user/attilio/vmcontention/sbin/md5/md5.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/md5/md5.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -44,6 +44,8 @@ __FBSDID("$FreeBSD$");
int qflag;
int rflag;
int sflag;
+unsigned char* checkAgainst;
+int checksFailed;
typedef void (DIGEST_Init)(void *);
typedef void (DIGEST_Update)(void *, const unsigned char *, size_t);
@@ -138,8 +140,13 @@ main(int argc, char *argv[])
digest = 0;
failed = 0;
- while ((ch = getopt(argc, argv, "pqrs:tx")) != -1)
+ checkAgainst = NULL;
+ checksFailed = 0;
+ while ((ch = getopt(argc, argv, "c:pqrs:tx")) != -1)
switch (ch) {
+ case 'c':
+ checkAgainst = optarg;
+ break;
case 'p':
MDFilter(&Algorithm[digest], 1);
break;
@@ -173,12 +180,19 @@ main(int argc, char *argv[])
failed++;
} else {
if (qflag)
- printf("%s\n", p);
+ printf("%s", p);
else if (rflag)
- printf("%s %s\n", p, *argv);
+ printf("%s %s", p, *argv);
else
- printf("%s (%s) = %s\n",
+ printf("%s (%s) = %s",
Algorithm[digest].name, *argv, p);
+ if (checkAgainst && strcmp(checkAgainst,p))
+ {
+ checksFailed++;
+ if (!qflag)
+ printf(" [ Failed ]");
+ }
+ printf("\n");
}
} while (*++argv);
} else if (!sflag && (optind == 1 || qflag || rflag))
@@ -186,6 +200,8 @@ main(int argc, char *argv[])
if (failed != 0)
return (1);
+ if (checksFailed != 0)
+ return (2);
return (0);
}
@@ -198,12 +214,20 @@ MDString(Algorithm_t *alg, const char *s
size_t len = strlen(string);
char buf[HEX_DIGEST_LENGTH];
+ alg->Data(string,len,buf);
if (qflag)
- printf("%s\n", alg->Data(string, len, buf));
+ printf("%s", buf);
else if (rflag)
- printf("%s \"%s\"\n", alg->Data(string, len, buf), string);
+ printf("%s \"%s\"", buf, string);
else
- printf("%s (\"%s\") = %s\n", alg->name, string, alg->Data(string, len, buf));
+ printf("%s (\"%s\") = %s", alg->name, string, buf);
+ if (checkAgainst && strcmp(buf,checkAgainst))
+ {
+ checksFailed++;
+ if (!qflag)
+ printf(" [ failed ]");
+ }
+ printf("\n");
}
/*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
Modified: user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.8
==============================================================================
--- user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.8 Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.8 Tue Nov 15 23:32:30 2011 (r227542)
@@ -318,6 +318,10 @@ tune the timeout
interval.)
.It Cm udp
Use UDP transport.
+.It Cm wcommitsize Ns = Ns Aq Ar value
+Set the maximum pending write commit size to the specified value.
+This determines the maximum amount of pending write data that the NFS
+client is willing to cache for each file.
.It Cm wsize Ns = Ns Aq Ar value
Set the write data size to the specified value.
Ditto the comments w.r.t.\& the
Modified: user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.c Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/sbin/mount_nfs/mount_nfs.c Tue Nov 15 23:32:30 2011 (r227542)
@@ -612,6 +612,13 @@ fallback_mount(struct iovec *iov, int io
}
args.flags |= NFSMNT_ACDIRMAX;
}
+ if (findopt(iov, iovlen, "wcommitsize", &opt, NULL) == 0) {
+ ret = sscanf(opt, "%d", &args.wcommitsize);
+ if (ret != 1 || args.wcommitsize < 0) {
+ errx(1, "illegal wcommitsize: %s", opt);
+ }
+ args.flags |= NFSMNT_WCOMMITSIZE;
+ }
if (findopt(iov, iovlen, "deadthresh", &opt, NULL) == 0) {
ret = sscanf(opt, "%d", &args.deadthresh);
if (ret != 1 || args.deadthresh <= 0) {
Modified: user/attilio/vmcontention/share/man/man4/ip.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/ip.4 Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/share/man/man4/ip.4 Tue Nov 15 23:32:30 2011 (r227542)
@@ -32,7 +32,7 @@
.\" @(#)ip.4 8.2 (Berkeley) 11/30/93
.\" $FreeBSD$
.\"
-.Dd June 1, 2009
+.Dd November 14, 2011
.Dt IP 4
.Os
.Sh NAME
@@ -847,3 +847,10 @@ The
.Vt ip_mreqn
structure appeared in
.Tn Linux 2.4 .
+.Sh BUGS
+Before
+.Fx 10.0
+packets received on raw IP sockets had the
+.Va ip_hl
+subtracted from the
+.Va ip_len field.
Modified: user/attilio/vmcontention/share/man/man4/mvs.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/mvs.4 Tue Nov 15 20:48:57 2011 (r227541)
+++ user/attilio/vmcontention/share/man/man4/mvs.4 Tue Nov 15 23:32:30 2011 (r227542)
@@ -120,9 +120,8 @@ The
.Nm
driver supports the following controllers:
.Pp
-.Bl -tag -compact
-.It Gen-I (SATA 1.5Gbps):
-.Bl -bullet -compact
+Gen-I (SATA 1.5Gbps):
+.Bl -bullet -compact -offset "xxxxxx"
.It
88SX5040
.It
@@ -132,8 +131,9 @@ driver supports the following controller
.It
88SX5081
.El
-.It Gen-II (SATA 3Gbps, NCQ, PMP):
-.Bl -bullet -compact
+.Pp
+Gen-II (SATA 3Gbps, NCQ, PMP):
+.Bl -bullet -compact -offset "xxxxxx"
.It
88SX6040
.It
@@ -143,8 +143,9 @@ driver supports the following controller
.It
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list