Date: Sat, 3 Nov 2012 13:29:18 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242513 - in projects/efika_mx: . bin/ln etc lib/libc++ lib/libutil sbin/dumpon sbin/fsck_msdosfs sbin/ipfw share/man/man4 share/misc sys/compat/linux sys/dev/ath sys/dev/ath/ath_hal sy... Message-ID: <201211031329.qA3DTIOI073430@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Sat Nov 3 13:29:18 2012 New Revision: 242513 URL: http://svn.freebsd.org/changeset/base/242513 Log: MFC @r242511 Modified: projects/efika_mx/ObsoleteFiles.inc projects/efika_mx/UPDATING projects/efika_mx/bin/ln/ln.1 projects/efika_mx/etc/disktab projects/efika_mx/lib/libc++/Makefile projects/efika_mx/lib/libutil/pw_util.3 projects/efika_mx/sbin/dumpon/dumpon.8 projects/efika_mx/sbin/dumpon/dumpon.c projects/efika_mx/sbin/fsck_msdosfs/check.c projects/efika_mx/sbin/ipfw/ipfw.8 projects/efika_mx/share/man/man4/hwpmc.4 projects/efika_mx/share/man/man4/ng_atm.4 projects/efika_mx/share/man/man4/ng_netflow.4 projects/efika_mx/share/man/man4/textdump.4 projects/efika_mx/share/misc/bsd-family-tree projects/efika_mx/share/misc/pci_vendors projects/efika_mx/sys/compat/linux/linux_misc.c projects/efika_mx/sys/dev/ath/ath_hal/ah.h projects/efika_mx/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/efika_mx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/efika_mx/sys/dev/ath/if_ath_debug.c projects/efika_mx/sys/dev/ath/if_ath_debug.h projects/efika_mx/sys/dev/ath/if_athvar.h projects/efika_mx/sys/dev/drm2/drm_drv.c projects/efika_mx/sys/dev/isp/isp_pci.c projects/efika_mx/sys/dev/isp/isp_sbus.c projects/efika_mx/sys/dev/mfi/mfi.c projects/efika_mx/sys/fs/nullfs/null_vnops.c projects/efika_mx/sys/fs/unionfs/union_subr.c projects/efika_mx/sys/i386/ibcs2/imgact_coff.c projects/efika_mx/sys/kern/kern_exec.c projects/efika_mx/sys/kern/kern_shutdown.c projects/efika_mx/sys/kern/vfs_default.c projects/efika_mx/sys/kern/vfs_vnops.c projects/efika_mx/sys/kern/vnode_if.src projects/efika_mx/sys/libkern/strlcpy.c projects/efika_mx/sys/libkern/strlen.c projects/efika_mx/sys/mips/mips/busdma_machdep.c projects/efika_mx/sys/net/pfil.c projects/efika_mx/sys/net/pfil.h projects/efika_mx/sys/netinet/ip_fastfwd.c projects/efika_mx/sys/netinet/ip_input.c projects/efika_mx/sys/netinet/ip_output.c projects/efika_mx/sys/netinet/ip_var.h projects/efika_mx/sys/netinet/tcp_input.c projects/efika_mx/sys/netinet/udp_usrreq.c projects/efika_mx/sys/netinet6/ip6_forward.c projects/efika_mx/sys/netinet6/ip6_input.c projects/efika_mx/sys/netinet6/ip6_output.c projects/efika_mx/sys/netinet6/ip6_var.h projects/efika_mx/sys/netinet6/udp6_usrreq.c projects/efika_mx/sys/netpfil/ipfw/ip_fw2.c projects/efika_mx/sys/netpfil/ipfw/ip_fw_pfil.c projects/efika_mx/sys/sys/mutex.h projects/efika_mx/sys/ufs/ffs/ffs_softdep.c projects/efika_mx/sys/ufs/ufs/ufs_extattr.c projects/efika_mx/sys/vm/vnode_pager.c projects/efika_mx/usr.bin/kdump/mksubr projects/efika_mx/usr.sbin/makefs/mtree.c Directory Properties: projects/efika_mx/ (props changed) projects/efika_mx/lib/libutil/ (props changed) projects/efika_mx/sbin/ (props changed) projects/efika_mx/sbin/dumpon/ (props changed) projects/efika_mx/sbin/ipfw/ (props changed) projects/efika_mx/share/man/man4/ (props changed) projects/efika_mx/sys/ (props changed) Modified: projects/efika_mx/ObsoleteFiles.inc ============================================================================== --- projects/efika_mx/ObsoleteFiles.inc Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/ObsoleteFiles.inc Sat Nov 3 13:29:18 2012 (r242513) @@ -43,6 +43,9 @@ OLD_FILES+=usr/share/man/man9/VFS_LOCK_G OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz # 20121004: remove incomplete unwind.h OLD_FILES+=usr/include/clang/3.2/unwind.h +# 20120910: NetBSD compat shims removed +OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h +OLD_FILES+=usr/include/sys/device_port.h # 20120908: pf cleanup OLD_FILES+=usr/include/net/if_pflow.h # 20120816: new clang import which bumps version from 3.1 to 3.2 @@ -91,13 +94,19 @@ OLD_FILES+=usr/include/openssl/ui_locl.h OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz # 20120621: remove old man page OLD_FILES+=usr/share/man/man8/vnconfig.8.gz +# 20120619: TOE support updated +OLD_FILES+=usr/include/netinet/toedev.h # 20120613: auth.conf removed OLD_FILES+=etc/auth.conf OLD_FILES+=usr/share/examples/etc/auth.conf OLD_FILES+=usr/share/man/man3/auth.3.gz +OLD_FILES+=usr/share/man/man3/auth_getval.3.gz OLD_FILES+=usr/share/man/man5/auth.conf.5.gz # 20120530: kde pam lives now in ports OLD_FILES+=etc/pam.d/kde +# 20120521: byacc import +OLD_FILES+=usr/bin/yyfix +OLD_FILES+=usr/share/man/man1/yyfix.1.gz # 20120505: new clang import installed a redundant internal header OLD_FILES+=usr/include/clang/3.1/stdalign.h # 20120428: MD2 removed from libmd Modified: projects/efika_mx/UPDATING ============================================================================== --- projects/efika_mx/UPDATING Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/UPDATING Sat Nov 3 13:29:18 2012 (r242513) @@ -24,10 +24,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20121025: +20121102: The IPFIREWALL_FORWARD kernel option has been removed. Its - functionality now can be turned on using the net.pfil.forward - sysctl variable. + functionality now turned on by default. 20121023: The ZERO_COPY_SOCKET kernel option has been removed and Modified: projects/efika_mx/bin/ln/ln.1 ============================================================================== --- projects/efika_mx/bin/ln/ln.1 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/bin/ln/ln.1 Sat Nov 3 13:29:18 2012 (r242513) @@ -32,7 +32,7 @@ .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd July 17, 2009 +.Dd November 2, 2012 .Dt LN 1 .Os .Sh NAME @@ -212,6 +212,70 @@ No options may be supplied in this simpl which performs a .Xr link 2 operation using the two passed arguments. +.Sh EXAMPLES +Create a symbolic link named +.Pa /home/src +and point it to +.Pa /usr/src : +.Pp +.Dl # ln -s /usr/src /home/src +.Pp +Hard link +.Pa /usr/local/bin/fooprog +to file +.Pa /usr/local/bin/fooprog-1.0 : +.Pp +.Dl # ln /usr/local/bin/fooprog-1.0 /usr/local/bin/fooprog +.Pp +As an exercise, try the following commands: +.Bd -literal -offset indent +# ls -i /bin/[ +11553 /bin/[ +# ls -i /bin/test +11553 /bin/test +.Ed +.Pp +Note that both files have the same inode; that is, +.Pa /bin/[ +is essentially an alias for the +.Xr test 1 +command. +This hard link exists so +.Xr test 1 +may be invoked from shell scripts, for example, using the +.Li "if [ ]" +construct. +.Pp +In the next example, the second call to +.Nm +removes the original +.Pa foo +and creates a replacement pointing to +.Pa baz : +.Bd -literal -offset indent +# mkdir bar baz +# ln -s bar foo +# ln -shf baz foo +.Ed +.Pp +Without the +.Fl h +option, this would instead leave +.Pa foo +pointing to +.Pa bar +and inside +.Pa foo +create a new symlink +.Pa baz +pointing to itself. +This results from directory-walking. +.Pp +An easy rule to remember is that the argument order for +.Nm +is the same as for +.Xr cp 1 : +The first argument needs to exist, the second one is created. .Sh COMPATIBILITY The .Fl h , Modified: projects/efika_mx/etc/disktab ============================================================================== --- projects/efika_mx/etc/disktab Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/etc/disktab Sat Nov 3 13:29:18 2012 (r242513) @@ -42,6 +42,12 @@ fd1440|floppy|floppy3|3in|3.5in High Den :pa#2880:oa#0:ba#4096:fa#512:\ :pc#2880:oc#0:bc#4096:fc#512: +fd2880|2.88MB 3.5in Extra High Density Floppy:\ + :ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\ + :pa#5760:oa#0:ba#4096:fa#512:\ + :pb#5760:ob#0:bb#4096:fa#512:\ + :pc#5760:oc#0:bb#4096:fa#512: + # # Stressed floppy-formats. No guarantees given. # Modified: projects/efika_mx/lib/libc++/Makefile ============================================================================== --- projects/efika_mx/lib/libc++/Makefile Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/lib/libc++/Makefile Sat Nov 3 13:29:18 2012 (r242513) @@ -53,7 +53,7 @@ cxxrt_${_S}: WARNS= 0 CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT -.if !defined(CXXFLAGS) || ${CXXFLAGS:M-std=*}" == "" +.if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++0x .endif Modified: projects/efika_mx/lib/libutil/pw_util.3 ============================================================================== --- projects/efika_mx/lib/libutil/pw_util.3 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/lib/libutil/pw_util.3 Sat Nov 3 13:29:18 2012 (r242513) @@ -48,7 +48,7 @@ .In pwd.h .In libutil.h .Ft int -.Fn pw_copy "int ffd" "int tfd" "const struct passwd *pw" "const struct paddwd *oldpw" +.Fn pw_copy "int ffd" "int tfd" "const struct passwd *pw" "const struct passwd *oldpw" .Ft "struct passwd *" .Fn pw_dup "const struct passwd *pw" .Ft int Modified: projects/efika_mx/sbin/dumpon/dumpon.8 ============================================================================== --- projects/efika_mx/sbin/dumpon/dumpon.8 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/sbin/dumpon/dumpon.8 Sat Nov 3 13:29:18 2012 (r242513) @@ -42,6 +42,7 @@ .Op Fl v .Cm off .Nm +.Op Fl v .Fl l .Sh DESCRIPTION The Modified: projects/efika_mx/sbin/dumpon/dumpon.c ============================================================================== --- projects/efika_mx/sbin/dumpon/dumpon.c Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/sbin/dumpon/dumpon.c Sat Nov 3 13:29:18 2012 (r242513) @@ -64,7 +64,7 @@ usage(void) fprintf(stderr, "%s\n%s\n%s\n", "usage: dumpon [-v] special_file", " dumpon [-v] off", - " dumpon -l"); + " dumpon [-v] -l"); exit(EX_USAGE); } Modified: projects/efika_mx/sbin/fsck_msdosfs/check.c ============================================================================== --- projects/efika_mx/sbin/fsck_msdosfs/check.c Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/sbin/fsck_msdosfs/check.c Sat Nov 3 13:29:18 2012 (r242513) @@ -68,6 +68,7 @@ checkfilesys(const char *fname) if (dosfs < 0) { perr("Can't open `%s'", fname); + printf("\n"); return 8; } Modified: projects/efika_mx/sbin/ipfw/ipfw.8 ============================================================================== --- projects/efika_mx/sbin/ipfw/ipfw.8 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/sbin/ipfw/ipfw.8 Sat Nov 3 13:29:18 2012 (r242513) @@ -774,14 +774,6 @@ This makes the .Xr netstat 1 entry look rather weird but is intended for use with transparent proxy servers. -.Pp -To enable -.Cm fwd -the -.Xr sysctl 8 -variable -.Va net.pfil.forward -should be set to 1. .It Cm nat Ar nat_nr | tablearg Pass packet to a nat instance Modified: projects/efika_mx/share/man/man4/hwpmc.4 ============================================================================== --- projects/efika_mx/share/man/man4/hwpmc.4 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/man/man4/hwpmc.4 Sat Nov 3 13:29:18 2012 (r242513) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 22, 2008 +.Dd November 2, 2012 .Dt HWPMC 4 .Os .Sh NAME @@ -430,10 +430,10 @@ The default is 32. The number of log buffers used by .Nm for logging. -The default is 16. +The default is 64. .It Va kern.hwpmc.nsamples Pq integer, read-only The number of entries in the per-CPU ring buffer used during sampling. -The default is 16. +The default is 512. .It Va security.bsd.unprivileged_syspmcs Pq boolean, read-write If set to non-zero, allow unprivileged processes to allocate system-wide PMCs. Modified: projects/efika_mx/share/man/man4/ng_atm.4 ============================================================================== --- projects/efika_mx/share/man/man4/ng_atm.4 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/man/man4/ng_atm.4 Sat Nov 3 13:29:18 2012 (r242513) @@ -30,7 +30,7 @@ .\" .\" ng_atm(4) man page .\" -.Dd June 24, 2003 +.Dd November 2, 2012 .Dt NG_ATM 4 .Os .Sh NAME @@ -151,23 +151,23 @@ headers. .Sh CONTROL MESSAGES This node type supports the generic messages plus the following: .Bl -tag -width 4n -.It Dv NGM_ATM_GET_IFNAME +.It Dv NGM_ATM_GET_IFNAME Pq Ic getifname Return the name of the interface as a .Dv NUL Ns -terminated string. This is normally the same name as that of the node. -.It Dv NGM_ATM_GET_CONFIG +.It Dv NGM_ATM_GET_CONFIG Pq Ic getconfig Returns a structure defining the configuration of the interface: .Bd -literal -struct ng_atm_config { +struct ngm_atm_config { uint32_t pcr; /* peak cell rate */ - uint32_t maxvpi; /* maximum vpi */ - uint32_t maxvci; /* maximum vci */ + uint32_t vpi_bits; /* number of active VPI bits */ + uint32_t vci_bits; /* number of active VCI bits */ uint32_t max_vpcs; /* maximum number of VPCs */ uint32_t max_vccs; /* maximum number of VCCs */ }; .Ed -.It Dv NGM_ATM_GET_VCCS +.It Dv NGM_ATM_GET_VCCS Pq Ic getvccs Returns the table of open VCCs from the driver. This table consists of a header and a variable sized array of entries, one for each open VCC: @@ -190,7 +190,7 @@ struct atmio_tparam { uint32_t pcr; /* 24bit: Peak Cell Rate */ uint32_t scr; /* 24bit: VBR Sustainable Cell Rate */ uint32_t mbs; /* 24bit: VBR Maximum burst size */ - uint32_t mcr; /* 24bit: MCR */ + uint32_t mcr; /* 24bit: ABR/VBR/UBR+MCR MCR */ uint32_t icr; /* 24bit: ABR ICR */ uint32_t tbe; /* 24bit: ABR TBE (1...2^24-1) */ uint8_t nrm; /* 3bit: ABR Nrm */ @@ -264,23 +264,23 @@ all traffic types however): .It Dv ATMIO_TRAFFIC_ABR .It Dv ATMIO_TRAFFIC_VBR .El -.It Dv NGM_ATM_CPCS_INIT +.It Dv NGM_ATM_CPCS_INIT Pq Ic cpcsinit Initialize a VCC for sending and receiving. The argument is a structure: .Bd -literal -struct ng_atm_cpcs_init { +struct ngm_atm_cpcs_init { char name[NG_HOOKSIZ]; - uint32_t flags; /* flags. (if_natmio.h) */ + uint32_t flags; /* flags. (if_atm.h) */ uint16_t vci; /* VCI to open */ uint16_t vpi; /* VPI to open */ uint16_t rmtu; /* receive maximum PDU */ uint16_t tmtu; /* transmit maximum PDU */ - uint8_t aal; /* AAL type (if_natmio.h) */ - uint8_t traffic; /* traffic type (if_natmio.h) */ + uint8_t aal; /* AAL type (if_atm.h) */ + uint8_t traffic; /* traffic type (if_atm.h) */ uint32_t pcr; /* Peak cell rate */ - uint32_t scr; /* Sustainable cell rate */ - uint32_t mbs; /* Maximum burst size */ - uint32_t mcr; /* Minimum cell rate */ + uint32_t scr; /* VBR: Sustainable cell rate */ + uint32_t mbs; /* VBR: Maximum burst rate */ + uint32_t mcr; /* UBR+: Minimum cell rate */ uint32_t icr; /* ABR: Initial cell rate */ uint32_t tbe; /* ABR: Transmit buffer exposure */ uint8_t nrm; /* ABR: Nrm */ @@ -316,14 +316,25 @@ The field contains the flags (see above) and the other fields describe the type of traffic. -.It Dv NGM_ATM_CPCS_TERM +.It Dv NGM_ATM_CPCS_TERM Pq Ic cpcsterm Stop sending and receiving on the indicated hook. The argument is a .Bd -literal -struct ng_atm_cpcs_term { +struct ngm_atm_cpcs_term { char name[NG_HOOKSIZ]; }; .Ed +.It Dv NGM_ATM_GET_STATS Pq Ic getstats +This command returns a message, containing node statistics. The +structure of the message is: +.Bd -literal +struct ngm_atm_stats { + uint64_t in_packets; + uint64_t in_errors; + uint64_t out_packets; + uint64_t out_errors; +}; +.Ed .El .Sh MANAGEMENT MESSAGES If the @@ -333,35 +344,14 @@ They are received by the peer node with a cookie of .Dv NG_ATM_COOKIE . .Bl -tag -width 4n -.It Dv NGM_ATM_CARRIER_CHANGE -The carrier state of the ATM physical interface has changed. -The message has the following structure: -.Bd -literal -struct ng_atm_carrier_change { - uint32_t node; - uint32_t state; -}; -.Ed -.Pp -The -.Va node -field -is the node ID of the ATM node. -This can be used by the managing entity -(for example -.Xr ilmid 8 ) -to manage several interfaces at the same time through the same node. -The -.Va state -field is 1 if the carrier was detected, and 0 if it was lost. -.It Dv NGM_ATM_VCC_CHANGE +.It Dv NGM_ATM_VCC_CHANGE Pq Ic vcc_change A permanent VCC has been added, deleted or changed. This is used by .Xr ilmid 8 to generate the appropriate ILMI traps. The structure of the message is: .Bd -literal -struct ng_atm_vcc_change { +struct ngm_atm_vcc_change { uint32_t node; uint16_t vci; uint8_t vpi; Modified: projects/efika_mx/share/man/man4/ng_netflow.4 ============================================================================== --- projects/efika_mx/share/man/man4/ng_netflow.4 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/man/man4/ng_netflow.4 Sat Nov 3 13:29:18 2012 (r242513) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 16, 2012 +.Dd Nov 2, 2012 .Dt NG_NETFLOW 4 .Os .Sh NAME @@ -100,15 +100,15 @@ node. .Sh CONTROL MESSAGES This node type supports the generic control messages, plus the following: .Bl -tag -width indent -.It Dv NGM_NETFLOW_INFO +.It Dv NGM_NETFLOW_INFO Pq Ic info Returns some node statistics and the current timeout values in a .Vt "struct ng_netflow_info" . -.It Dv NGM_NETFLOW_IFINFO +.It Dv NGM_NETFLOW_IFINFO Pq Ic ifinfo Returns information about the .Va iface Ns Ar N hook. The hook number is passed as an argument. -.It Dv NGM_NETFLOW_SETDLT +.It Dv NGM_NETFLOW_SETDLT Pq Ic setdlt Sets data link type on the .Va iface Ns Ar N hook. @@ -129,7 +129,7 @@ This message type uses as an argument: .Bd -literal -offset 4n struct ng_netflow_setdlt { - uint16_t iface; /* which iface to operate on */ + uint16_t iface; /* which iface dlt change */ uint8_t dlt; /* DLT_XXX from bpf.h */ }; .Ed @@ -138,7 +138,7 @@ The requested .Va iface Ns Ar N hook must already be connected, otherwise message send operation will return an error. -.It Dv NGM_NETFLOW_SETIFINDEX +.It Dv NGM_NETFLOW_SETIFINDEX Pq Ic setifindex In some cases, .Nm may be unable to determine the input interface index of a packet. @@ -158,7 +158,7 @@ This message requires as an argument: .Bd -literal -offset 4n struct ng_netflow_setifindex { - uint16_t iface; /* which iface to operate on */ + uint16_t iface; /* which iface index change */ uint16_t index; /* new index */ }; .Ed @@ -167,26 +167,26 @@ The requested .Va iface Ns Ar N hook must already be connected, otherwise the message send operation will return an error. -.It Dv NGM_NETFLOW_SETTIMEOUTS +.It Dv NGM_NETFLOW_SETTIMEOUTS Pq Ic settimeouts Sets values in seconds for NetFlow active/inactive timeouts. This message requires .Vt "struct ng_netflow_settimeouts" as an argument: .Bd -literal -offset 4n struct ng_netflow_settimeouts { - uint32_t inactive_timeout; - uint32_t active_timeout; + uint32_t inactive_timeout; /* flow inactive timeout */ + uint32_t active_timeout; /* flow active timeout */ }; .Ed -.It Dv NGM_NETFLOW_SETCONFIG +.It Dv NGM_NETFLOW_SETCONFIG Pq Ic setconfig Sets configuration for the specified interface. This message requires .Vt "struct ng_netflow_setconfig" as an argument: .Bd -literal -offset 4n struct ng_netflow_setconfig { - uint16_t iface; - uint32_t conf; + uint16_t iface; /* which iface config change */ + uint32_t conf; /* new config */ #define NG_NETFLOW_CONF_INGRESS 1 #define NG_NETFLOW_CONF_EGRESS 2 #define NG_NETFLOW_CONF_ONCE 4 @@ -221,29 +221,29 @@ skips radix lookup on destination (which mask and gateway). If one doesn't need data provided by lookups, he/she can disable them, to reduce load on routers. -.It Dv NGM_NETFLOW_SETTEMPLATE +.It Dv NGM_NETFLOW_SETTEMPLATE Pq Ic settemplate Sets various timeouts to announce data flow templates (NetFlow v9-specific). This message requires .Vt "struct ng_netflow_settemplate" as an argument: .Bd -literal -offset 4n struct ng_netflow_settemplate { - uint16_t time; - uint16_t packets; + uint16_t time; /* max time between announce */ + uint16_t packets; /* max packets between announce */ }; .Ed .Pp Value of time field represents time in seconds to re-announce data templates. Value of packets field represents maximum packets count between re-announcing data templates. -.It Dv NGM_NETFLOW_SETMTU +.It Dv NGM_NETFLOW_SETMTU Pq Ic setmtu Sets export interface MTU to build packets of specified size (NetFlow v9-specific). This message requires .Vt "struct ng_netflow_setmtu" as an argument: .Bd -literal -offset 4n -struct ng_netflow_settemtu { - uint16_t mtu; +struct ng_netflow_setemtu { + uint16_t mtu; /* MTU for packet */ }; .Ed .Pp @@ -257,37 +257,15 @@ not directly from See also .Sx BUGS section. -.It Dv NGM_NETFLOW_V9INFO +.It Dv NGM_NETFLOW_V9INFO Pq Ic v9info Returns some NetFlow v9 related values in a -.Vt "struct ng_netflow_v9info" . -.El -.Sh ASCII CONTROL MESSAGES -Most binary control messages have an -.Tn ASCII -equivalent. -The supported -.Tn ASCII -commands are: -.Pp -.Bl -tag -width ".Dv NGM_NETFLOW_SETTIMEOUTS" -compact -.It Dv NGM_NETFLOW_INFO -.Qq Li info -.It Dv NGM_NETFLOW_IFINFO -.Qq Li "ifinfo %u" -.It Dv NGM_NETFLOW_SETDLT -.Qq Li "setdlt { iface = %u dlt = %u }" -.It Dv NGM_NETFLOW_SETIFINDEX -.Qq Li "setifindex { iface = %u index = %u }" -.It Dv NGM_NETFLOW_SETTIMEOUTS -.Qq Li "settimeouts { inactive = %u active = %u }" -.It Dv NGM_NETFLOW_SETCONFIG -.Qq Li "setconfig { iface = %u conf = %u }" -.It Dv NGM_NETFLOW_SETTEMPLATE -.Qq Li "settemplate { time = %u packets = %u }" -.It Dv NGM_NETFLOW_SETMTU -.Qq Li "setmtu { mtu = %u }" -.It Dv NGM_NETFLOW_V9INFO -.Qq Li v9info +.Bd -literal -offset 4n +struct ng_netflow_v9info { + uint16_t templ_packets; /* v9 template packets */ + uint16_t templ_time; /* v9 template time */ + uint16_t mtu; /* v9 MTU */ +}; +.Ed .El .Sh SHUTDOWN This node shuts down upon receipt of a Modified: projects/efika_mx/share/man/man4/textdump.4 ============================================================================== --- projects/efika_mx/share/man/man4/textdump.4 Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/man/man4/textdump.4 Sat Nov 3 13:29:18 2012 (r242513) @@ -34,11 +34,11 @@ .Nm textdump .Nd textdump kernel dumping facility .Sh SYNOPSIS -.Cd options KDB .Cd options DDB +.Cd options KDB .Pp -.Cd options TEXTDUMP_VERBOSE .Cd options TEXTDUMP_PREFERRED +.Cd options TEXTDUMP_VERBOSE .Sh DESCRIPTION The .Nm @@ -118,8 +118,8 @@ or by setting the .Dv debug.ddb.textdump.pending sysctl to 1 using .Xr sysctl 8 , -it is possible to request that the next dump be a textdump. One can -also directly trigger a textdump in +it is possible to request that the next dump be a textdump. +One may also directly trigger a textdump in .Xr ddb 4 by running the command .Ic textdump dump . @@ -132,9 +132,6 @@ command line, the commands and .Ic textdump unset may be used to set, query, and clear the textdump pending flag. -The command -.Ic textdump dump -can be used to immediately trigger a textdump. .Pp As with regular kernel dumps, a dump partition must be automatically or manually configured using @@ -145,8 +142,8 @@ Additional kernel options: .Bl -tag -width TEXTDUMP_PREFERRED .It Cd TEXTDUMP_PREFERRED -sets textdumps to be the default manner of doing dumps. This means there -will be no need to +sets textdumps to be the default manner of doing dumps. +This means there will be no need to .Xr sysctl 8 or use the .Ic textdump set Modified: projects/efika_mx/share/misc/bsd-family-tree ============================================================================== --- projects/efika_mx/share/misc/bsd-family-tree Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/misc/bsd-family-tree Sat Nov 3 13:29:18 2012 (r242513) @@ -257,6 +257,7 @@ FreeBSD 5.2 | | | Mac OS X | | | | 10.8 | | | | | NetBSD 6.0 | | + | | | OpenBSD 5.2 | | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | @@ -552,6 +553,7 @@ FreeBSD 8.3 2012-04-18 [FBD] OpenBSD 5.1 2012-05-01 [OBD] Mac OS X 10.8 2012-07-25 [APL] NetBSD 6.0 2012-10-17 [NBD] +OpenBSD 5.2 2012-11-01 [OBD] Bibliography ------------------------ Modified: projects/efika_mx/share/misc/pci_vendors ============================================================================== --- projects/efika_mx/share/misc/pci_vendors Sat Nov 3 13:22:25 2012 (r242512) +++ projects/efika_mx/share/misc/pci_vendors Sat Nov 3 13:29:18 2012 (r242513) @@ -3,11 +3,11 @@ # # List of PCI ID's # -# Version: 2011.07.14 -# Date: 2011-07-14 03:15:06 +# Version: 2012.10.24 +# Date: 2012-10-24 03:15:01 # # Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the -# PCI ID Project at http://pciids.sf.net/. +# PCI ID Project at http://pci-ids.ucw.cz/. # # New data are always welcome, especially if they are accurate. If you have # anything to contribute, please follow the instructions at the web site. @@ -76,6 +76,7 @@ 02ac SpeedStream 1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] 02e0 XFX Pine Group Inc +0303 Hewlett-Packard Company (Wrong ID) 0308 ZyXEL Communications Corporation 0315 SK-Electronics Co., Ltd. 0357 TTTech AG @@ -89,12 +90,11 @@ 04b3 IBM Corp. 4001 Remote System Administration device [RSA2] 050d Belkin -058f Alcor Micro Corporation 05a9 OmniVision 8519 OV519 series 05e3 CyberDoor 0701 CBD516 -066f Sigmatel Inc. +066f SigmaTel 3410 SMTP3410 3500 SMTP3500 0675 Dynalink @@ -123,8 +123,8 @@ 08e6 Gemalto NV 08ff AuthenTec afe4 [Anchor] AF-S2 FingerLoc Sensor Module -0925 First International Computer, Inc. - 1234 VA-502 Mainboard +0925 VIA Technologies, Inc. (Wrong ID) + 1234 VT82C686/A/B USB Controller 093a PixArt Imaging Inc. 010e Innovage Mini Digital Camera 010f SDC-300 Webcam @@ -153,8 +153,6 @@ 0906 RCB24FXX 24-channel modular analog telphony card 0a06 RCB672FXX 672-channel modular analog telphony card 0b3d Brontes Technologies -0b49 ASCII Corporation - 064f Trance Vibrator 0ccd TerraTec Electronic GmbH 0038 Cinergy T^2 DVB-T Receiver 0e11 Compaq Computer Corporation @@ -205,6 +203,7 @@ 7020 USB Controller a0ec Fibre Channel Host Controller a0f0 Advanced System Management Controller + 0e11 b0f3 ProLiant DL360 a0f3 Triflex PCI to ISA Bridge a0f7 PCI Hotplug Controller 8086 002a PCI Hotplug Controller A @@ -328,6 +327,8 @@ 4c53 1080 CT8 mainboard 4c53 1300 P017 mezzanine (32-bit PMC) 4c53 1310 P017 mezzanine (64-bit PMC) + 002f MegaRAID SAS 2208 IOV [Thunderbolt] + 1028 1f3e SPERC 8 0030 53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI 0e11 00da ProLiant ML 350 1028 0123 LSI Logic 1020/1030 @@ -378,6 +379,11 @@ 0059 MegaRAID SAS 8208ELP/8208ELP 005a SAS1066E PCI-Express Fusion-MPT SAS 005b MegaRAID SAS 2208 [Thunderbolt] + 1000 9265 MegaRAID SAS 9265-8i + 1000 9266 MegaRAID SAS 9266-8i + 1000 9268 MegaRAID SAS 9265CV-8i / 9270CV-8i + 1014 040b ServeRAID M5110 SAS/SATA Controller + 1014 0412 ServeRAID M5110e SAS/SATA Controller 1028 1f2d PERC H810 Adapter 1028 1f30 PERC H710 Embedded 1028 1f31 PERC H710P Adapter @@ -386,9 +392,11 @@ 1028 1f35 PERC H710 Adapter 1028 1f37 PERC H710 Mini (for blades) 1028 1f38 PERC H710 Mini (for monolithics) + 8086 3513 RMS25CB080 RAID Controller 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 005e SAS1066 PCI-X Fusion-MPT SAS + 005f MegaRAID SAS-3 3008 [Fury] 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS 8888ELP 1000 100a MegaRAID SAS 8708ELP @@ -419,13 +427,14 @@ 8086 1010 RAID Controller SRCSATA28E 8086 34cc Integrated RAID Controller SROMBSAS28E 8086 34cd Integrated RAID Controller SROMBSAS28E + 8086 3505 Integrated RAID Controller SROMBSASMP2 0062 SAS1078 PCI-Express Fusion-MPT SAS 1000 0062 SAS1078 PCI-Express Fusion-MPT SAS 0064 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] 0065 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] 006e SAS2308 PCI-Express Fusion-MPT SAS-2 0070 SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire] - 0071 MR SAS HBA + 0071 MR SAS HBA 2004 0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] 1028 1f1c 6Gbps SAS HBA Adapter 1028 1f1d PERC H200 Adapter @@ -434,9 +443,10 @@ 1028 1f20 PERC H200 Embedded 1028 1f22 Internal Tape Adapter 8086 350f RMS2LL040 RAID Controller - 0073 MegaRAID SAS 9240 + 0073 MegaRAID SAS 2008 [Falcon] 1000 9240 MegaRAID SAS 9240-8i 1000 9241 MegaRAID SAS 9240-4i + 1000 92a0 MegaRAID SAS 9220-8i 1014 03b1 ServeRAID M1015 SAS/SATA Controller 1028 1f4e PERC H310 Adapter 1028 1f4f PERC H310 Integrated @@ -448,6 +458,8 @@ 1054 3035 LSI MegaRAID SAS 9240-8i 1137 0072 2004 iMR ROMB 1137 0073 2008 ROMB + 1137 00b0 UCSC RAID SAS 2008M-8i + 1137 00b1 UCSC RAID SAS 2008M-8i 15d9 0400 Supermicro SMC2008-iMR 1734 1177 RAID Ctrl SAS 6G 0/1 (D2607) 8086 350d RMS2AF040 RAID Controller @@ -464,6 +476,8 @@ 1000 9262 MegaRAID SAS 9262-8i 1000 9263 MegaRAID SAS 9261-8i 1000 9264 MegaRAID SAS 9264-8i + 1000 9267 MegaRAID SAS 9260CV-4i + 1000 9268 MegaRAID SAS 9260CV-8i 1000 9275 MegaRAID SAS 9280-8ex 1000 9276 MR9260-16i 1000 9280 MegaRAID SAS 9280-8e @@ -498,6 +512,7 @@ 0085 SAS2208 PCI-Express Fusion-MPT SAS-2 0086 SAS2308 PCI-Express Fusion-MPT SAS-2 0087 SAS2308 PCI-Express Fusion-MPT SAS-2 + 1590 0044 H220i 008f 53c875J 1092 8000 FirePort 40 SCSI Controller 1092 8760 FirePort 40 Dual SCSI Host Adapter @@ -533,7 +548,7 @@ 8086 3008 MegaRAID RAID Controller SRCS28X 8086 3431 MegaRAID RAID Controller Alief SROMBU42E 8086 3499 MegaRAID RAID Controller Harwich SROMBU42E - 0411 MegaRAID SAS + 0411 MegaRAID SAS 1068 1000 1001 MegaRAID SAS 8408E 1000 1002 MegaRAID SAS 8480E 1000 1003 MegaRAID SAS 8344ELP @@ -552,7 +567,7 @@ 8086 3500 SROMBSAS18E RAID Controller 8086 3501 SROMBSAS18E RAID Controller 8086 3504 SROMBSAS18E RAID Controller - 0413 MegaRAID SAS Verde ZCR + 0413 MegaRAID SAS 1068 [Verde ZCR] 1000 1005 MegaRAID SAS 8300XLP 0621 FC909 Fibre Channel Adapter 0622 FC929 Fibre Channel Adapter @@ -601,19 +616,23 @@ 0016 PCI-MFB Analogue I/O board 0017 PROTO-3 PCI Prototyping board 9100 INI-9100/9100W SCSI Host -1002 ATI Technologies Inc +# nee ATI Technologies Inc. +1002 Advanced Micro Devices [AMD] nee ATI 1314 Wrestler HDMI Audio [Radeon HD 6250/6310] + 174b 1001 Sapphire PURE Fusion Mini + 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] + 103c 168b ProBook 4535s 3150 M24 1P [Radeon Mobility X600] 103c 0934 nx8220 3151 M24 [FireMV 2400] - 3152 M22 [Radeon Mobility X300] + 3152 RV370 [Mobility Radeon X300] 3154 M24GL [Mobility FireGL V3200] 3171 M24 [FireMV 2400] (Secondary) 3e50 RV380 0x3e50 [Radeon X600] 3e54 RV380 0x3e54 [FireGL V3200] 3e70 RV380 [Radeon X600] (Secondary) - 4136 Radeon IGP 320 M - 4137 Radeon IGP330/340/350 + 4136 RS100 [Radeon IGP320(M)] + 4137 RS200 [Radeon IGP330/340/350] 4144 R300 AD [Radeon 9500 Pro] 4145 R300 AE [Radeon 9700 Pro] 4146 R300 AF [Radeon 9700 Pro] @@ -653,7 +672,7 @@ 4164 R300 AD [Radeon 9500 Pro] (Secondary) 4165 R300 AE [Radeon 9700 Pro] (Secondary) 4166 R300 AF [Radeon 9700 Pro] (Secondary) - 4168 Radeon R350 [Radeon 9800] (Secondary) + 4168 R350 [Radeon 9800] (Secondary) 4170 RV350 AP [Radeon 9600] (Secondary) 1002 0003 R9600 Pro secondary (Asus OEM for HP) 1002 4723 All-in-Wonder 2006 AGP Edition (Secondary) @@ -673,15 +692,15 @@ 1787 4003 Radeon 9600 XT (Secondary) 4173 RV350 AS [Radeon 9550] (Secondary) 1043 010d A9550GE/TD (Secondary) - 4237 Radeon 7000 IGP + 4237 RS250 [Radeon Mobility 7000 IGP] 4242 R200 BB [Radeon All in Wonder 8500DV] 1002 02aa Radeon 8500 AIW DV Edition 4243 R200 BC [Radeon All in Wonder 8500] - 4336 Radeon Mobility U1 + 4336 RS100 [Radeon IGP320M] 1002 4336 Pavilion ze4300 ATI Radeon Mobility U1 (IGP 320 M) 103c 0024 Pavilion ze4400 builtin Video 161f 2029 eMachines M5312 builtin Video - 4337 Radeon IGP 330M/340M/350M + 4337 RS200 [Radeon IGP330M/340M/350M] 1014 053a ThinkPad R40e 103c 0850 Radeon IGP 345M 4341 IXP150 AC'97 Audio Controller @@ -739,7 +758,7 @@ 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 7217 Aspire L250 - 4378 SB400 AC'97 Modem Controller + 4378 IXP SB400 AC'97 Modem Controller 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 1462 0131 MS-1013 Notebook @@ -761,7 +780,7 @@ 1458 b005 Gigabyte GA-MA69G-S3H Motherboard 1462 7327 K9AG Neo2 17f2 5999 KI690-AM2 Motherboard - 4381 SB600 Raid-5 SATA + 4381 SB400 SATA Controller (RAID 5 mode) 4382 SB600 AC97 Audio 4383 SBx00 Azalia (Intel HDA) 103c 1611 Pavilion DM1Z-3000 @@ -782,6 +801,8 @@ 1179 ff50 Satellite P305D-S8995E 1458 4385 GA-MA770-DS3rev2.0 Motherboard 1462 7368 K9AG Neo2 + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 17f2 5000 KI690-AM2 Motherboard 4386 SB600 USB Controller (EHCI) 103c 280a DC5750 Microtower @@ -834,6 +855,7 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 4392 SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] 4393 SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode] 4394 SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] @@ -842,24 +864,33 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller 1043 82ef M3A78-EH Motherboard + 15d9 a811 H8DGU 4399 SB7x0/SB8x0/SB9x0 USB OHCI2 Controller 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller 1043 82ef M3A78-EH Motherboard 439d SB7x0/SB8x0/SB9x0 LPC host controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO - 43a0 SB700/SB800 PCI to PCI bridge (PCIE port 0) - 43a1 SB700/SB800 PCI to PCI bridge (PCIE port 1) - 4437 Radeon Mobility 7000 IGP + 174b 1001 Sapphire PURE Fusion Mini + 43a0 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0) + 43a1 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1) + 43a2 SB900 PCI to PCI bridge (PCIE port 2) + 43a3 SB900 PCI to PCI bridge (PCIE port 3) + 4437 RS250 [Radeon Mobility 7000 IGP] 4554 210888ET [Mach64 ET] 4654 Mach64 VT 4742 3D Rage Pro AGP 1X/2X @@ -942,9 +973,9 @@ 1002 0084 Rage 3D Pro AGP 2x XPERT 98 1002 0087 Rage 3D IIC 1002 475a Rage IIC AGP - 4964 Radeon RV250 Id [Radeon 9000] - 4965 Radeon RV250 Ie [Radeon 9000] - 4966 Radeon RV250 If [Radeon 9000] + 4964 RV250 Id [Radeon 9000] + 4965 RV250 Ie [Radeon 9000] + 4966 R250 If [Radeon 9000] 10f1 0002 RV250 If [Tachyon G9000 PRO] 148c 2039 RV250 If [Radeon 9000 Pro "Evil Commando"] 1509 9a00 RV250 If [Radeon 9000 "AT009"] @@ -953,16 +984,16 @@ 174b 7192 RV250 If [Radeon 9000 "Atlantis"] 17af 2005 RV250 If [Excalibur Radeon 9000 Pro] 17af 2006 RV250 If [Excalibur Radeon 9000] - 4967 Radeon RV250 Ig [Radeon 9000] - 496e Radeon RV250 [Radeon 9000] (Secondary) + 4967 RV250 Ig [Radeon 9000] + 496e RV250 [Radeon 9000] (Secondary) 4a48 R420 JH [Radeon X800] 4a49 R420 JI [Radeon X800PRO] 4a4a R420 JJ [Radeon X800SE] 4a4b R420 JK [Radeon X800] 4a4c R420 JL [Radeon X800] 4a4d R420 JM [FireGL X3] - 4a4e M18 JN [Radeon Mobility 9800] - 4a4f Radeon X800 SE (R420) (AGP) + 4a4e R420 JN [Mobility Radeon 9800] + 4a4f R420 [Radeon X800 AGP] 4a50 R420 JP [Radeon X800XT] 4a54 R420 [Radeon X800 VE] 4a69 R420 [Radeon X800 PRO/GTO] (Secondary) @@ -970,9 +1001,9 @@ 4a6b R420 [Radeon X800] (Secondary) 4a70 R420 [X800XT-PE] (Secondary) 4a74 R420 [Radeon X800 VE] (Secondary) - 4b48 Radeon X850 Consumer (R481) + 4b48 R481 [Radeon X850 PCIe] 4b49 R480 [Radeon X850XT] - 4b4a Radeon X850 SE (R480) (AGP) + 4b4a R480 [Radeon X850SE AGP] 4b4b R480 [Radeon X850Pro] 4b4c R481 [Radeon X850XT-PE] 4b69 R480 [Radeon X850XT] (Secondary) @@ -1016,7 +1047,7 @@ 1033 8112 Versa Note VXi 4c53 Rage Mobility L 4c54 264LT [Mach64 LT] - 4c57 Radeon Mobility M7 LW [Radeon Mobility 7500] + 4c57 RV200 [Mobility Radeon 7500] 1014 0517 ThinkPad T30 1014 0530 ThinkPad T42 2373-4WU 1028 00e6 Radeon Mobility M7 LW (Dell Inspiron 8100) @@ -1024,7 +1055,7 @@ 1043 1622 Mobility Radeon M7 (L3C/S) 144d c006 Radeon Mobility M7 LW in vpr Matrix 170B4 4c58 Radeon RV200 LX [Mobility FireGL 7800 M7] - 4c59 Radeon Mobility M6 LY + 4c59 RV100 LY [Mobility Radeon 7000] 0e11 b111 Evo N600c 1014 0235 ThinkPad A30/A30p (2652/2653) 1014 0239 ThinkPad X22/X23/X24 @@ -1032,7 +1063,7 @@ 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 104d 8140 PCG-Z1SP laptop 1509 1930 Medion MD9703 - 4c5a Radeon Mobility M6 LZ + 4c5a RV100 LZ [Mobility Radeon 7000] 4c64 Radeon RV250 Ld [Radeon Mobility 9000 M9] 4c65 Radeon RV250 Le [Radeon Mobility 9000 M9] 4c66 Radeon RV250 [Mobility FireGL 9000] @@ -1064,10 +1095,10 @@ 144d c00c P35 notebook 1462 0311 MSI M510A *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211031329.qA3DTIOI073430>