Date: Sun, 12 Apr 2009 03:02:43 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r190952 - in projects/tcp_cc_8.x: . contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gdb contrib/gdtoa contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/pcap contrib/n... Message-ID: <200904120302.n3C32hTr008704@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Sun Apr 12 03:02:42 2009 New Revision: 190952 URL: http://svn.freebsd.org/changeset/base/190952 Log: Merge r190905:190951 from head. Modified: projects/tcp_cc_8.x/ (props changed) projects/tcp_cc_8.x/contrib/bind9/ (props changed) projects/tcp_cc_8.x/contrib/cpio/ (props changed) projects/tcp_cc_8.x/contrib/csup/ (props changed) projects/tcp_cc_8.x/contrib/file/ (props changed) projects/tcp_cc_8.x/contrib/gdb/ (props changed) projects/tcp_cc_8.x/contrib/gdtoa/ (props changed) projects/tcp_cc_8.x/contrib/libpcap/ (props changed) projects/tcp_cc_8.x/contrib/libpcap/bpf/net/bpf_filter.c projects/tcp_cc_8.x/contrib/libpcap/bpf_dump.c projects/tcp_cc_8.x/contrib/libpcap/bpf_image.c projects/tcp_cc_8.x/contrib/libpcap/pcap/bpf.h projects/tcp_cc_8.x/contrib/libpcap/pcap/pcap.h projects/tcp_cc_8.x/contrib/ncurses/ (props changed) projects/tcp_cc_8.x/contrib/netcat/ (props changed) projects/tcp_cc_8.x/contrib/ntp/ (props changed) projects/tcp_cc_8.x/contrib/openbsm/ (props changed) projects/tcp_cc_8.x/contrib/openpam/ (props changed) projects/tcp_cc_8.x/contrib/pf/ (props changed) projects/tcp_cc_8.x/contrib/sendmail/ (props changed) projects/tcp_cc_8.x/contrib/tcpdump/ (props changed) projects/tcp_cc_8.x/contrib/top/ (props changed) projects/tcp_cc_8.x/contrib/top/install-sh (props changed) projects/tcp_cc_8.x/contrib/wpa/ (props changed) projects/tcp_cc_8.x/crypto/openssh/ (props changed) projects/tcp_cc_8.x/crypto/openssl/ (props changed) projects/tcp_cc_8.x/include/signal.h projects/tcp_cc_8.x/lib/libc/ (props changed) projects/tcp_cc_8.x/lib/libc/stdio/asprintf.c (props changed) projects/tcp_cc_8.x/lib/libc/stdtime/ (props changed) projects/tcp_cc_8.x/lib/libc/string/ffsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/flsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpcpy.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpncpy.c (props changed) projects/tcp_cc_8.x/lib/libusb/libusb.3 (props changed) projects/tcp_cc_8.x/lib/libusb/usb.h (props changed) projects/tcp_cc_8.x/lib/libutil/ (props changed) projects/tcp_cc_8.x/sbin/ (props changed) projects/tcp_cc_8.x/sbin/gvinum/gvinum.8 projects/tcp_cc_8.x/sbin/ipfw/ (props changed) projects/tcp_cc_8.x/sbin/ipfw/ipfw.8 projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.8 projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.c projects/tcp_cc_8.x/sbin/route/route.c projects/tcp_cc_8.x/share/man/man4/textdump.4 projects/tcp_cc_8.x/share/man/man9/acl.9 projects/tcp_cc_8.x/share/zoneinfo/ (props changed) projects/tcp_cc_8.x/sys/ (props changed) projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c projects/tcp_cc_8.x/sys/amd64/include/cpufunc.h projects/tcp_cc_8.x/sys/amd64/include/xen/ (props changed) projects/tcp_cc_8.x/sys/contrib/pf/ (props changed) projects/tcp_cc_8.x/sys/contrib/pf/net/pf.c projects/tcp_cc_8.x/sys/dev/ata/ata-usb.c (props changed) projects/tcp_cc_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/tcp_cc_8.x/sys/dev/ep/if_ep.c projects/tcp_cc_8.x/sys/dev/ep/if_ep_pccard.c projects/tcp_cc_8.x/sys/dev/ep/if_epreg.h projects/tcp_cc_8.x/sys/dev/ep/if_epvar.h projects/tcp_cc_8.x/sys/dev/mn/if_mn.c (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio.c (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio.h (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudioreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/README.TXT (props changed) projects/tcp_cc_8.x/sys/dev/usb/bluetooth/TODO.TXT (props changed) projects/tcp_cc_8.x/sys/dev/usb/bluetooth/ng_ubt.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/bluetooth/ubtbcmfw.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_ixp4xx.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_mbus.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/usb_controller.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/uhid.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/ukbd.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/ums.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/usb_rdesc.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/udbp.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/udbp.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/ufm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_aue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_auereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_axe.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_axereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cdce.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cdcereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cuereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kuefw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kuereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_rue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_ruereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_udav.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_udavreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/usb_ethernet.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/usb_ethernet.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/u3g.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uark.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ubsa.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ubser.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uchcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ucycom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ufoma.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uftdi.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ugensa.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uipaq.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ulpt.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umct.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umodem.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umoscom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uplcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/usb_serial.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/usb_serial.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uslcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uvisor.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uvscom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/rio500_usb.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/umass.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/urio.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/ustorage_fs.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_msc.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/ufm_ioctl.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_bus.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_busdma.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_busdma.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_cdc.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_compat_linux.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_compat_linux.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_controller.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_core.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_core.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_debug.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_debug.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_defs.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dev.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dev.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_device.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_device.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dynamic.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dynamic.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_endian.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_error.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_error.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_generic.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_generic.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_handle_request.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_handle_request.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hid.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hid.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hub.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hub.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_if.m (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_ioctl.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_lookup.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_lookup.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_mbuf.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_mbuf.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_mfunc.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_msctest.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_msctest.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_parse.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_parse.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_pci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_process.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_process.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_request.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_request.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_revision.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_transfer.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_transfer.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_util.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_util.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usbdevs (props changed) projects/tcp_cc_8.x/sys/dev/usb/usbhid.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rum.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumvar.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_ural.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_uralvar.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zyd.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/usb_wlan.h (props changed) projects/tcp_cc_8.x/sys/dev/xen/netfront/ (props changed) projects/tcp_cc_8.x/sys/dev/xen/xenpci/ (props changed) projects/tcp_cc_8.x/sys/i386/i386/machdep.c projects/tcp_cc_8.x/sys/i386/include/cpufunc.h projects/tcp_cc_8.x/sys/kern/kern_cons.c (props changed) projects/tcp_cc_8.x/sys/kern/kern_tc.c projects/tcp_cc_8.x/sys/kern/kern_vimage.c projects/tcp_cc_8.x/sys/kern/uipc_domain.c projects/tcp_cc_8.x/sys/kern/vfs_cache.c projects/tcp_cc_8.x/sys/legacy/dev/ata/ata-usb.c (props changed) projects/tcp_cc_8.x/sys/legacy/dev/sound/usb/uaudio.c (props changed) projects/tcp_cc_8.x/sys/legacy/dev/sound/usb/uaudio.h (props changed) projects/tcp_cc_8.x/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed) projects/tcp_cc_8.x/sys/legacy/dev/sound/usb/uaudioreg.h (props changed) projects/tcp_cc_8.x/sys/legacy/dev/usb/ (props changed) projects/tcp_cc_8.x/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) projects/tcp_cc_8.x/sys/net/if.c projects/tcp_cc_8.x/sys/net/if_bridge.c projects/tcp_cc_8.x/sys/net/if_gif.c projects/tcp_cc_8.x/sys/net/if_loop.c projects/tcp_cc_8.x/sys/net/route.c projects/tcp_cc_8.x/sys/netinet/if_ether.c projects/tcp_cc_8.x/sys/netinet/igmp.c projects/tcp_cc_8.x/sys/netinet/in_gif.c projects/tcp_cc_8.x/sys/netinet/ip_divert.c projects/tcp_cc_8.x/sys/netinet/ip_fastfwd.c projects/tcp_cc_8.x/sys/netinet/ip_input.c projects/tcp_cc_8.x/sys/netinet/ip_ipsec.c projects/tcp_cc_8.x/sys/netinet/ip_options.c projects/tcp_cc_8.x/sys/netinet/ip_output.c projects/tcp_cc_8.x/sys/netinet/ip_var.h projects/tcp_cc_8.x/sys/netinet/libalias/alias.c projects/tcp_cc_8.x/sys/netinet/libalias/alias_nbt.c projects/tcp_cc_8.x/sys/netinet/raw_ip.c projects/tcp_cc_8.x/sys/netinet/tcp_hostcache.c projects/tcp_cc_8.x/sys/netinet/tcp_input.c projects/tcp_cc_8.x/sys/netinet/tcp_output.c projects/tcp_cc_8.x/sys/netinet/tcp_reass.c projects/tcp_cc_8.x/sys/netinet/tcp_sack.c projects/tcp_cc_8.x/sys/netinet/tcp_subr.c projects/tcp_cc_8.x/sys/netinet/tcp_syncache.c projects/tcp_cc_8.x/sys/netinet/tcp_timer.c projects/tcp_cc_8.x/sys/netinet/tcp_timewait.c projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c projects/tcp_cc_8.x/sys/netinet/tcp_var.h projects/tcp_cc_8.x/sys/netinet/udp_usrreq.c projects/tcp_cc_8.x/sys/netinet6/ip6_input.c projects/tcp_cc_8.x/sys/netipsec/ipsec.c projects/tcp_cc_8.x/sys/netipsec/xform_ah.c projects/tcp_cc_8.x/sys/netipsec/xform_esp.c projects/tcp_cc_8.x/sys/netipsec/xform_ipcomp.c projects/tcp_cc_8.x/sys/netipsec/xform_ipip.c projects/tcp_cc_8.x/sys/pc98/pc98/machdep.c projects/tcp_cc_8.x/sys/powerpc/aim/trap_subr.S projects/tcp_cc_8.x/sys/security/mac/mac_cred.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_system.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c (props changed) projects/tcp_cc_8.x/sys/sys/kernel.h projects/tcp_cc_8.x/sys/sys/param.h projects/tcp_cc_8.x/sys/sys/vimage.h projects/tcp_cc_8.x/sys/vm/vm_reserv.c projects/tcp_cc_8.x/sys/vm/vm_unix.c projects/tcp_cc_8.x/tools/regression/lib/msun/test-conj.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs.h (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/tcp_cc_8.x/usr.bin/csup/ (props changed) projects/tcp_cc_8.x/usr.bin/procstat/ (props changed) projects/tcp_cc_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) projects/tcp_cc_8.x/usr.sbin/dumpcis/cis.h (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/getid.c (props changed) projects/tcp_cc_8.x/usr.sbin/zic/ (props changed) Modified: projects/tcp_cc_8.x/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- projects/tcp_cc_8.x/contrib/libpcap/bpf/net/bpf_filter.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/contrib/libpcap/bpf/net/bpf_filter.c Sun Apr 12 03:02:42 2009 (r190952) @@ -200,8 +200,8 @@ m_xhalf(m, k, err) */ u_int bpf_filter(pc, p, wirelen, buflen) - register const struct bpf_insn *pc; - register const u_char *p; + register struct bpf_insn *pc; + register u_char *p; u_int wirelen; register u_int buflen; { Modified: projects/tcp_cc_8.x/contrib/libpcap/bpf_dump.c ============================================================================== --- projects/tcp_cc_8.x/contrib/libpcap/bpf_dump.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/contrib/libpcap/bpf_dump.c Sun Apr 12 03:02:42 2009 (r190952) @@ -31,7 +31,7 @@ static const char rcsid[] _U_ = #include <stdio.h> void -bpf_dump(const struct bpf_program *p, int option) +bpf_dump(struct bpf_program *p, int option) { const struct bpf_insn *insn; int i; Modified: projects/tcp_cc_8.x/contrib/libpcap/bpf_image.c ============================================================================== --- projects/tcp_cc_8.x/contrib/libpcap/bpf_image.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/contrib/libpcap/bpf_image.c Sun Apr 12 03:02:42 2009 (r190952) @@ -39,7 +39,7 @@ static const char rcsid[] _U_ = char * bpf_image(p, n) - const struct bpf_insn *p; + struct bpf_insn *p; int n; { int v; Modified: projects/tcp_cc_8.x/contrib/libpcap/pcap/bpf.h ============================================================================== --- projects/tcp_cc_8.x/contrib/libpcap/pcap/bpf.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/contrib/libpcap/pcap/bpf.h Sun Apr 12 03:02:42 2009 (r190952) @@ -916,7 +916,7 @@ struct bpf_insn { #if __STDC__ || defined(__cplusplus) extern int bpf_validate(const struct bpf_insn *, int); -extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); +extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); #else extern int bpf_validate(); extern u_int bpf_filter(); Modified: projects/tcp_cc_8.x/contrib/libpcap/pcap/pcap.h ============================================================================== --- projects/tcp_cc_8.x/contrib/libpcap/pcap/pcap.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/contrib/libpcap/pcap/pcap.h Sun Apr 12 03:02:42 2009 (r190952) @@ -334,10 +334,10 @@ void pcap_freealldevs(pcap_if_t *); const char *pcap_lib_version(void); /* XXX this guy lives in the bpf tree */ -/* u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); -int bpf_validate(const struct bpf_insn *f, int len); */ -char *bpf_image(const struct bpf_insn *, int); -void bpf_dump(const struct bpf_program *, int); +u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); +int bpf_validate(struct bpf_insn *f, int len); +char *bpf_image(struct bpf_insn *, int); +void bpf_dump(struct bpf_program *, int); #if defined(WIN32) Modified: projects/tcp_cc_8.x/include/signal.h ============================================================================== --- projects/tcp_cc_8.x/include/signal.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/include/signal.h Sun Apr 12 03:02:42 2009 (r190952) @@ -72,8 +72,10 @@ int raise(int); #if __POSIX_VISIBLE || __XSI_VISIBLE int kill(__pid_t, int); +#ifndef _PTH_PTHREAD_H_ /* XXX kludge to work around GNU Pth brokenness */ int pthread_kill(__pthread_t, int); int pthread_sigmask(int, const __sigset_t *, __sigset_t *); +#endif int sigaction(int, const struct sigaction * __restrict, struct sigaction * __restrict); int sigaddset(sigset_t *, int); Modified: projects/tcp_cc_8.x/sbin/gvinum/gvinum.8 ============================================================================== --- projects/tcp_cc_8.x/sbin/gvinum/gvinum.8 Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sbin/gvinum/gvinum.8 Sun Apr 12 03:02:42 2009 (r190952) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 23, 2006 +.Dd April 10, 2009 .Dt GVINUM 8 .Os .Sh NAME Modified: projects/tcp_cc_8.x/sbin/ipfw/ipfw.8 ============================================================================== --- projects/tcp_cc_8.x/sbin/ipfw/ipfw.8 Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sbin/ipfw/ipfw.8 Sun Apr 12 03:02:42 2009 (r190952) @@ -1998,7 +1998,10 @@ with either delay or probability first, to the chosen format. The unit for delay is milliseconds. Data points do not need to be ordered or equal to the number -specified in the "samples" line. ipfw will sort and interpolate +specified in the "samples" line. +The +.Nm +utility will sort and interpolate the curve as needed. .El .Pp Modified: projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.8 ============================================================================== --- projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.8 Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.8 Sun Apr 12 03:02:42 2009 (r190952) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 8, 2007 +.Dd April 11, 2009 .Dt NEWFS_MSDOS 8 .Os .Sh NAME @@ -72,9 +72,11 @@ to determine geometry, if required. If .Ar special does not contain a -.Ar / , -it is assumed to be a device name and -.Ar /dev +.Ar / +and +.Fl C +is not used, it is assumed to be a device name and +.Ar /dev/ is prepended to the name to construct the actual device name. To work a file in the current directory use .Ar ./filename @@ -91,13 +93,14 @@ number is in sectors, kilobytes, megabyt .It Fl B Ar boot Get bootstrap from file. .It Fl C Ar create-size -Create the image file with the specified size. A suffix character appended -to the size is interpreted as for the +Create the image file with the specified size. +A suffix character appended to the size is interpreted as for the .Fl @ -option. The file is created by truncating any existing file with the -same name, seeking just before the required size and writing -a single 0 byte. As a consequence, the space occupied on disk -may be smaller than the size specified as a parameter. +option. +The file is created by truncating any existing file with the same name and +resizing it to the requested size. +If the file system supports sparse files, the space occupied on disk may be +smaller than the size specified as parameter. .It Fl F Ar FAT-type FAT type (one of 12, 16, or 32). .It Fl I Ar volid @@ -161,13 +164,14 @@ Number of sectors per track. .El .Sh NOTES If some parameters (e.g. size, number of sectors, etc.) are not specified -through options or disktype, the program tries to generate them -automatically. In particular, the size is determined as the -device or file size minus the offset specified with the +through options or disktype, the program tries to generate them automatically. +In particular, the size is determined as the device or file size minus the +offset specified with the .Fl @ -option. When the geometry is not available, it is assumed to be -63 sectors, 255 heads. The size is then rounded to become -a multiple of the track size and avoid complaints by some filesystem code. +option. +When the geometry is not available, it is assumed to be 63 sectors, 255 heads. +The size is then rounded to become a multiple of the track size and avoid +complaints by some filesystem code. .Pp FAT file system parameters occupy a "Boot Sector BPB (BIOS Parameter Block)" in the first of the "reserved" sectors which precede the actual Modified: projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.c ============================================================================== --- projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sbin/newfs_msdos/newfs_msdos.c Sun Apr 12 03:02:42 2009 (r190952) @@ -168,7 +168,7 @@ struct bpb { static struct { const char *name; struct bpb bpb; -} stdfmt[] = { +} const stdfmt[] = { {"160", {512, 1, 1, 2, 64, 320, 0xfe, 1, 8, 1, BPBGAP}}, {"180", {512, 1, 1, 2, 64, 360, 0xfc, 2, 9, 1, BPBGAP}}, {"320", {512, 2, 1, 2, 112, 640, 0xff, 1, 8, 2, BPBGAP}}, @@ -181,7 +181,7 @@ static struct { {"2880", {512, 2, 1, 2, 240, 5760, 0xf0, 9, 36, 2, BPBGAP}} }; -static u_int8_t bootcode[] = { +static const u_int8_t bootcode[] = { 0xfa, /* cli */ 0x31, 0xc0, /* xor ax,ax */ 0x8e, 0xd0, /* mov ss,ax */ @@ -232,13 +232,13 @@ static void usage(void); int main(int argc, char *argv[]) { - static char opts[] = "@:NB:C:F:I:L:O:S:a:b:c:e:f:h:i:k:m:n:o:r:s:u:"; - static const char *opt_B, *opt_L, *opt_O, *opt_f; - static u_int opt_F, opt_I, opt_S, opt_a, opt_b, opt_c, opt_e; - static u_int opt_h, opt_i, opt_k, opt_m, opt_n, opt_o, opt_r; - static u_int opt_s, opt_u; - static int opt_N; - static int Iflag, mflag, oflag; + static const char opts[] = "@:NB:C:F:I:L:O:S:a:b:c:e:f:h:i:k:m:n:o:r:s:u:"; + const char *opt_B = NULL, *opt_L = NULL, *opt_O = NULL, *opt_f = NULL; + u_int opt_F = 0, opt_I = 0, opt_S = 0, opt_a = 0, opt_b = 0, opt_c = 0; + u_int opt_e = 0, opt_h = 0, opt_i = 0, opt_k = 0, opt_m = 0, opt_n = 0; + u_int opt_o = 0, opt_r = 0, opt_s = 0, opt_u = 0; + int opt_N = 0; + int Iflag = 0, mflag = 0, oflag = 0; char buf[MAXPATHLEN]; struct stat sb; struct timeval tv; @@ -255,7 +255,7 @@ main(int argc, char *argv[]) time_t now; u_int fat, bss, rds, cls, dir, lsn, x, x1, x2; int ch, fd, fd1; - static off_t opt_create=0, opt_ofs=0; + off_t opt_create = 0, opt_ofs = 0; while ((ch = getopt(argc, argv, opts)) != -1) switch (ch) { @@ -349,31 +349,33 @@ main(int argc, char *argv[]) if (argc < 1 || argc > 2) usage(); fname = *argv++; - if (!strchr(fname, '/')) { + if (!opt_create && !strchr(fname, '/')) { snprintf(buf, sizeof(buf), "%s%s", _PATH_DEV, fname); if (!(fname = strdup(buf))) err(1, NULL); } dtype = *argv; if (opt_create) { - off_t pos; - if (opt_N) errx(1, "create (-C) is incompatible with -N"); fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) errx(1, "failed to create %s", fname); - pos = lseek(fd, opt_create - 1, SEEK_SET); - if (write(fd, "\0", 1) != 1) + if (ftruncate(fd, opt_create)) errx(1, "failed to initialize %jd bytes", (intmax_t)opt_create); - pos = lseek(fd, 0, SEEK_SET); - } else if ((fd = open(fname, opt_N ? O_RDONLY : O_RDWR)) == -1 || - fstat(fd, &sb)) + } else if ((fd = open(fname, opt_N ? O_RDONLY : O_RDWR)) == -1) + err(1, "%s", fname); + if (fstat(fd, &sb)) err(1, "%s", fname); + if (opt_create) { + if (!S_ISREG(sb.st_mode)) + warnx("warning, %s is not a regular file", fname); + } else { + if (!S_ISCHR(sb.st_mode)) + warnx("warning, %s is not a character device", fname); + } if (!opt_N) check_mounted(fname, sb.st_mode); - if (!S_ISCHR(sb.st_mode)) - warnx("warning, %s is not a character device", fname); if (opt_ofs && opt_ofs != lseek(fd, opt_ofs, SEEK_SET)) errx(1, "cannot seek to %jd", (intmax_t)opt_ofs); memset(&bpb, 0, sizeof(bpb)); @@ -983,30 +985,31 @@ setstr(u_int8_t *dest, const char *src, static void usage(void) { - fprintf(stderr, - "usage: newfs_msdos [ -options ] special [disktype]\n"); - fprintf(stderr, "where the options are:\n"); - fprintf(stderr, "\t-N don't create file system: " - "just print out parameters\n"); - fprintf(stderr, "\t-B get bootstrap from file\n"); - fprintf(stderr, "\t-F FAT type (12, 16, or 32)\n"); - fprintf(stderr, "\t-I volume ID\n"); - fprintf(stderr, "\t-L volume label\n"); - fprintf(stderr, "\t-O OEM string\n"); - fprintf(stderr, "\t-S bytes/sector\n"); - fprintf(stderr, "\t-a sectors/FAT\n"); - fprintf(stderr, "\t-b block size\n"); - fprintf(stderr, "\t-c sectors/cluster\n"); - fprintf(stderr, "\t-e root directory entries\n"); - fprintf(stderr, "\t-f standard format\n"); - fprintf(stderr, "\t-h drive heads\n"); - fprintf(stderr, "\t-i file system info sector\n"); - fprintf(stderr, "\t-k backup boot sector\n"); - fprintf(stderr, "\t-m media descriptor\n"); - fprintf(stderr, "\t-n number of FATs\n"); - fprintf(stderr, "\t-o hidden sectors\n"); - fprintf(stderr, "\t-r reserved sectors\n"); - fprintf(stderr, "\t-s file system size (sectors)\n"); - fprintf(stderr, "\t-u sectors/track\n"); - exit(1); + fprintf(stderr, + "usage: newfs_msdos [ -options ] special [disktype]\n" + "where the options are:\n" + "\t-@ create file system at specified offset\n" + "\t-B get bootstrap from file\n" + "\t-C create image file with specified size\n" + "\t-F FAT type (12, 16, or 32)\n" + "\t-I volume ID\n" + "\t-L volume label\n" + "\t-N don't create file system: just print out parameters\n" + "\t-O OEM string\n" + "\t-S bytes/sector\n" + "\t-a sectors/FAT\n" + "\t-b block size\n" + "\t-c sectors/cluster\n" + "\t-e root directory entries\n" + "\t-f standard format\n" + "\t-h drive heads\n" + "\t-i file system info sector\n" + "\t-k backup boot sector\n" + "\t-m media descriptor\n" + "\t-n number of FATs\n" + "\t-o hidden sectors\n" + "\t-r reserved sectors\n" + "\t-s file system size (sectors)\n" + "\t-u sectors/track\n"); + exit(1); } Modified: projects/tcp_cc_8.x/sbin/route/route.c ============================================================================== --- projects/tcp_cc_8.x/sbin/route/route.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sbin/route/route.c Sun Apr 12 03:02:42 2009 (r190952) @@ -818,7 +818,8 @@ inet_makenetandmask(net, sin, bits) /* i holds the first non zero bit */ bits = 32 - (i*8); } - mask = 0xffffffff << (32 - bits); + if (bits != 0) + mask = 0xffffffff << (32 - bits); sin->sin_addr.s_addr = htonl(addr); sin = &so_mask.sin; Modified: projects/tcp_cc_8.x/share/man/man4/textdump.4 ============================================================================== --- projects/tcp_cc_8.x/share/man/man4/textdump.4 Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/share/man/man4/textdump.4 Sun Apr 12 03:02:42 2009 (r190952) @@ -98,7 +98,7 @@ sysctl. .El .Pp Kernel textdumps may be extracted using -.Xr bsdtar 1 . +.Xr tar 1 . .Sh CONFIGURATION The .Nm @@ -153,7 +153,7 @@ These scripts may also be configured usi .Xr ddb 8 utility. .Sh SEE ALSO -.Xr bsdtar 1 , +.Xr tar 1 , .Xr ddb 4 , .Xr tar 5 , .Xr ddb 8 , Modified: projects/tcp_cc_8.x/share/man/man9/acl.9 ============================================================================== --- projects/tcp_cc_8.x/share/man/man9/acl.9 Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/share/man/man9/acl.9 Sun Apr 12 03:02:42 2009 (r190952) @@ -135,66 +135,6 @@ The process has no read, write or execut to the associated file. .El .El -.Sh IMPLEMENTATION NOTES -.Bd -literal -typedef mode_t *acl_permset_t; - -/* internal ACL structure */ -struct acl { - int acl_cnt; - struct acl_entry acl_entry[ACL_MAX_ENTRIES]; -}; - -/* external ACL structure */ -struct acl_t_struct { - struct acl ats_acl; - int ats_cur_entry; -}; -typedef struct acl_t_struct *acl_t; - -/* - * Possible valid values for ae_tag field. - */ -#define ACL_UNDEFINED_TAG 0x00000000 -#define ACL_USER_OBJ 0x00000001 -#define ACL_USER 0x00000002 -#define ACL_GROUP_OBJ 0x00000004 -#define ACL_GROUP 0x00000008 -#define ACL_MASK 0x00000010 -#define ACL_OTHER 0x00000020 -#define ACL_OTHER_OBJ ACL_OTHER - -/* - * Possible valid values for acl_type_t arguments. - */ -#define ACL_TYPE_ACCESS 0x00000000 -#define ACL_TYPE_DEFAULT 0x00000001 -#define ACL_TYPE_AFS 0x00000002 -#define ACL_TYPE_CODA 0x00000003 -#define ACL_TYPE_NTFS 0x00000004 -#define ACL_TYPE_NWFS 0x00000005 - -/* - * Possible flags in ae_perm field. - */ -#define ACL_EXECUTE 0x0001 -#define ACL_WRITE 0x0002 -#define ACL_READ 0x0004 -#define ACL_PERM_NONE 0x0000 -#define ACL_PERM_BITS (ACL_EXECUTE | ACL_WRITE | ACL_READ) -#define ACL_POSIX1E_BITS (ACL_EXECUTE | ACL_WRITE | ACL_READ) - -/* - * Possible entry_id values for acl_get_entry() - */ -#define ACL_FIRST_ENTRY 0 -#define ACL_NEXT_ENTRY 1 - -/* - * Undefined value in ae_id field - */ -#define ACL_UNDEFINED_ID ((uid_t)-1) -.Ed .Sh SEE ALSO .Xr acl 3 , .Xr vaccess_acl_posix1e 9 , Modified: projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c Sun Apr 12 03:02:42 2009 (r190952) @@ -2178,45 +2178,24 @@ user_dbreg_trap(void) #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from <machine/cpufunc.h>, and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ Modified: projects/tcp_cc_8.x/sys/amd64/include/cpufunc.h ============================================================================== --- projects/tcp_cc_8.x/sys/amd64/include/cpufunc.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/amd64/include/cpufunc.h Sun Apr 12 03:02:42 2009 (r190952) @@ -164,70 +164,12 @@ halt(void) __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); - return (data); -} - -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -236,7 +178,7 @@ inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -278,33 +220,20 @@ inw(u_int port) { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -334,7 +263,7 @@ outsl(u_int port, const void *addr, size static __inline void outw(u_int port, u_short data) { - __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void Modified: projects/tcp_cc_8.x/sys/contrib/pf/net/pf.c ============================================================================== --- projects/tcp_cc_8.x/sys/contrib/pf/net/pf.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/contrib/pf/net/pf.c Sun Apr 12 03:02:42 2009 (r190952) @@ -6153,7 +6153,7 @@ pf_route(struct mbuf **m, struct pf_rule if (r->rt == PF_FASTROUTE) { in_rtalloc(ro, 0); if (ro->ro_rt == 0) { - V_ipstat.ips_noroute++; + IPSTAT_INC(ips_noroute); goto bad; } @@ -6284,14 +6284,14 @@ pf_route(struct mbuf **m, struct pf_rule if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; - V_ipstat.ips_outhwcsum++; + IPSTAT_INC(ips_outhwcsum); } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) - V_tcpstat.tcps_outhwcsum++; + TCPSTAT_INC(tcpstat.tcps_outhwcsum); else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) V_udpstat.udps_outhwcsum++; error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); @@ -6303,7 +6303,7 @@ pf_route(struct mbuf **m, struct pf_rule * Must be able to put at least 8 bytes per fragment. */ if (ip->ip_off & htons(IP_DF)) { - V_ipstat.ips_cantfrag++; + IPSTAT_INC(ips_cantfrag); if (r->rt != PF_DUPTO) { #ifdef __FreeBSD__ /* icmp_error() expects host byte ordering */ @@ -6360,7 +6360,7 @@ pf_route(struct mbuf **m, struct pf_rule } if (error == 0) - V_ipstat.ips_fragmented++; + IPSTAT_INC(ips_fragmented); done: if (r->rt != PF_DUPTO) @@ -6635,7 +6635,7 @@ pf_check_proto_cksum(struct mbuf *m, int case IPPROTO_TCP: { INIT_VNET_INET(curvnet); - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; } case IPPROTO_UDP: @@ -6741,7 +6741,7 @@ pf_check_proto_cksum(struct mbuf *m, int m->m_pkthdr.csum_flags |= flag_bad; switch (p) { case IPPROTO_TCP: - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; case IPPROTO_UDP: V_udpstat.udps_badsum++; Modified: projects/tcp_cc_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c ============================================================================== --- projects/tcp_cc_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Sun Apr 12 03:02:42 2009 (r190952) @@ -3829,7 +3829,7 @@ socket_act_establish(struct socket *so, #endif toep->tp_state = tp->t_state; - V_tcpstat.tcps_connects++; + TCPSTAT_INC(tcps_connects); } Modified: projects/tcp_cc_8.x/sys/dev/ep/if_ep.c ============================================================================== --- projects/tcp_cc_8.x/sys/dev/ep/if_ep.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/dev/ep/if_ep.c Sun Apr 12 03:02:42 2009 (r190952) @@ -435,6 +435,8 @@ epinit_locked(struct ep_softc *sc) if (!sc->epb.mii_trans) ep_ifmedia_upd(ifp); + if (sc->stat & F_HAS_TX_PLL) + CSR_WRITE_2(sc, EP_COMMAND, TX_PLL_ENABLE); CSR_WRITE_2(sc, EP_COMMAND, RX_ENABLE); CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE); @@ -473,7 +475,7 @@ epstart_locked(struct ifnet *ifp) struct ep_softc *sc; u_int len; struct mbuf *m, *m0; - int pad; + int pad, started; sc = ifp->if_softc; if (sc->gone) @@ -482,11 +484,15 @@ epstart_locked(struct ifnet *ifp) EP_BUSY_WAIT(sc); if (ifp->if_drv_flags & IFF_DRV_OACTIVE) return; + started = 0; startagain: /* Sneak a peek at the next packet */ IFQ_DRV_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) return; + if (!started && (sc->stat & F_HAS_TX_PLL)) + CSR_WRITE_2(sc, EP_COMMAND, TX_PLL_ENABLE); + started++; for (len = 0, m = m0; m != NULL; m = m->m_next) len += m->m_len; @@ -895,8 +901,24 @@ static void ep_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) { struct ep_softc *sc = ifp->if_softc; + uint16_t ms; - ifmr->ifm_active = sc->ifmedia.ifm_media; + switch (IFM_SUBTYPE(sc->ifmedia.ifm_media)) { + case IFM_10_T: + GO_WINDOW(sc, 4); + ms = CSR_READ_2(sc, EP_W4_MEDIA_TYPE); + GO_WINDOW(sc, 0); + ifmr->ifm_status = IFM_AVALID; + if (ms & MT_LB) { + ifmr->ifm_status |= IFM_ACTIVE; + ifmr->ifm_active = IFM_ETHER | IFM_10_T; + } else { + ifmr->ifm_active = IFM_ETHER | IFM_NONE; + } + default: + ifmr->ifm_active = sc->ifmedia.ifm_media; + break; + } } static int Modified: projects/tcp_cc_8.x/sys/dev/ep/if_ep_pccard.c ============================================================================== --- projects/tcp_cc_8.x/sys/dev/ep/if_ep_pccard.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/dev/ep/if_ep_pccard.c Sun Apr 12 03:02:42 2009 (r190952) @@ -68,9 +68,10 @@ struct ep_pccard_product #define EP_CHIP_589 1 /* Classic 3c5x9 chipset */ #define EP_CHIP_574 2 /* Roadrunner */ +#define EP_CHIP_C1 3 /* 3c1 */ static const struct ep_pccard_product ep_pccard_products[] = { - { PCMCIA_CARD(3COM, 3C1), EP_CHIP_589 }, + { PCMCIA_CARD(3COM, 3C1), EP_CHIP_C1 }, { PCMCIA_CARD(3COM, 3C562), EP_CHIP_589 }, { PCMCIA_CARD(3COM, 3C589), EP_CHIP_589 }, { PCMCIA_CARD(3COM, 3CXEM556), EP_CHIP_589 }, @@ -144,19 +145,21 @@ ep_pccard_attach(device_t dev) if ((pp = ep_pccard_lookup(dev)) == NULL) panic("ep_pccard_attach: can't find product in attach."); - if (pp->chipset == EP_CHIP_589) { - sc->epb.mii_trans = 0; - sc->epb.cmd_off = 0; - } else { + if (pp->chipset == EP_CHIP_574) { sc->epb.mii_trans = 1; sc->epb.cmd_off = 2; + } else { + sc->epb.mii_trans = 0; + sc->epb.cmd_off = 0; } - if ((error = ep_alloc(dev))) { device_printf(dev, "ep_alloc() failed! (%d)\n", error); goto bad; } + if (pp->chipset == EP_CHIP_C1) + sc->stat |= F_HAS_TX_PLL; + /* ROM size = 0, ROM base = 0 */ /* For now, ignore AUTO SELECT feature of 3C589B and later. */ error = ep_get_e(sc, EEPROM_ADDR_CFG, &result); Modified: projects/tcp_cc_8.x/sys/dev/ep/if_epreg.h ============================================================================== --- projects/tcp_cc_8.x/sys/dev/ep/if_epreg.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/dev/ep/if_epreg.h Sun Apr 12 03:02:42 2009 (r190952) @@ -156,6 +156,7 @@ * Window 2 registers. Station Address Setup/Read */ /* Read/Write */ +#define EP_W2_PHY_MGMT 0x0c #define EP_W2_ALT_EEPROM 0x0a #define EP_W2_ADDR_5 0x05 #define EP_W2_ADDR_4 0x04 @@ -406,6 +407,17 @@ #define LINKBEAT_ENABLE 0x80 #define ENABLE_UTP (JABBER_GUARD_ENABLE | LINKBEAT_ENABLE) #define DISABLE_UTP 0x0 +#define MT_CSD 0x0004 /* CRC Strip disable */ +#define MT_SQE 0x0008 /* SQE Enable */ +#define MT_C0 0x0010 /* Collison */ +#define MT_CS 0x0020 /* Carrier Sense */ +#define MT_J 0x0200 /* Jabber detected */ +#define MT_PL 0x0400 /* Plarity Inverted */ +#define MT_LB 0x0800 /* Link Beat detected */ +#define MT_SQ 0x1000 /* SQE Present */ +#define MT_IN 0x2000 /* Reserved */ +#define MT_CE 0x4000 /* Coax */ +#define MT_TPE 0x8000 /* * Misc defines for various things. Modified: projects/tcp_cc_8.x/sys/dev/ep/if_epvar.h ============================================================================== --- projects/tcp_cc_8.x/sys/dev/ep/if_epvar.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/dev/ep/if_epvar.h Sun Apr 12 03:02:42 2009 (r190952) @@ -57,6 +57,7 @@ struct ep_softc { #define F_ENADDR_SKIP 0x002 #define F_PROMISC 0x008 #define F_ACCESS_32_BITS 0x100 +#define F_HAS_TX_PLL 0x200 int gone; /* adapter is not present (for PCCARD) */ struct ep_board epb; Modified: projects/tcp_cc_8.x/sys/i386/i386/machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/i386/i386/machdep.c Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/i386/i386/machdep.c Sun Apr 12 03:02:42 2009 (r190952) @@ -3555,45 +3555,24 @@ lapic_set_lvt_triggermode(u_int apic_id, #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from <machine/cpufunc.h>, and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ Modified: projects/tcp_cc_8.x/sys/i386/include/cpufunc.h ============================================================================== --- projects/tcp_cc_8.x/sys/i386/include/cpufunc.h Sat Apr 11 23:35:20 2009 (r190951) +++ projects/tcp_cc_8.x/sys/i386/include/cpufunc.h Sun Apr 12 03:02:42 2009 (r190952) @@ -170,70 +170,12 @@ halt(void) __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); - return (data); -} - -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -242,7 +184,7 @@ inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -284,33 +226,20 @@ inw(u_int port) { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904120302.n3C32hTr008704>