From owner-svn-src-projects@FreeBSD.ORG Sun Apr 12 03:02:44 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5EEF106566B; Sun, 12 Apr 2009 03:02:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8EB778FC16; Sun, 12 Apr 2009 03:02:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3C32iwY008728; Sun, 12 Apr 2009 03:02:44 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3C32hTr008704; Sun, 12 Apr 2009 03:02:43 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200904120302.n3C32hTr008704@svn.freebsd.org> From: Lawrence Stewart Date: Sun, 12 Apr 2009 03:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: 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... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2009 03:02:45 -0000 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 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 , 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 , 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 *** From owner-svn-src-projects@FreeBSD.ORG Sun Apr 12 03:45:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12110106566B; Sun, 12 Apr 2009 03:45:04 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 008B28FC16; Sun, 12 Apr 2009 03:45:04 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3C3j3pI009694; Sun, 12 Apr 2009 03:45:03 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3C3j3dV009693; Sun, 12 Apr 2009 03:45:03 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200904120345.n3C3j3dV009693@svn.freebsd.org> From: Lawrence Stewart Date: Sun, 12 Apr 2009 03:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190954 - projects/tcp_cc_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2009 03:45:04 -0000 Author: lstewart Date: Sun Apr 12 03:45:03 2009 New Revision: 190954 URL: http://svn.freebsd.org/changeset/base/190954 Log: Fix that allows kernel to compile after the recent vimage commit. Modified: projects/tcp_cc_8.x/sys/netinet/tcp_subr.c Modified: projects/tcp_cc_8.x/sys/netinet/tcp_subr.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/tcp_subr.c Sun Apr 12 03:03:55 2009 (r190953) +++ projects/tcp_cc_8.x/sys/netinet/tcp_subr.c Sun Apr 12 03:45:03 2009 (r190954) @@ -717,7 +717,7 @@ tcp_newtcpcb(struct inpcb *inp) /* if the cc module fails to init, stop building the control block */ if (CC_ALGO(tp)->init(tp) > 0) { - uma_zfree(tcpcb_zone, tp); + uma_zfree(V_tcpcb_zone, tp); return NULL; } From owner-svn-src-projects@FreeBSD.ORG Mon Apr 13 03:08:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 263741065673; Mon, 13 Apr 2009 03:08:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E0828FC1A; Mon, 13 Apr 2009 03:08:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3D38EPU050607; Mon, 13 Apr 2009 03:08:14 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3D38DgM050588; Mon, 13 Apr 2009 03:08:13 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904130308.n3D38DgM050588@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Mon, 13 Apr 2009 03:08:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190984 - in projects/mips: . bin/cat bin/sh cddl cddl/lib/libzpool cddl/usr.bin/ztest cddl/usr.sbin/zdb contrib/bind9 contrib/bind9/lib/dns contrib/cpio contrib/csup contrib/file contr... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2009 03:08:14 -0000 Author: gonzo Date: Mon Apr 13 03:08:11 2009 New Revision: 190984 URL: http://svn.freebsd.org/changeset/base/190984 Log: - Merge from HEAD Added: projects/mips/contrib/libpcap/FREEBSD-Xlist - copied unchanged from r190979, head/contrib/libpcap/FREEBSD-Xlist projects/mips/contrib/libpcap/chmod_bpf - copied unchanged from r190979, head/contrib/libpcap/chmod_bpf projects/mips/contrib/libpcap/dlpisubs.c - copied unchanged from r190979, head/contrib/libpcap/dlpisubs.c projects/mips/contrib/libpcap/dlpisubs.h - copied unchanged from r190979, head/contrib/libpcap/dlpisubs.h projects/mips/contrib/libpcap/fad-sita.c - copied unchanged from r190979, head/contrib/libpcap/fad-sita.c projects/mips/contrib/libpcap/filtertest.c - copied unchanged from r190979, head/contrib/libpcap/filtertest.c projects/mips/contrib/libpcap/findalldevstest.c - copied unchanged from r190979, head/contrib/libpcap/findalldevstest.c projects/mips/contrib/libpcap/ieee80211.h - copied unchanged from r190979, head/contrib/libpcap/ieee80211.h projects/mips/contrib/libpcap/missing/ - copied from r190979, head/contrib/libpcap/missing/ projects/mips/contrib/libpcap/net/ - copied from r190979, head/contrib/libpcap/net/ projects/mips/contrib/libpcap/pcap/ - copied from r190979, head/contrib/libpcap/pcap/ projects/mips/contrib/libpcap/pcap-bt-linux.c - copied unchanged from r190979, head/contrib/libpcap/pcap-bt-linux.c projects/mips/contrib/libpcap/pcap-bt-linux.h - copied unchanged from r190979, head/contrib/libpcap/pcap-bt-linux.h projects/mips/contrib/libpcap/pcap-config.1 - copied unchanged from r190979, head/contrib/libpcap/pcap-config.1 projects/mips/contrib/libpcap/pcap-config.in - copied unchanged from r190979, head/contrib/libpcap/pcap-config.in projects/mips/contrib/libpcap/pcap-filter.manmisc - copied unchanged from r190979, head/contrib/libpcap/pcap-filter.manmisc projects/mips/contrib/libpcap/pcap-filter.manmisc.in - copied unchanged from r190979, head/contrib/libpcap/pcap-filter.manmisc.in projects/mips/contrib/libpcap/pcap-libdlpi.c - copied unchanged from r190979, head/contrib/libpcap/pcap-libdlpi.c projects/mips/contrib/libpcap/pcap-linktype.manmisc - copied unchanged from r190979, head/contrib/libpcap/pcap-linktype.manmisc projects/mips/contrib/libpcap/pcap-linktype.manmisc.in - copied unchanged from r190979, head/contrib/libpcap/pcap-linktype.manmisc.in projects/mips/contrib/libpcap/pcap-savefile.manfile - copied unchanged from r190979, head/contrib/libpcap/pcap-savefile.manfile projects/mips/contrib/libpcap/pcap-savefile.manfile.in - copied unchanged from r190979, head/contrib/libpcap/pcap-savefile.manfile.in projects/mips/contrib/libpcap/pcap-sita.c - copied unchanged from r190979, head/contrib/libpcap/pcap-sita.c projects/mips/contrib/libpcap/pcap-sita.h - copied unchanged from r190979, head/contrib/libpcap/pcap-sita.h projects/mips/contrib/libpcap/pcap-sita.html - copied unchanged from r190979, head/contrib/libpcap/pcap-sita.html projects/mips/contrib/libpcap/pcap-usb-linux.c - copied unchanged from r190979, head/contrib/libpcap/pcap-usb-linux.c projects/mips/contrib/libpcap/pcap-usb-linux.h - copied unchanged from r190979, head/contrib/libpcap/pcap-usb-linux.h projects/mips/contrib/libpcap/pcap.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap.3pcap projects/mips/contrib/libpcap/pcap.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap.3pcap.in projects/mips/contrib/libpcap/pcap_activate.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_activate.3pcap projects/mips/contrib/libpcap/pcap_breakloop.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_breakloop.3pcap projects/mips/contrib/libpcap/pcap_can_set_rfmon.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_can_set_rfmon.3pcap projects/mips/contrib/libpcap/pcap_close.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_close.3pcap projects/mips/contrib/libpcap/pcap_compile.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_compile.3pcap projects/mips/contrib/libpcap/pcap_compile.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_compile.3pcap.in projects/mips/contrib/libpcap/pcap_create.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_create.3pcap projects/mips/contrib/libpcap/pcap_datalink.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_datalink.3pcap projects/mips/contrib/libpcap/pcap_datalink.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_datalink.3pcap.in projects/mips/contrib/libpcap/pcap_datalink_name_to_val.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_datalink_name_to_val.3pcap projects/mips/contrib/libpcap/pcap_datalink_val_to_name.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_datalink_val_to_name.3pcap projects/mips/contrib/libpcap/pcap_dump.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump.3pcap projects/mips/contrib/libpcap/pcap_dump_close.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_close.3pcap projects/mips/contrib/libpcap/pcap_dump_file.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_file.3pcap projects/mips/contrib/libpcap/pcap_dump_flush.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_flush.3pcap projects/mips/contrib/libpcap/pcap_dump_ftell.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_ftell.3pcap projects/mips/contrib/libpcap/pcap_dump_open.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_open.3pcap projects/mips/contrib/libpcap/pcap_dump_open.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_dump_open.3pcap.in projects/mips/contrib/libpcap/pcap_file.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_file.3pcap projects/mips/contrib/libpcap/pcap_fileno.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_fileno.3pcap projects/mips/contrib/libpcap/pcap_findalldevs.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_findalldevs.3pcap projects/mips/contrib/libpcap/pcap_free_datalinks.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_free_datalinks.3pcap projects/mips/contrib/libpcap/pcap_freealldevs.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_freealldevs.3pcap projects/mips/contrib/libpcap/pcap_freecode.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_freecode.3pcap projects/mips/contrib/libpcap/pcap_get_selectable_fd.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_get_selectable_fd.3pcap projects/mips/contrib/libpcap/pcap_geterr.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_geterr.3pcap projects/mips/contrib/libpcap/pcap_inject.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_inject.3pcap projects/mips/contrib/libpcap/pcap_is_swapped.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_is_swapped.3pcap projects/mips/contrib/libpcap/pcap_lib_version.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_lib_version.3pcap projects/mips/contrib/libpcap/pcap_list_datalinks.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_list_datalinks.3pcap projects/mips/contrib/libpcap/pcap_list_datalinks.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_list_datalinks.3pcap.in projects/mips/contrib/libpcap/pcap_lookupdev.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_lookupdev.3pcap projects/mips/contrib/libpcap/pcap_lookupnet.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_lookupnet.3pcap projects/mips/contrib/libpcap/pcap_loop.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_loop.3pcap projects/mips/contrib/libpcap/pcap_major_version.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_major_version.3pcap projects/mips/contrib/libpcap/pcap_next_ex.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_next_ex.3pcap projects/mips/contrib/libpcap/pcap_offline_filter.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_offline_filter.3pcap projects/mips/contrib/libpcap/pcap_open_dead.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_open_dead.3pcap projects/mips/contrib/libpcap/pcap_open_dead.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_open_dead.3pcap.in projects/mips/contrib/libpcap/pcap_open_live.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_open_live.3pcap projects/mips/contrib/libpcap/pcap_open_offline.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_open_offline.3pcap projects/mips/contrib/libpcap/pcap_open_offline.3pcap.in - copied unchanged from r190979, head/contrib/libpcap/pcap_open_offline.3pcap.in projects/mips/contrib/libpcap/pcap_set_buffer_size.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_buffer_size.3pcap projects/mips/contrib/libpcap/pcap_set_datalink.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_datalink.3pcap projects/mips/contrib/libpcap/pcap_set_promisc.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_promisc.3pcap projects/mips/contrib/libpcap/pcap_set_rfmon.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_rfmon.3pcap projects/mips/contrib/libpcap/pcap_set_snaplen.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_snaplen.3pcap projects/mips/contrib/libpcap/pcap_set_timeout.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_set_timeout.3pcap projects/mips/contrib/libpcap/pcap_setdirection.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_setdirection.3pcap projects/mips/contrib/libpcap/pcap_setfilter.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_setfilter.3pcap projects/mips/contrib/libpcap/pcap_setnonblock.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_setnonblock.3pcap projects/mips/contrib/libpcap/pcap_snapshot.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_snapshot.3pcap projects/mips/contrib/libpcap/pcap_stats.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_stats.3pcap projects/mips/contrib/libpcap/pcap_statustostr.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_statustostr.3pcap projects/mips/contrib/libpcap/pcap_strerror.3pcap - copied unchanged from r190979, head/contrib/libpcap/pcap_strerror.3pcap projects/mips/contrib/libpcap/runlex.sh - copied unchanged from r190979, head/contrib/libpcap/runlex.sh projects/mips/contrib/tcpdump/FREEBSD-Xlist - copied unchanged from r190979, head/contrib/tcpdump/FREEBSD-Xlist projects/mips/contrib/tcpdump/INSTALL.txt - copied unchanged from r190979, head/contrib/tcpdump/INSTALL.txt projects/mips/contrib/tcpdump/checksum.c - copied unchanged from r190979, head/contrib/tcpdump/checksum.c projects/mips/contrib/tcpdump/print-bt.c - copied unchanged from r190979, head/contrib/tcpdump/print-bt.c projects/mips/contrib/tcpdump/print-cfm.c - copied unchanged from r190979, head/contrib/tcpdump/print-cfm.c projects/mips/contrib/tcpdump/print-dtp.c - copied unchanged from r190979, head/contrib/tcpdump/print-dtp.c projects/mips/contrib/tcpdump/print-lldp.c - copied unchanged from r190979, head/contrib/tcpdump/print-lldp.c projects/mips/contrib/tcpdump/print-lwapp.c - copied unchanged from r190979, head/contrib/tcpdump/print-lwapp.c projects/mips/contrib/tcpdump/print-mpcp.c - copied unchanged from r190979, head/contrib/tcpdump/print-mpcp.c projects/mips/contrib/tcpdump/print-rrcp.c - copied unchanged from r190979, head/contrib/tcpdump/print-rrcp.c projects/mips/contrib/tcpdump/print-sflow.c - copied unchanged from r190979, head/contrib/tcpdump/print-sflow.c projects/mips/contrib/tcpdump/print-udld.c - copied unchanged from r190979, head/contrib/tcpdump/print-udld.c projects/mips/contrib/tcpdump/print-vqp.c - copied unchanged from r190979, head/contrib/tcpdump/print-vqp.c projects/mips/contrib/tcpdump/print-vtp.c - copied unchanged from r190979, head/contrib/tcpdump/print-vtp.c projects/mips/lib/libarchive/archive_read_disk.3 - copied unchanged from r190979, head/lib/libarchive/archive_read_disk.3 projects/mips/lib/libc/db/mpool/mpool-compat.c - copied unchanged from r190979, head/lib/libc/db/mpool/mpool-compat.c projects/mips/lib/libc/nls/be_BY.UTF-8.msg - copied unchanged from r190979, head/lib/libc/nls/be_BY.UTF-8.msg projects/mips/lib/libc/nls/ca_ES.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/ca_ES.ISO8859-1.msg projects/mips/lib/libc/nls/de_DE.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/de_DE.ISO8859-1.msg projects/mips/lib/libc/nls/el_GR.ISO8859-7.msg - copied unchanged from r190979, head/lib/libc/nls/el_GR.ISO8859-7.msg projects/mips/lib/libc/nls/es_ES.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/es_ES.ISO8859-1.msg projects/mips/lib/libc/nls/fi_FI.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/fi_FI.ISO8859-1.msg projects/mips/lib/libc/nls/fr_FR.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/fr_FR.ISO8859-1.msg projects/mips/lib/libc/nls/hu_HU.ISO8859-2.msg - copied unchanged from r190979, head/lib/libc/nls/hu_HU.ISO8859-2.msg projects/mips/lib/libc/nls/it_IT.ISO8859-15.msg - copied unchanged from r190979, head/lib/libc/nls/it_IT.ISO8859-15.msg projects/mips/lib/libc/nls/mn_MN.UTF-8.msg - copied unchanged from r190979, head/lib/libc/nls/mn_MN.UTF-8.msg projects/mips/lib/libc/nls/nl_NL.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/nl_NL.ISO8859-1.msg projects/mips/lib/libc/nls/no_NO.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/no_NO.ISO8859-1.msg projects/mips/lib/libc/nls/pt_BR.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/pt_BR.ISO8859-1.msg projects/mips/lib/libc/nls/sk_SK.ISO8859-2.msg - copied unchanged from r190979, head/lib/libc/nls/sk_SK.ISO8859-2.msg projects/mips/lib/libc/nls/sv_SE.ISO8859-1.msg - copied unchanged from r190979, head/lib/libc/nls/sv_SE.ISO8859-1.msg projects/mips/lib/libc/nls/uk_UA.UTF-8.msg - copied unchanged from r190979, head/lib/libc/nls/uk_UA.UTF-8.msg projects/mips/share/man/man4/amdtemp.4 - copied unchanged from r190979, head/share/man/man4/amdtemp.4 projects/mips/share/man/man4/uath.4 - copied unchanged from r190979, head/share/man/man4/uath.4 projects/mips/share/man/man9/refcount.9 - copied unchanged from r190979, head/share/man/man9/refcount.9 projects/mips/sys/amd64/acpica/Makefile - copied unchanged from r190979, head/sys/amd64/acpica/Makefile projects/mips/sys/amd64/acpica/acpi_switch.S - copied unchanged from r190979, head/sys/amd64/acpica/acpi_switch.S projects/mips/sys/amd64/acpica/acpi_wakecode.S - copied unchanged from r190979, head/sys/amd64/acpica/acpi_wakecode.S projects/mips/sys/amd64/acpica/genwakecode.sh - copied unchanged from r190979, head/sys/amd64/acpica/genwakecode.sh projects/mips/sys/amd64/acpica/genwakedata.sh - copied unchanged from r190979, head/sys/amd64/acpica/genwakedata.sh projects/mips/sys/amd64/ia32/ia32_misc.c - copied unchanged from r190979, head/sys/amd64/ia32/ia32_misc.c projects/mips/sys/cddl/dev/dtnfsclient/ (props changed) - copied from r190979, head/sys/cddl/dev/dtnfsclient/ projects/mips/sys/contrib/dev/uath/ - copied from r190979, head/sys/contrib/dev/uath/ projects/mips/sys/dev/amdtemp/ - copied from r190979, head/sys/dev/amdtemp/ projects/mips/sys/dev/ath/ath_hal/ar5416/ar9280.c - copied unchanged from r190979, head/sys/dev/ath/ath_hal/ar5416/ar9280.c projects/mips/sys/dev/ath/ath_hal/ar5416/ar9280.h - copied unchanged from r190979, head/sys/dev/ath/ath_hal/ar5416/ar9280.h projects/mips/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c - copied unchanged from r190979, head/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c projects/mips/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini - copied unchanged from r190979, head/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini projects/mips/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini - copied unchanged from r190979, head/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini projects/mips/sys/dev/ipmi/ipmi_linux.c - copied unchanged from r190979, head/sys/dev/ipmi/ipmi_linux.c projects/mips/sys/dev/ixgbe/ixgbe_82599.c - copied unchanged from r190979, head/sys/dev/ixgbe/ixgbe_82599.c projects/mips/sys/dev/mii/axphy.c - copied unchanged from r190979, head/sys/dev/mii/axphy.c projects/mips/sys/dev/mii/axphyreg.h - copied unchanged from r190979, head/sys/dev/mii/axphyreg.h projects/mips/sys/dev/usb/wlan/if_uath.c - copied unchanged from r190979, head/sys/dev/usb/wlan/if_uath.c projects/mips/sys/dev/usb/wlan/if_uathreg.h - copied unchanged from r190979, head/sys/dev/usb/wlan/if_uathreg.h projects/mips/sys/dev/usb/wlan/if_uathvar.h - copied unchanged from r190979, head/sys/dev/usb/wlan/if_uathvar.h projects/mips/sys/geom/vinum/geom_vinum_create.c - copied unchanged from r190979, head/sys/geom/vinum/geom_vinum_create.c projects/mips/sys/geom/vinum/geom_vinum_events.c - copied unchanged from r190979, head/sys/geom/vinum/geom_vinum_events.c projects/mips/sys/i386/cpufreq/hwpstate.c - copied unchanged from r190979, head/sys/i386/cpufreq/hwpstate.c projects/mips/sys/ia64/ia32/ia32_misc.c - copied unchanged from r190979, head/sys/ia64/ia32/ia32_misc.c projects/mips/sys/mips/sentry5/siba_cc.c - copied unchanged from r190979, head/sys/mips/sentry5/siba_cc.c projects/mips/sys/mips/sentry5/siba_mips.c - copied unchanged from r190979, head/sys/mips/sentry5/siba_mips.c projects/mips/sys/mips/sentry5/siba_sdram.c - copied unchanged from r190979, head/sys/mips/sentry5/siba_sdram.c projects/mips/sys/modules/amdtemp/ - copied from r190979, head/sys/modules/amdtemp/ projects/mips/sys/modules/dtrace/dtnfsclient/ (props changed) - copied from r190979, head/sys/modules/dtrace/dtnfsclient/ projects/mips/sys/modules/ip6_mroute_mod/ (props changed) - copied from r190979, head/sys/modules/ip6_mroute_mod/ projects/mips/sys/modules/ipmi/ipmi_linux/ (props changed) - copied from r190979, head/sys/modules/ipmi/ipmi_linux/ projects/mips/sys/modules/nfssvc/ - copied from r190979, head/sys/modules/nfssvc/ projects/mips/sys/modules/usb/uath/ - copied from r190979, head/sys/modules/usb/uath/ projects/mips/sys/net80211/ieee80211_superg.c - copied unchanged from r190979, head/sys/net80211/ieee80211_superg.c projects/mips/sys/net80211/ieee80211_superg.h - copied unchanged from r190979, head/sys/net80211/ieee80211_superg.h projects/mips/sys/nfs/nfs_nfssvc.c - copied unchanged from r190979, head/sys/nfs/nfs_nfssvc.c projects/mips/sys/nfs/nfssvc.h - copied unchanged from r190979, head/sys/nfs/nfssvc.h projects/mips/sys/nfsclient/nfs_kdtrace.c - copied unchanged from r190979, head/sys/nfsclient/nfs_kdtrace.c projects/mips/sys/nfsclient/nfs_kdtrace.h - copied unchanged from r190979, head/sys/nfsclient/nfs_kdtrace.h projects/mips/sys/powerpc/aim/mmu_oea64.c - copied unchanged from r190979, head/sys/powerpc/aim/mmu_oea64.c projects/mips/sys/powerpc/include/sysarch.h - copied unchanged from r190979, head/sys/powerpc/include/sysarch.h projects/mips/sys/powerpc/ofw/ofw_real.c - copied unchanged from r190979, head/sys/powerpc/ofw/ofw_real.c projects/mips/sys/powerpc/powermac/cpcht.c - copied unchanged from r190979, head/sys/powerpc/powermac/cpcht.c projects/mips/sys/powerpc/powermac/cpchtvar.h - copied unchanged from r190979, head/sys/powerpc/powermac/cpchtvar.h projects/mips/sys/powerpc/powerpc/dump_machdep.c - copied unchanged from r190979, head/sys/powerpc/powerpc/dump_machdep.c projects/mips/sys/powerpc/powerpc/uio_machdep.c - copied unchanged from r190979, head/sys/powerpc/powerpc/uio_machdep.c projects/mips/tools/regression/bin/sh/builtins/read1.0 - copied unchanged from r190979, head/tools/regression/bin/sh/builtins/read1.0 projects/mips/tools/regression/bin/sh/builtins/read1.0.stdout - copied unchanged from r190979, head/tools/regression/bin/sh/builtins/read1.0.stdout projects/mips/tools/regression/mac/mac_portacl/ - copied from r190979, head/tools/regression/mac/mac_portacl/ projects/mips/usr.sbin/uathload/ - copied from r190979, head/usr.sbin/uathload/ Deleted: projects/mips/contrib/libpcap/FILES projects/mips/contrib/libpcap/README.Win32 projects/mips/contrib/libpcap/README.aix projects/mips/contrib/libpcap/README.dag projects/mips/contrib/libpcap/README.hpux projects/mips/contrib/libpcap/README.linux projects/mips/contrib/libpcap/README.macosx projects/mips/contrib/libpcap/README.septel projects/mips/contrib/libpcap/README.tru64 projects/mips/contrib/libpcap/acsite.m4 projects/mips/contrib/libpcap/doc/pcap.html projects/mips/contrib/libpcap/doc/pcap.txt projects/mips/contrib/libpcap/doc/pcap.xml projects/mips/contrib/libpcap/pcap-nit.h projects/mips/contrib/libpcap/pcap-pf.h projects/mips/contrib/libpcap/pcap.3 projects/mips/contrib/libpcap/pcap1.h projects/mips/contrib/libpcap/sll.h projects/mips/contrib/tcpdump/FILES projects/mips/contrib/tcpdump/INSTALL projects/mips/contrib/tcpdump/Makefile-devel-adds projects/mips/contrib/tcpdump/PLATFORMS projects/mips/contrib/tcpdump/Readme.Win32 projects/mips/contrib/tcpdump/TODO projects/mips/contrib/tcpdump/tests/ projects/mips/lib/libc/gen/dlfunc.c projects/mips/sbin/slattach/ projects/mips/sbin/startslip/ projects/mips/share/man/man4/fla.4 projects/mips/share/man/man4/k8temp.4 projects/mips/share/man/man4/ppp.4 projects/mips/share/man/man4/sl.4 projects/mips/share/man/man4/uscanner.4 projects/mips/share/man/man9/VOP_LEASE.9 projects/mips/sys/dev/k8temp/ projects/mips/sys/dev/siba/siba_cc.c projects/mips/sys/dev/siba/siba_mips.c projects/mips/sys/dev/siba/siba_sdram.c projects/mips/sys/dev/usb/image/ projects/mips/sys/dev/usb/usb_sw_transfer.c projects/mips/sys/dev/usb/usb_sw_transfer.h projects/mips/sys/mips/alchemy/ projects/mips/sys/mips/atheros/ projects/mips/sys/mips/conf/ALCHEMY projects/mips/sys/mips/conf/AR71XX projects/mips/sys/mips/conf/AR71XX.hints projects/mips/sys/mips/mips/elf_trampoline.c projects/mips/sys/mips/mips/inckern.S projects/mips/sys/modules/k8temp/ projects/mips/sys/modules/usb/uscanner/ projects/mips/sys/net/bsd_comp.c projects/mips/sys/net/if_ppp.c projects/mips/sys/net/if_ppp.h projects/mips/sys/net/if_pppvar.h projects/mips/sys/net/if_sl.c projects/mips/sys/net/if_slvar.h projects/mips/sys/net/ppp_comp.h projects/mips/sys/net/ppp_deflate.c projects/mips/sys/net/ppp_tty.c projects/mips/sys/net/slip.h projects/mips/sys/powerpc/aim/uio_machdep.c projects/mips/sys/powerpc/booke/uio_machdep.c projects/mips/tools/build/options/WITHOUT_SLIP projects/mips/usr.sbin/pppd/ projects/mips/usr.sbin/pppstats/ projects/mips/usr.sbin/sliplogin/ projects/mips/usr.sbin/slstat/ Modified: projects/mips/ (props changed) projects/mips/MAINTAINERS projects/mips/Makefile projects/mips/Makefile.inc1 projects/mips/ObsoleteFiles.inc projects/mips/UPDATING projects/mips/bin/cat/Makefile projects/mips/bin/sh/alias.c projects/mips/bin/sh/eval.c projects/mips/bin/sh/miscbltin.c projects/mips/cddl/Makefile.inc projects/mips/cddl/lib/libzpool/Makefile projects/mips/cddl/usr.bin/ztest/Makefile projects/mips/cddl/usr.sbin/zdb/Makefile projects/mips/contrib/bind9/ (props changed) projects/mips/contrib/bind9/CHANGES projects/mips/contrib/bind9/lib/dns/validator.c projects/mips/contrib/bind9/version projects/mips/contrib/cpio/ (props changed) projects/mips/contrib/csup/ (props changed) projects/mips/contrib/csup/rcsfile.c projects/mips/contrib/csup/rcsfile.h projects/mips/contrib/csup/rcsparse.c projects/mips/contrib/csup/updater.c projects/mips/contrib/file/ (props changed) projects/mips/contrib/gcc/c-cppbuiltin.c projects/mips/contrib/gcc/c-decl.c projects/mips/contrib/gcc/c-opts.c projects/mips/contrib/gcc/c-tree.h projects/mips/contrib/gcc/c-typeck.c projects/mips/contrib/gcc/doc/extend.texi projects/mips/contrib/gdb/ (props changed) projects/mips/contrib/gdb/FREEBSD-Xlist projects/mips/contrib/gdtoa/ (props changed) projects/mips/contrib/libpcap/ (props changed) projects/mips/contrib/libpcap/CHANGES projects/mips/contrib/libpcap/CREDITS projects/mips/contrib/libpcap/INSTALL.txt projects/mips/contrib/libpcap/Makefile.in projects/mips/contrib/libpcap/README projects/mips/contrib/libpcap/VERSION projects/mips/contrib/libpcap/atmuni31.h projects/mips/contrib/libpcap/bpf/net/bpf_filter.c projects/mips/contrib/libpcap/bpf_dump.c projects/mips/contrib/libpcap/bpf_image.c projects/mips/contrib/libpcap/config.h.in projects/mips/contrib/libpcap/configure projects/mips/contrib/libpcap/configure.in projects/mips/contrib/libpcap/etherent.c projects/mips/contrib/libpcap/ethertype.h projects/mips/contrib/libpcap/fad-getad.c projects/mips/contrib/libpcap/fad-gifc.c projects/mips/contrib/libpcap/fad-glifc.c projects/mips/contrib/libpcap/fad-win32.c projects/mips/contrib/libpcap/gencode.c projects/mips/contrib/libpcap/gencode.h projects/mips/contrib/libpcap/grammar.y projects/mips/contrib/libpcap/inet.c projects/mips/contrib/libpcap/mkdep projects/mips/contrib/libpcap/nametoaddr.c projects/mips/contrib/libpcap/optimize.c projects/mips/contrib/libpcap/packaging/pcap.spec.in projects/mips/contrib/libpcap/pcap-bpf.c projects/mips/contrib/libpcap/pcap-bpf.h projects/mips/contrib/libpcap/pcap-dag.c projects/mips/contrib/libpcap/pcap-dag.h projects/mips/contrib/libpcap/pcap-dlpi.c projects/mips/contrib/libpcap/pcap-dos.c projects/mips/contrib/libpcap/pcap-enet.c projects/mips/contrib/libpcap/pcap-int.h projects/mips/contrib/libpcap/pcap-linux.c projects/mips/contrib/libpcap/pcap-namedb.h projects/mips/contrib/libpcap/pcap-nit.c projects/mips/contrib/libpcap/pcap-null.c projects/mips/contrib/libpcap/pcap-pf.c projects/mips/contrib/libpcap/pcap-septel.c projects/mips/contrib/libpcap/pcap-septel.h projects/mips/contrib/libpcap/pcap-snit.c projects/mips/contrib/libpcap/pcap-snoop.c projects/mips/contrib/libpcap/pcap-stdinc.h projects/mips/contrib/libpcap/pcap-win32.c projects/mips/contrib/libpcap/pcap.c projects/mips/contrib/libpcap/pcap.h projects/mips/contrib/libpcap/savefile.c projects/mips/contrib/libpcap/scanner.l projects/mips/contrib/ncurses/ (props changed) projects/mips/contrib/netcat/ (props changed) projects/mips/contrib/ntp/ (props changed) projects/mips/contrib/openbsm/ (props changed) projects/mips/contrib/openpam/ (props changed) projects/mips/contrib/pf/ (props changed) projects/mips/contrib/sendmail/ (props changed) projects/mips/contrib/tcpdump/ (props changed) projects/mips/contrib/tcpdump/CHANGES projects/mips/contrib/tcpdump/CREDITS projects/mips/contrib/tcpdump/Makefile.in projects/mips/contrib/tcpdump/README projects/mips/contrib/tcpdump/VERSION projects/mips/contrib/tcpdump/addrtoname.c projects/mips/contrib/tcpdump/addrtoname.h projects/mips/contrib/tcpdump/af.c projects/mips/contrib/tcpdump/af.h projects/mips/contrib/tcpdump/aodv.h projects/mips/contrib/tcpdump/appletalk.h projects/mips/contrib/tcpdump/arcnet.h projects/mips/contrib/tcpdump/atm.h projects/mips/contrib/tcpdump/atmuni31.h projects/mips/contrib/tcpdump/bgp.h projects/mips/contrib/tcpdump/bootp.h projects/mips/contrib/tcpdump/bpf_dump.c projects/mips/contrib/tcpdump/chdlc.h projects/mips/contrib/tcpdump/config.h.in projects/mips/contrib/tcpdump/configure projects/mips/contrib/tcpdump/configure.in projects/mips/contrib/tcpdump/dccp.h projects/mips/contrib/tcpdump/decnet.h projects/mips/contrib/tcpdump/enc.h projects/mips/contrib/tcpdump/ether.h projects/mips/contrib/tcpdump/ethertype.h projects/mips/contrib/tcpdump/extract.h projects/mips/contrib/tcpdump/fddi.h projects/mips/contrib/tcpdump/gmpls.c projects/mips/contrib/tcpdump/gmpls.h projects/mips/contrib/tcpdump/gmt2local.c projects/mips/contrib/tcpdump/gmt2local.h projects/mips/contrib/tcpdump/icmp6.h projects/mips/contrib/tcpdump/ieee802_11.h projects/mips/contrib/tcpdump/ieee802_11_radio.h projects/mips/contrib/tcpdump/igrp.h projects/mips/contrib/tcpdump/interface.h projects/mips/contrib/tcpdump/ip.h projects/mips/contrib/tcpdump/ip6.h projects/mips/contrib/tcpdump/ipfc.h projects/mips/contrib/tcpdump/ipproto.c projects/mips/contrib/tcpdump/ipproto.h projects/mips/contrib/tcpdump/ipsec_doi.h projects/mips/contrib/tcpdump/ipx.h projects/mips/contrib/tcpdump/isakmp.h projects/mips/contrib/tcpdump/l2tp.h projects/mips/contrib/tcpdump/l2vpn.c projects/mips/contrib/tcpdump/l2vpn.h projects/mips/contrib/tcpdump/lane.h projects/mips/contrib/tcpdump/lbl/os-osf4.h projects/mips/contrib/tcpdump/lbl/os-solaris2.h projects/mips/contrib/tcpdump/lbl/os-sunos4.h projects/mips/contrib/tcpdump/lbl/os-ultrix4.h projects/mips/contrib/tcpdump/llc.h projects/mips/contrib/tcpdump/machdep.c projects/mips/contrib/tcpdump/machdep.h projects/mips/contrib/tcpdump/makemib projects/mips/contrib/tcpdump/missing/addrinfo.h projects/mips/contrib/tcpdump/missing/datalinks.c projects/mips/contrib/tcpdump/missing/dlnames.c projects/mips/contrib/tcpdump/missing/getaddrinfo.c projects/mips/contrib/tcpdump/missing/getnameinfo.c projects/mips/contrib/tcpdump/missing/inet_aton.c projects/mips/contrib/tcpdump/missing/inet_ntop.c projects/mips/contrib/tcpdump/missing/inet_pton.c projects/mips/contrib/tcpdump/missing/snprintf.c projects/mips/contrib/tcpdump/missing/strdup.c projects/mips/contrib/tcpdump/missing/strlcat.c projects/mips/contrib/tcpdump/missing/strlcpy.c projects/mips/contrib/tcpdump/missing/strsep.c projects/mips/contrib/tcpdump/mpls.h projects/mips/contrib/tcpdump/nameser.h projects/mips/contrib/tcpdump/netbios.h projects/mips/contrib/tcpdump/netdissect.h projects/mips/contrib/tcpdump/nfs.h projects/mips/contrib/tcpdump/nfsfh.h projects/mips/contrib/tcpdump/nlpid.c projects/mips/contrib/tcpdump/nlpid.h projects/mips/contrib/tcpdump/ntp.h projects/mips/contrib/tcpdump/oakley.h projects/mips/contrib/tcpdump/ospf.h projects/mips/contrib/tcpdump/ospf6.h projects/mips/contrib/tcpdump/oui.c projects/mips/contrib/tcpdump/oui.h projects/mips/contrib/tcpdump/parsenfsfh.c projects/mips/contrib/tcpdump/pcap-missing.h projects/mips/contrib/tcpdump/pcap_dump_ftell.c projects/mips/contrib/tcpdump/pmap_prot.h projects/mips/contrib/tcpdump/ppp.h projects/mips/contrib/tcpdump/print-802_11.c projects/mips/contrib/tcpdump/print-ah.c projects/mips/contrib/tcpdump/print-aodv.c projects/mips/contrib/tcpdump/print-ap1394.c projects/mips/contrib/tcpdump/print-arcnet.c projects/mips/contrib/tcpdump/print-arp.c projects/mips/contrib/tcpdump/print-ascii.c projects/mips/contrib/tcpdump/print-atalk.c projects/mips/contrib/tcpdump/print-atm.c projects/mips/contrib/tcpdump/print-beep.c projects/mips/contrib/tcpdump/print-bfd.c projects/mips/contrib/tcpdump/print-bgp.c projects/mips/contrib/tcpdump/print-bootp.c projects/mips/contrib/tcpdump/print-cdp.c projects/mips/contrib/tcpdump/print-chdlc.c projects/mips/contrib/tcpdump/print-cip.c projects/mips/contrib/tcpdump/print-cnfp.c projects/mips/contrib/tcpdump/print-dccp.c projects/mips/contrib/tcpdump/print-decnet.c projects/mips/contrib/tcpdump/print-dhcp6.c projects/mips/contrib/tcpdump/print-domain.c projects/mips/contrib/tcpdump/print-dvmrp.c projects/mips/contrib/tcpdump/print-eap.c projects/mips/contrib/tcpdump/print-egp.c projects/mips/contrib/tcpdump/print-eigrp.c projects/mips/contrib/tcpdump/print-enc.c projects/mips/contrib/tcpdump/print-esp.c projects/mips/contrib/tcpdump/print-ether.c projects/mips/contrib/tcpdump/print-fddi.c projects/mips/contrib/tcpdump/print-fr.c projects/mips/contrib/tcpdump/print-frag6.c projects/mips/contrib/tcpdump/print-gre.c projects/mips/contrib/tcpdump/print-hsrp.c projects/mips/contrib/tcpdump/print-icmp.c projects/mips/contrib/tcpdump/print-icmp6.c projects/mips/contrib/tcpdump/print-igmp.c projects/mips/contrib/tcpdump/print-igrp.c projects/mips/contrib/tcpdump/print-ip.c projects/mips/contrib/tcpdump/print-ip6.c projects/mips/contrib/tcpdump/print-ip6opts.c projects/mips/contrib/tcpdump/print-ipcomp.c projects/mips/contrib/tcpdump/print-ipfc.c projects/mips/contrib/tcpdump/print-ipx.c projects/mips/contrib/tcpdump/print-isakmp.c projects/mips/contrib/tcpdump/print-isoclns.c projects/mips/contrib/tcpdump/print-juniper.c projects/mips/contrib/tcpdump/print-krb.c projects/mips/contrib/tcpdump/print-l2tp.c projects/mips/contrib/tcpdump/print-lane.c projects/mips/contrib/tcpdump/print-ldp.c projects/mips/contrib/tcpdump/print-llc.c projects/mips/contrib/tcpdump/print-lmp.c projects/mips/contrib/tcpdump/print-lspping.c projects/mips/contrib/tcpdump/print-lwres.c projects/mips/contrib/tcpdump/print-mobile.c projects/mips/contrib/tcpdump/print-mobility.c projects/mips/contrib/tcpdump/print-mpls.c projects/mips/contrib/tcpdump/print-msdp.c projects/mips/contrib/tcpdump/print-netbios.c projects/mips/contrib/tcpdump/print-nfs.c projects/mips/contrib/tcpdump/print-ntp.c projects/mips/contrib/tcpdump/print-null.c projects/mips/contrib/tcpdump/print-ospf.c projects/mips/contrib/tcpdump/print-ospf6.c projects/mips/contrib/tcpdump/print-pflog.c projects/mips/contrib/tcpdump/print-pgm.c projects/mips/contrib/tcpdump/print-pim.c projects/mips/contrib/tcpdump/print-ppp.c projects/mips/contrib/tcpdump/print-pppoe.c projects/mips/contrib/tcpdump/print-pptp.c projects/mips/contrib/tcpdump/print-radius.c projects/mips/contrib/tcpdump/print-raw.c projects/mips/contrib/tcpdump/print-rip.c projects/mips/contrib/tcpdump/print-ripng.c projects/mips/contrib/tcpdump/print-rsvp.c projects/mips/contrib/tcpdump/print-rt6.c projects/mips/contrib/tcpdump/print-rx.c projects/mips/contrib/tcpdump/print-sctp.c projects/mips/contrib/tcpdump/print-sip.c projects/mips/contrib/tcpdump/print-sl.c projects/mips/contrib/tcpdump/print-sll.c projects/mips/contrib/tcpdump/print-slow.c projects/mips/contrib/tcpdump/print-smb.c projects/mips/contrib/tcpdump/print-snmp.c projects/mips/contrib/tcpdump/print-stp.c projects/mips/contrib/tcpdump/print-sunatm.c projects/mips/contrib/tcpdump/print-sunrpc.c projects/mips/contrib/tcpdump/print-symantec.c projects/mips/contrib/tcpdump/print-syslog.c projects/mips/contrib/tcpdump/print-tcp.c projects/mips/contrib/tcpdump/print-telnet.c projects/mips/contrib/tcpdump/print-tftp.c projects/mips/contrib/tcpdump/print-timed.c projects/mips/contrib/tcpdump/print-token.c projects/mips/contrib/tcpdump/print-udp.c projects/mips/contrib/tcpdump/print-vjc.c projects/mips/contrib/tcpdump/print-vrrp.c projects/mips/contrib/tcpdump/print-wb.c projects/mips/contrib/tcpdump/print-zephyr.c projects/mips/contrib/tcpdump/route6d.h projects/mips/contrib/tcpdump/rpc_auth.h projects/mips/contrib/tcpdump/rpc_msg.h projects/mips/contrib/tcpdump/rx.h projects/mips/contrib/tcpdump/sctpConstants.h projects/mips/contrib/tcpdump/sctpHeader.h projects/mips/contrib/tcpdump/setsignal.c projects/mips/contrib/tcpdump/setsignal.h projects/mips/contrib/tcpdump/slcompress.h projects/mips/contrib/tcpdump/slip.h projects/mips/contrib/tcpdump/sll.h projects/mips/contrib/tcpdump/smb.h projects/mips/contrib/tcpdump/smbutil.c projects/mips/contrib/tcpdump/strcasecmp.c projects/mips/contrib/tcpdump/tcp.h projects/mips/contrib/tcpdump/tcpdump-stdinc.h projects/mips/contrib/tcpdump/tcpdump.1 projects/mips/contrib/tcpdump/tcpdump.c projects/mips/contrib/tcpdump/telnet.h projects/mips/contrib/tcpdump/tftp.h projects/mips/contrib/tcpdump/timed.h projects/mips/contrib/tcpdump/token.h projects/mips/contrib/tcpdump/udp.h projects/mips/contrib/tcpdump/util.c projects/mips/contrib/tcpdump/vfprintf.c projects/mips/contrib/top/ (props changed) projects/mips/contrib/top/install-sh (props changed) projects/mips/contrib/wpa/hostapd/wme.h projects/mips/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/mips/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/mips/crypto/openssh/ (props changed) projects/mips/crypto/openssl/ (props changed) projects/mips/etc/defaults/rc.conf projects/mips/etc/mail/aliases projects/mips/etc/mtree/BSD.include.dist projects/mips/etc/netstart projects/mips/etc/network.subr projects/mips/etc/rc.d/ipfw projects/mips/gnu/usr.bin/cc/Makefile.inc projects/mips/include/arpa/inet.h projects/mips/include/ctype.h projects/mips/include/db.h projects/mips/include/dlfcn.h projects/mips/include/grp.h projects/mips/include/mpool.h projects/mips/include/ndbm.h projects/mips/include/netdb.h projects/mips/include/pthread.h projects/mips/include/pwd.h projects/mips/include/setjmp.h projects/mips/include/signal.h projects/mips/include/stdio.h projects/mips/include/stdlib.h projects/mips/include/string.h projects/mips/include/unistd.h projects/mips/lib/libarchive/Makefile projects/mips/lib/libarchive/archive.h projects/mips/lib/libarchive/archive_check_magic.c projects/mips/lib/libarchive/archive_entry.c projects/mips/lib/libarchive/archive_entry.h projects/mips/lib/libarchive/archive_read_disk_set_standard_lookup.c projects/mips/lib/libarchive/archive_read_support_compression_program.c projects/mips/lib/libarchive/archive_read_support_format_empty.c projects/mips/lib/libarchive/archive_string.c projects/mips/lib/libarchive/archive_string.h projects/mips/lib/libarchive/archive_write_disk.c projects/mips/lib/libarchive/archive_write_disk_set_standard_lookup.c projects/mips/lib/libarchive/archive_write_set_compression_program.c projects/mips/lib/libarchive/archive_write_set_format_mtree.c projects/mips/lib/libarchive/test/main.c projects/mips/lib/libarchive/test/test.h projects/mips/lib/libarchive/test/test_read_compress_program.c projects/mips/lib/libarchive/test/test_read_disk.c projects/mips/lib/libarchive/test/test_read_extract.c projects/mips/lib/libarchive/test/test_tar_large.c projects/mips/lib/libarchive/test/test_write_disk.c projects/mips/lib/libarchive/test/test_write_disk_failures.c projects/mips/lib/libarchive/test/test_write_disk_hardlink.c projects/mips/lib/libarchive/test/test_write_disk_perms.c projects/mips/lib/libarchive/test/test_write_disk_secure.c projects/mips/lib/libc/ (props changed) projects/mips/lib/libc/Makefile projects/mips/lib/libc/db/README projects/mips/lib/libc/db/Symbol.map projects/mips/lib/libc/db/btree/bt_debug.c projects/mips/lib/libc/db/btree/bt_open.c projects/mips/lib/libc/db/btree/bt_page.c projects/mips/lib/libc/db/btree/bt_put.c projects/mips/lib/libc/db/btree/bt_split.c projects/mips/lib/libc/db/db/db.c projects/mips/lib/libc/db/hash/README projects/mips/lib/libc/db/hash/hash.c projects/mips/lib/libc/db/hash/hash.h projects/mips/lib/libc/db/hash/hash_bigkey.c projects/mips/lib/libc/db/hash/hash_buf.c projects/mips/lib/libc/db/hash/hash_func.c projects/mips/lib/libc/db/hash/hash_log2.c projects/mips/lib/libc/db/hash/hash_page.c projects/mips/lib/libc/db/man/mpool.3 projects/mips/lib/libc/db/mpool/Makefile.inc projects/mips/lib/libc/db/mpool/mpool.c projects/mips/lib/libc/db/recno/rec_close.c projects/mips/lib/libc/db/recno/rec_put.c projects/mips/lib/libc/gen/Makefile.inc projects/mips/lib/libc/gen/Symbol.map projects/mips/lib/libc/gen/dlfcn.c projects/mips/lib/libc/gen/dlopen.3 projects/mips/lib/libc/gen/getcap.c projects/mips/lib/libc/i386/sys/Makefile.inc projects/mips/lib/libc/net/getaddrinfo.c projects/mips/lib/libc/nls/Makefile.inc projects/mips/lib/libc/nls/ru_RU.KOI8-R.msg (contents, props changed) projects/mips/lib/libc/rpc/clnt_bcast.c projects/mips/lib/libc/rpc/getnetconfig.c projects/mips/lib/libc/stdio/asprintf.c (props changed) projects/mips/lib/libc/stdio/getdelim.c projects/mips/lib/libc/stdio/getline.3 projects/mips/lib/libc/stdtime/ (props changed) projects/mips/lib/libc/string/ffsll.c (props changed) projects/mips/lib/libc/string/flsll.c (props changed) projects/mips/lib/libc/string/memchr.3 projects/mips/lib/libc/string/memcmp.3 projects/mips/lib/libc/string/memcpy.3 projects/mips/lib/libc/string/memmove.3 projects/mips/lib/libc/string/memset.3 projects/mips/lib/libc/string/strcasecmp.3 projects/mips/lib/libc/string/strcat.3 projects/mips/lib/libc/string/strchr.3 projects/mips/lib/libc/string/strcmp.3 projects/mips/lib/libc/string/strcpy.3 projects/mips/lib/libc/string/strdup.3 projects/mips/lib/libc/string/strlcpy.3 projects/mips/lib/libc/string/strlen.3 projects/mips/lib/libc/string/strpbrk.3 projects/mips/lib/libc/string/strspn.3 projects/mips/lib/libc/string/strstr.3 projects/mips/lib/libc/string/wcpcpy.c (props changed) projects/mips/lib/libc/sys/Symbol.map projects/mips/lib/libc/sys/ptrace.2 projects/mips/lib/libkvm/kvm_powerpc.c projects/mips/lib/libpcap/Makefile projects/mips/lib/libpcap/config.h projects/mips/lib/libpmc/pmc.h projects/mips/lib/libpmc/pmclog.h projects/mips/lib/libstand/gets.c projects/mips/lib/libthr/Makefile projects/mips/lib/libthr/thread/thr_fork.c projects/mips/lib/libufs/block.c projects/mips/lib/libusb/ (props changed) projects/mips/lib/libusb/libusb.3 (contents, props changed) projects/mips/lib/libusb/libusb20.h projects/mips/lib/libusb/usb.h (props changed) projects/mips/lib/libutil/ (props changed) projects/mips/lib/msun/src/math.h projects/mips/lib/msun/src/math_private.h projects/mips/lib/msun/src/s_cimag.c projects/mips/lib/msun/src/s_cimagf.c projects/mips/lib/msun/src/s_cimagl.c projects/mips/libexec/bootpd/rtmsg.c projects/mips/libexec/ftpd/extern.h projects/mips/libexec/ftpd/ftpcmd.y projects/mips/libexec/ftpd/ftpd.c projects/mips/libexec/rtld-elf/Symbol.map projects/mips/libexec/rtld-elf/map_object.c projects/mips/libexec/rtld-elf/rtld.1 projects/mips/libexec/rtld-elf/rtld.c projects/mips/libexec/rtld-elf/rtld.h projects/mips/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/mips/release/doc/ja_JP.eucJP/hardware/common/dev.sgml projects/mips/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml projects/mips/release/doc/share/misc/dev.archlist.txt projects/mips/release/doc/zh_CN.GB2312/hardware/article.sgml projects/mips/release/picobsd/bridge/PICOBSD projects/mips/release/picobsd/bridge/config projects/mips/release/picobsd/bridge/crunch.conf projects/mips/release/picobsd/build/picobsd projects/mips/release/picobsd/floppy.tree/etc/rc1 projects/mips/release/picobsd/mfs_tree/etc/rc projects/mips/release/picobsd/tinyware/simple_httpd/Makefile projects/mips/release/picobsd/tinyware/simple_httpd/simple_httpd.c projects/mips/release/sparc64/mkisoimages.sh projects/mips/rescue/rescue/Makefile projects/mips/sbin/ (props changed) projects/mips/sbin/Makefile projects/mips/sbin/fdisk_pc98/fdisk.c projects/mips/sbin/geom/class/label/glabel.8 projects/mips/sbin/gvinum/gvinum.8 projects/mips/sbin/gvinum/gvinum.c projects/mips/sbin/ifconfig/ifclone.c projects/mips/sbin/ifconfig/ifconfig.c projects/mips/sbin/ifconfig/ifgroup.c projects/mips/sbin/ifconfig/ifieee80211.c projects/mips/sbin/ipfw/ (props changed) projects/mips/sbin/ipfw/dummynet.c projects/mips/sbin/ipfw/ipfw.8 projects/mips/sbin/ipfw/ipfw2.c projects/mips/sbin/ipfw/ipfw2.h projects/mips/sbin/ipfw/main.c projects/mips/sbin/newfs_msdos/newfs_msdos.8 projects/mips/sbin/newfs_msdos/newfs_msdos.c projects/mips/sbin/recoverdisk/recoverdisk.c projects/mips/sbin/route/route.c projects/mips/sbin/routed/Makefile projects/mips/sbin/routed/defs.h projects/mips/sbin/routed/if.c projects/mips/sbin/routed/input.c projects/mips/sbin/routed/main.c projects/mips/sbin/routed/output.c projects/mips/sbin/routed/parms.c projects/mips/sbin/routed/radix.c projects/mips/sbin/routed/radix.h projects/mips/sbin/routed/rdisc.c projects/mips/sbin/routed/table.c projects/mips/sbin/routed/trace.c projects/mips/share/man/man3/pthread.3 projects/mips/share/man/man4/Makefile projects/mips/share/man/man4/ath.4 projects/mips/share/man/man4/ath_hal.4 projects/mips/share/man/man4/bce.4 projects/mips/share/man/man4/ed.4 projects/mips/share/man/man4/lagg.4 projects/mips/share/man/man4/lo.4 projects/mips/share/man/man4/malo.4 projects/mips/share/man/man4/man4.i386/fe.4 projects/mips/share/man/man4/man4.powerpc/pmu.4 projects/mips/share/man/man4/pccbb.4 projects/mips/share/man/man4/textdump.4 projects/mips/share/man/man4/usb.4 projects/mips/share/man/man4/wlan.4 projects/mips/share/man/man4/wpi.4 projects/mips/share/man/man5/devfs.rules.5 projects/mips/share/man/man5/rc.conf.5 projects/mips/share/man/man5/src.conf.5 projects/mips/share/man/man7/operator.7 projects/mips/share/man/man8/diskless.8 projects/mips/share/man/man8/nanobsd.8 projects/mips/share/man/man9/Makefile projects/mips/share/man/man9/VOP_ACCESS.9 projects/mips/share/man/man9/VOP_ATTRIB.9 projects/mips/share/man/man9/VOP_CREATE.9 projects/mips/share/man/man9/VOP_FSYNC.9 projects/mips/share/man/man9/VOP_INACTIVE.9 projects/mips/share/man/man9/VOP_IOCTL.9 projects/mips/share/man/man9/VOP_LINK.9 projects/mips/share/man/man9/VOP_LOCK.9 projects/mips/share/man/man9/VOP_LOOKUP.9 projects/mips/share/man/man9/VOP_OPENCLOSE.9 projects/mips/share/man/man9/VOP_RDWR.9 projects/mips/share/man/man9/VOP_READDIR.9 projects/mips/share/man/man9/VOP_READLINK.9 projects/mips/share/man/man9/VOP_REMOVE.9 projects/mips/share/man/man9/VOP_RENAME.9 projects/mips/share/man/man9/VOP_VPTOCNP.9 projects/mips/share/man/man9/acl.9 projects/mips/share/man/man9/bus_dma.9 projects/mips/share/man/man9/vm_map_lock.9 projects/mips/share/misc/committers-ports.dot projects/mips/share/misc/committers-src.dot projects/mips/share/misc/iso3166 projects/mips/share/misc/operator projects/mips/share/mk/bsd.cpu.mk projects/mips/share/mk/bsd.own.mk projects/mips/share/mk/bsd.sys.mk projects/mips/share/skel/dot.login projects/mips/share/skel/dot.profile projects/mips/share/timedef/Makefile projects/mips/share/zoneinfo/ (props changed) projects/mips/share/zoneinfo/africa projects/mips/share/zoneinfo/asia projects/mips/share/zoneinfo/northamerica projects/mips/share/zoneinfo/southamerica projects/mips/sys/ (props changed) projects/mips/sys/amd64/acpica/acpi_machdep.c projects/mips/sys/amd64/acpica/acpi_wakeup.c projects/mips/sys/amd64/amd64/amd64_mem.c projects/mips/sys/amd64/amd64/apic_vector.S projects/mips/sys/amd64/amd64/cpu_switch.S projects/mips/sys/amd64/amd64/db_interface.c projects/mips/sys/amd64/amd64/db_trace.c projects/mips/sys/amd64/amd64/elf_machdep.c projects/mips/sys/amd64/amd64/exception.S projects/mips/sys/amd64/amd64/fpu.c projects/mips/sys/amd64/amd64/genassym.c projects/mips/sys/amd64/amd64/machdep.c projects/mips/sys/amd64/amd64/mp_machdep.c projects/mips/sys/amd64/amd64/pmap.c projects/mips/sys/amd64/amd64/sys_machdep.c projects/mips/sys/amd64/amd64/trap.c projects/mips/sys/amd64/amd64/vm_machdep.c projects/mips/sys/amd64/conf/GENERIC projects/mips/sys/amd64/conf/NOTES projects/mips/sys/amd64/ia32/ia32_exception.S projects/mips/sys/amd64/ia32/ia32_reg.c projects/mips/sys/amd64/ia32/ia32_signal.c projects/mips/sys/amd64/ia32/ia32_sigtramp.S projects/mips/sys/amd64/include/apicvar.h projects/mips/sys/amd64/include/asmacros.h projects/mips/sys/amd64/include/cpufunc.h projects/mips/sys/amd64/include/elf.h projects/mips/sys/amd64/include/endian.h projects/mips/sys/amd64/include/frame.h projects/mips/sys/amd64/include/md_var.h projects/mips/sys/amd64/include/pcb.h projects/mips/sys/amd64/include/pcpu.h projects/mips/sys/amd64/include/pmap.h projects/mips/sys/amd64/include/proc.h projects/mips/sys/amd64/include/reg.h projects/mips/sys/amd64/include/segments.h projects/mips/sys/amd64/include/signal.h projects/mips/sys/amd64/include/smp.h projects/mips/sys/amd64/include/sysarch.h projects/mips/sys/amd64/include/ucontext.h projects/mips/sys/amd64/include/xen/ (props changed) projects/mips/sys/amd64/linux32/linux.h projects/mips/sys/amd64/linux32/linux32_locore.s projects/mips/sys/amd64/linux32/linux32_machdep.c projects/mips/sys/amd64/linux32/linux32_sysvec.c projects/mips/sys/amd64/pci/pci_cfgreg.c projects/mips/sys/arm/arm/cpufunc_asm_sheeva.S (props changed) projects/mips/sys/arm/arm/elf_machdep.c projects/mips/sys/arm/arm/locore.S projects/mips/sys/arm/arm/trap.c projects/mips/sys/arm/at91/files.at91 projects/mips/sys/arm/conf/AVILA projects/mips/sys/arm/conf/CAMBRIA projects/mips/sys/arm/conf/HL200 projects/mips/sys/arm/conf/KB920X projects/mips/sys/arm/include/atomic.h projects/mips/sys/arm/include/elf.h projects/mips/sys/arm/include/vmparam.h projects/mips/sys/boot/forth/loader.conf projects/mips/sys/boot/i386/libi386/Makefile projects/mips/sys/boot/i386/libi386/bioscd.c projects/mips/sys/boot/i386/libi386/biosdisk.c projects/mips/sys/boot/i386/libi386/libi386.h projects/mips/sys/boot/i386/libi386/smbios.c projects/mips/sys/boot/pc98/libpc98/Makefile projects/mips/sys/boot/pc98/libpc98/bioscd.c projects/mips/sys/boot/pc98/libpc98/biosdisk.c projects/mips/sys/boot/pc98/libpc98/time.c projects/mips/sys/boot/pc98/loader/Makefile projects/mips/sys/boot/pc98/loader/main.c projects/mips/sys/cddl/compat/opensolaris/sys/vnode.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mips/sys/compat/freebsd32/freebsd32.h projects/mips/sys/compat/freebsd32/freebsd32_ioctl.c projects/mips/sys/compat/freebsd32/freebsd32_ioctl.h projects/mips/sys/compat/freebsd32/freebsd32_misc.c projects/mips/sys/compat/freebsd32/freebsd32_proto.h projects/mips/sys/compat/freebsd32/freebsd32_syscall.h projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c projects/mips/sys/compat/freebsd32/freebsd32_sysent.c projects/mips/sys/compat/freebsd32/syscalls.master projects/mips/sys/compat/ia32/ia32_signal.h projects/mips/sys/compat/ia32/ia32_sysvec.c projects/mips/sys/compat/linprocfs/linprocfs.c projects/mips/sys/compat/linux/linux_emul.h projects/mips/sys/compat/linux/linux_file.c projects/mips/sys/compat/linux/linux_futex.c projects/mips/sys/compat/linux/linux_futex.h projects/mips/sys/compat/ndis/subr_ntoskrnl.c projects/mips/sys/compat/ndis/subr_usbd.c projects/mips/sys/compat/svr4/svr4_sysvec.c projects/mips/sys/conf/Makefile.mips projects/mips/sys/conf/NOTES projects/mips/sys/conf/files projects/mips/sys/conf/files.amd64 projects/mips/sys/conf/files.i386 projects/mips/sys/conf/files.ia64 projects/mips/sys/conf/files.mips projects/mips/sys/conf/files.pc98 projects/mips/sys/conf/files.powerpc projects/mips/sys/conf/ldscript.mips projects/mips/sys/conf/newvers.sh projects/mips/sys/conf/options projects/mips/sys/conf/options.mips projects/mips/sys/contrib/pf/ (props changed) projects/mips/sys/contrib/pf/net/pf.c projects/mips/sys/dev/acpi_support/acpi_asus.c projects/mips/sys/dev/acpica/acpi.c projects/mips/sys/dev/acpica/acpi_cpu.c projects/mips/sys/dev/acpica/acpi_ec.c projects/mips/sys/dev/acpica/acpivar.h projects/mips/sys/dev/age/if_age.c projects/mips/sys/dev/age/if_agereg.h projects/mips/sys/dev/agp/agp.c projects/mips/sys/dev/agp/agp_amd64.c projects/mips/sys/dev/agp/agp_i810.c projects/mips/sys/dev/agp/agp_intel.c projects/mips/sys/dev/agp/agp_via.c projects/mips/sys/dev/ata/ata-pci.c projects/mips/sys/dev/ata/ata-pci.h projects/mips/sys/dev/ata/ata-queue.c projects/mips/sys/dev/ata/ata-sata.c projects/mips/sys/dev/ata/ata-usb.c (props changed) projects/mips/sys/dev/ata/chipsets/ata-ahci.c projects/mips/sys/dev/ata/chipsets/ata-intel.c projects/mips/sys/dev/ata/chipsets/ata-jmicron.c projects/mips/sys/dev/ata/chipsets/ata-marvell.c projects/mips/sys/dev/ata/chipsets/ata-nvidia.c projects/mips/sys/dev/ata/chipsets/ata-promise.c projects/mips/sys/dev/ata/chipsets/ata-serverworks.c projects/mips/sys/dev/ata/chipsets/ata-siliconimage.c projects/mips/sys/dev/ata/chipsets/ata-sis.c projects/mips/sys/dev/ata/chipsets/ata-via.c projects/mips/sys/dev/ath/ah_osdep.c projects/mips/sys/dev/ath/ath_hal/ah.h projects/mips/sys/dev/ath/ath_hal/ah_internal.h projects/mips/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/mips/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/mips/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/mips/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/mips/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/mips/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/mips/sys/dev/ath/if_ath.c projects/mips/sys/dev/ath/if_athvar.h projects/mips/sys/dev/atkbdc/psm.c projects/mips/sys/dev/bge/if_bge.c projects/mips/sys/dev/bge/if_bgereg.h projects/mips/sys/dev/cardbus/cardbus_cis.c projects/mips/sys/dev/cxgb/ (props changed) projects/mips/sys/dev/cxgb/cxgb_main.c projects/mips/sys/dev/cxgb/cxgb_offload.c projects/mips/sys/dev/cxgb/cxgb_sge.c projects/mips/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/mips/sys/dev/dc/dcphy.c projects/mips/sys/dev/dc/pnphy.c projects/mips/sys/dev/dcons/dcons_os.c projects/mips/sys/dev/drm/ati_pcigart.c projects/mips/sys/dev/drm/drmP.h projects/mips/sys/dev/drm/drm_bufs.c projects/mips/sys/dev/drm/drm_drv.c projects/mips/sys/dev/drm/drm_irq.c projects/mips/sys/dev/drm/drm_linux_list.h projects/mips/sys/dev/drm/drm_lock.c projects/mips/sys/dev/drm/drm_pci.c projects/mips/sys/dev/drm/drm_pciids.h projects/mips/sys/dev/drm/drm_scatter.c projects/mips/sys/dev/drm/drm_vm.c projects/mips/sys/dev/drm/i915_dma.c projects/mips/sys/dev/drm/i915_drv.c projects/mips/sys/dev/drm/i915_drv.h projects/mips/sys/dev/drm/i915_irq.c projects/mips/sys/dev/drm/i915_reg.h projects/mips/sys/dev/drm/i915_suspend.c projects/mips/sys/dev/drm/mga_irq.c projects/mips/sys/dev/drm/r300_cmdbuf.c projects/mips/sys/dev/drm/r300_reg.h projects/mips/sys/dev/drm/r600_cp.c projects/mips/sys/dev/drm/radeon_cp.c projects/mips/sys/dev/drm/radeon_drv.h projects/mips/sys/dev/drm/radeon_irq.c projects/mips/sys/dev/e1000/e1000_80003es2lan.c projects/mips/sys/dev/e1000/e1000_82540.c projects/mips/sys/dev/e1000/e1000_82541.c projects/mips/sys/dev/e1000/e1000_82571.c projects/mips/sys/dev/e1000/e1000_82575.c projects/mips/sys/dev/e1000/e1000_82575.h projects/mips/sys/dev/e1000/e1000_api.c projects/mips/sys/dev/e1000/e1000_api.h projects/mips/sys/dev/e1000/e1000_defines.h projects/mips/sys/dev/e1000/e1000_hw.h projects/mips/sys/dev/e1000/e1000_ich8lan.c projects/mips/sys/dev/e1000/e1000_ich8lan.h projects/mips/sys/dev/e1000/e1000_mac.c projects/mips/sys/dev/e1000/e1000_mac.h projects/mips/sys/dev/e1000/e1000_nvm.c projects/mips/sys/dev/e1000/e1000_nvm.h projects/mips/sys/dev/e1000/e1000_phy.c projects/mips/sys/dev/e1000/e1000_phy.h projects/mips/sys/dev/e1000/e1000_regs.h projects/mips/sys/dev/e1000/if_em.c projects/mips/sys/dev/e1000/if_igb.c projects/mips/sys/dev/e1000/if_igb.h projects/mips/sys/dev/ed/ax88x90reg.h projects/mips/sys/dev/ed/dl100xxreg.h projects/mips/sys/dev/ed/if_ed.c projects/mips/sys/dev/ed/if_ed_cbus.c projects/mips/sys/dev/ed/if_ed_isa.c projects/mips/sys/dev/ed/if_ed_pccard.c projects/mips/sys/dev/ed/if_ed_pci.c projects/mips/sys/dev/ed/if_ed_wd80x3.c projects/mips/sys/dev/ed/if_edreg.h projects/mips/sys/dev/ed/if_edvar.h projects/mips/sys/dev/ep/if_ep.c projects/mips/sys/dev/ep/if_ep_pccard.c projects/mips/sys/dev/ep/if_epreg.h projects/mips/sys/dev/ep/if_epvar.h projects/mips/sys/dev/fe/if_fe_pccard.c projects/mips/sys/dev/firewire/firewire.c projects/mips/sys/dev/firewire/sbp.h projects/mips/sys/dev/hptiop/hptiop.h projects/mips/sys/dev/hptmv/access601.h projects/mips/sys/dev/hptmv/amd64-elf.raid.o.uu projects/mips/sys/dev/hptmv/array.h projects/mips/sys/dev/hptmv/command.h projects/mips/sys/dev/hptmv/entry.c projects/mips/sys/dev/hptmv/global.h projects/mips/sys/dev/hptmv/gui_lib.c projects/mips/sys/dev/hptmv/hptintf.h projects/mips/sys/dev/hptmv/hptproc.c projects/mips/sys/dev/hptmv/i386-elf.raid.o.uu projects/mips/sys/dev/hptmv/ioctl.c projects/mips/sys/dev/hptmv/mvOs.h projects/mips/sys/dev/hptmv/mvSata.h projects/mips/sys/dev/hptmv/mvStorageDev.h projects/mips/sys/dev/hptmv/osbsd.h projects/mips/sys/dev/hptmv/raid5n.h projects/mips/sys/dev/hptmv/readme.txt projects/mips/sys/dev/hptmv/vdevice.h projects/mips/sys/dev/ichwd/ichwd.c projects/mips/sys/dev/if_ndis/if_ndis.c projects/mips/sys/dev/if_ndis/if_ndis_usb.c projects/mips/sys/dev/if_ndis/if_ndisvar.h projects/mips/sys/dev/ipw/if_ipw.c projects/mips/sys/dev/iwi/if_iwi.c projects/mips/sys/dev/iwn/if_iwn.c projects/mips/sys/dev/ixgbe/LICENSE projects/mips/sys/dev/ixgbe/README projects/mips/sys/dev/ixgbe/ixgbe.c projects/mips/sys/dev/ixgbe/ixgbe.h projects/mips/sys/dev/ixgbe/ixgbe_82598.c projects/mips/sys/dev/ixgbe/ixgbe_api.c projects/mips/sys/dev/ixgbe/ixgbe_api.h projects/mips/sys/dev/ixgbe/ixgbe_common.c projects/mips/sys/dev/ixgbe/ixgbe_common.h projects/mips/sys/dev/ixgbe/ixgbe_osdep.h projects/mips/sys/dev/ixgbe/ixgbe_phy.c projects/mips/sys/dev/ixgbe/ixgbe_phy.h projects/mips/sys/dev/ixgbe/ixgbe_type.h projects/mips/sys/dev/kbd/kbdreg.h projects/mips/sys/dev/kbdmux/kbdmux.c projects/mips/sys/dev/malo/if_malo.c projects/mips/sys/dev/malo/if_malo_pci.c projects/mips/sys/dev/malo/if_malohal.c projects/mips/sys/dev/mii/miidevs projects/mips/sys/dev/msk/if_msk.c projects/mips/sys/dev/my/if_my.c projects/mips/sys/dev/ofw/ofw_standard.c projects/mips/sys/dev/ofw/openfirm.c projects/mips/sys/dev/pccard/pccarddevs projects/mips/sys/dev/pci/pci.c projects/mips/sys/dev/pci/pci_pci.c projects/mips/sys/dev/pci/pcib_private.h projects/mips/sys/dev/powermac_nvram/powermac_nvram.c projects/mips/sys/dev/ral/rt2560.c projects/mips/sys/dev/ral/rt2560var.h projects/mips/sys/dev/ral/rt2661.c projects/mips/sys/dev/ral/rt2661var.h projects/mips/sys/dev/re/if_re.c projects/mips/sys/dev/sound/pci/hda/hdac.c projects/mips/sys/dev/sound/usb/uaudio.c (contents, props changed) projects/mips/sys/dev/sound/usb/uaudio.h (props changed) projects/mips/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/mips/sys/dev/sound/usb/uaudioreg.h (props changed) projects/mips/sys/dev/syscons/syscons.c projects/mips/sys/dev/syscons/teken/teken.c projects/mips/sys/dev/syscons/teken/teken_subr.h projects/mips/sys/dev/twa/tw_cl_init.c projects/mips/sys/dev/twa/tw_osl.h projects/mips/sys/dev/twa/tw_osl_freebsd.c projects/mips/sys/dev/uart/uart_cpu_powerpc.c projects/mips/sys/dev/uart/uart_dev_ns8250.c projects/mips/sys/dev/usb/README.TXT (props changed) projects/mips/sys/dev/usb/bluetooth/TODO.TXT (props changed) projects/mips/sys/dev/usb/bluetooth/ng_ubt.c (contents, props changed) projects/mips/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed) projects/mips/sys/dev/usb/bluetooth/ubtbcmfw.c (contents, props changed) projects/mips/sys/dev/usb/controller/at91dci.c (contents, props changed) projects/mips/sys/dev/usb/controller/at91dci.h (contents, props changed) projects/mips/sys/dev/usb/controller/at91dci_atmelarm.c (contents, props changed) projects/mips/sys/dev/usb/controller/atmegadci.c (contents, props changed) projects/mips/sys/dev/usb/controller/atmegadci.h (contents, props changed) projects/mips/sys/dev/usb/controller/atmegadci_atmelarm.c (contents, props changed) projects/mips/sys/dev/usb/controller/ehci.c (contents, props changed) projects/mips/sys/dev/usb/controller/ehci.h (contents, props changed) projects/mips/sys/dev/usb/controller/ehci_ixp4xx.c (contents, props changed) projects/mips/sys/dev/usb/controller/ehci_mbus.c (contents, props changed) projects/mips/sys/dev/usb/controller/ehci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/musb_otg.c (contents, props changed) projects/mips/sys/dev/usb/controller/musb_otg.h (contents, props changed) projects/mips/sys/dev/usb/controller/musb_otg_atmelarm.c (contents, props changed) projects/mips/sys/dev/usb/controller/ohci.c (contents, props changed) projects/mips/sys/dev/usb/controller/ohci.h (contents, props changed) projects/mips/sys/dev/usb/controller/ohci_atmelarm.c (contents, props changed) projects/mips/sys/dev/usb/controller/ohci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uhci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uhci.h (contents, props changed) projects/mips/sys/dev/usb/controller/uhci_pci.c (contents, props changed) projects/mips/sys/dev/usb/controller/usb_controller.c (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci.c (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci.h (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci_atmelarm.c (contents, props changed) projects/mips/sys/dev/usb/input/uhid.c (contents, props changed) projects/mips/sys/dev/usb/input/ukbd.c (contents, props changed) projects/mips/sys/dev/usb/input/ums.c (contents, props changed) projects/mips/sys/dev/usb/input/usb_rdesc.h (props changed) projects/mips/sys/dev/usb/misc/udbp.c (contents, props changed) projects/mips/sys/dev/usb/misc/udbp.h (props changed) projects/mips/sys/dev/usb/misc/ufm.c (props changed) projects/mips/sys/dev/usb/net/if_aue.c (contents, props changed) projects/mips/sys/dev/usb/net/if_auereg.h (props changed) projects/mips/sys/dev/usb/net/if_axe.c (contents, props changed) projects/mips/sys/dev/usb/net/if_axereg.h (props changed) projects/mips/sys/dev/usb/net/if_cdce.c (contents, props changed) projects/mips/sys/dev/usb/net/if_cdcereg.h (contents, props changed) projects/mips/sys/dev/usb/net/if_cue.c (contents, props changed) projects/mips/sys/dev/usb/net/if_cuereg.h (props changed) projects/mips/sys/dev/usb/net/if_kue.c (contents, props changed) projects/mips/sys/dev/usb/net/if_kuefw.h (props changed) projects/mips/sys/dev/usb/net/if_kuereg.h (props changed) projects/mips/sys/dev/usb/net/if_rue.c (contents, props changed) projects/mips/sys/dev/usb/net/if_ruereg.h (props changed) projects/mips/sys/dev/usb/net/if_udav.c (contents, props changed) projects/mips/sys/dev/usb/net/if_udavreg.h (props changed) projects/mips/sys/dev/usb/net/usb_ethernet.c (props changed) projects/mips/sys/dev/usb/net/usb_ethernet.h (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/mips/sys/dev/usb/serial/u3g.c (contents, props changed) projects/mips/sys/dev/usb/serial/uark.c (contents, props changed) projects/mips/sys/dev/usb/serial/ubsa.c (contents, props changed) projects/mips/sys/dev/usb/serial/ubser.c (contents, props changed) projects/mips/sys/dev/usb/serial/uchcom.c (contents, props changed) projects/mips/sys/dev/usb/serial/ucycom.c (contents, props changed) projects/mips/sys/dev/usb/serial/ufoma.c (contents, props changed) projects/mips/sys/dev/usb/serial/uftdi.c (contents, props changed) projects/mips/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/mips/sys/dev/usb/serial/ugensa.c (contents, props changed) projects/mips/sys/dev/usb/serial/uipaq.c (contents, props changed) projects/mips/sys/dev/usb/serial/ulpt.c (contents, props changed) projects/mips/sys/dev/usb/serial/umct.c (contents, props changed) projects/mips/sys/dev/usb/serial/umodem.c (contents, props changed) projects/mips/sys/dev/usb/serial/umoscom.c (contents, props changed) projects/mips/sys/dev/usb/serial/uplcom.c (contents, props changed) projects/mips/sys/dev/usb/serial/usb_serial.c (contents, props changed) projects/mips/sys/dev/usb/serial/usb_serial.h (contents, props changed) projects/mips/sys/dev/usb/serial/uslcom.c (contents, props changed) projects/mips/sys/dev/usb/serial/uvisor.c (contents, props changed) projects/mips/sys/dev/usb/serial/uvscom.c (contents, props changed) projects/mips/sys/dev/usb/storage/rio500_usb.h (props changed) projects/mips/sys/dev/usb/storage/umass.c (contents, props changed) projects/mips/sys/dev/usb/storage/urio.c (contents, props changed) projects/mips/sys/dev/usb/storage/ustorage_fs.c (contents, props changed) projects/mips/sys/dev/usb/template/usb_template.c (contents, props changed) projects/mips/sys/dev/usb/template/usb_template.h (props changed) projects/mips/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/mips/sys/dev/usb/template/usb_template_msc.c (props changed) projects/mips/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/mips/sys/dev/usb/ufm_ioctl.h (props changed) projects/mips/sys/dev/usb/usb.h (contents, props changed) projects/mips/sys/dev/usb/usb_bus.h (contents, props changed) projects/mips/sys/dev/usb/usb_busdma.c (contents, props changed) projects/mips/sys/dev/usb/usb_busdma.h (contents, props changed) projects/mips/sys/dev/usb/usb_cdc.h (props changed) projects/mips/sys/dev/usb/usb_compat_linux.c (contents, props changed) projects/mips/sys/dev/usb/usb_compat_linux.h (contents, props changed) projects/mips/sys/dev/usb/usb_controller.h (contents, props changed) projects/mips/sys/dev/usb/usb_core.c (props changed) projects/mips/sys/dev/usb/usb_core.h (contents, props changed) projects/mips/sys/dev/usb/usb_debug.c (contents, props changed) projects/mips/sys/dev/usb/usb_debug.h (contents, props changed) projects/mips/sys/dev/usb/usb_defs.h (contents, props changed) projects/mips/sys/dev/usb/usb_dev.c (contents, props changed) projects/mips/sys/dev/usb/usb_dev.h (contents, props changed) projects/mips/sys/dev/usb/usb_device.c (contents, props changed) projects/mips/sys/dev/usb/usb_device.h (contents, props changed) projects/mips/sys/dev/usb/usb_dynamic.c (contents, props changed) projects/mips/sys/dev/usb/usb_dynamic.h (props changed) projects/mips/sys/dev/usb/usb_endian.h (contents, props changed) projects/mips/sys/dev/usb/usb_error.c (props changed) projects/mips/sys/dev/usb/usb_error.h (props changed) projects/mips/sys/dev/usb/usb_generic.c (contents, props changed) projects/mips/sys/dev/usb/usb_generic.h (props changed) projects/mips/sys/dev/usb/usb_handle_request.c (contents, props changed) projects/mips/sys/dev/usb/usb_handle_request.h (props changed) projects/mips/sys/dev/usb/usb_hid.c (contents, props changed) projects/mips/sys/dev/usb/usb_hid.h (contents, props changed) projects/mips/sys/dev/usb/usb_hub.c (contents, props changed) projects/mips/sys/dev/usb/usb_hub.h (contents, props changed) projects/mips/sys/dev/usb/usb_if.m (props changed) projects/mips/sys/dev/usb/usb_ioctl.h (props changed) projects/mips/sys/dev/usb/usb_lookup.c (contents, props changed) projects/mips/sys/dev/usb/usb_lookup.h (contents, props changed) projects/mips/sys/dev/usb/usb_mbuf.c (contents, props changed) projects/mips/sys/dev/usb/usb_mbuf.h (contents, props changed) projects/mips/sys/dev/usb/usb_mfunc.h (props changed) projects/mips/sys/dev/usb/usb_msctest.c (contents, props changed) projects/mips/sys/dev/usb/usb_msctest.h (props changed) projects/mips/sys/dev/usb/usb_parse.c (contents, props changed) projects/mips/sys/dev/usb/usb_parse.h (contents, props changed) projects/mips/sys/dev/usb/usb_pci.h (props changed) projects/mips/sys/dev/usb/usb_process.c (contents, props changed) projects/mips/sys/dev/usb/usb_process.h (contents, props changed) projects/mips/sys/dev/usb/usb_request.c (contents, props changed) projects/mips/sys/dev/usb/usb_request.h (contents, props changed) projects/mips/sys/dev/usb/usb_revision.h (props changed) projects/mips/sys/dev/usb/usb_transfer.c (contents, props changed) projects/mips/sys/dev/usb/usb_transfer.h (contents, props changed) projects/mips/sys/dev/usb/usb_util.c (contents, props changed) projects/mips/sys/dev/usb/usb_util.h (contents, props changed) projects/mips/sys/dev/usb/usbdevs (contents, props changed) projects/mips/sys/dev/usb/usbhid.h (props changed) projects/mips/sys/dev/usb/wlan/if_rum.c (contents, props changed) projects/mips/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumvar.h (contents, props changed) projects/mips/sys/dev/usb/wlan/if_ural.c (contents, props changed) projects/mips/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_uralvar.h (contents, props changed) projects/mips/sys/dev/usb/wlan/if_zyd.c (contents, props changed) projects/mips/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/mips/sys/dev/usb/wlan/usb_wlan.h (contents, props changed) projects/mips/sys/dev/wi/if_wi.c projects/mips/sys/dev/wpi/if_wpi.c projects/mips/sys/dev/wpi/if_wpireg.h projects/mips/sys/dev/xen/balloon/balloon.c projects/mips/sys/dev/xen/console/console.c projects/mips/sys/dev/xen/netfront/ (props changed) projects/mips/sys/dev/xen/xenpci/ (props changed) projects/mips/sys/fs/devfs/devfs_vnops.c projects/mips/sys/fs/fifofs/fifo_vnops.c projects/mips/sys/fs/nullfs/null_vnops.c projects/mips/sys/fs/pseudofs/pseudofs_vnops.c projects/mips/sys/fs/unionfs/union_subr.c projects/mips/sys/fs/unionfs/union_vnops.c projects/mips/sys/geom/eli/g_eli.c projects/mips/sys/geom/label/g_label.c projects/mips/sys/geom/label/g_label.h projects/mips/sys/geom/label/g_label_ufs.c projects/mips/sys/geom/part/g_part.c projects/mips/sys/geom/part/g_part_apm.c projects/mips/sys/geom/part/g_part_bsd.c projects/mips/sys/geom/part/g_part_ebr.c projects/mips/sys/geom/part/g_part_gpt.c projects/mips/sys/geom/part/g_part_mbr.c projects/mips/sys/geom/part/g_part_pc98.c projects/mips/sys/geom/vinum/geom_vinum.c projects/mips/sys/geom/vinum/geom_vinum.h projects/mips/sys/geom/vinum/geom_vinum_drive.c projects/mips/sys/geom/vinum/geom_vinum_init.c projects/mips/sys/geom/vinum/geom_vinum_list.c projects/mips/sys/geom/vinum/geom_vinum_move.c projects/mips/sys/geom/vinum/geom_vinum_plex.c projects/mips/sys/geom/vinum/geom_vinum_raid5.c projects/mips/sys/geom/vinum/geom_vinum_raid5.h projects/mips/sys/geom/vinum/geom_vinum_rename.c projects/mips/sys/geom/vinum/geom_vinum_rm.c projects/mips/sys/geom/vinum/geom_vinum_share.c projects/mips/sys/geom/vinum/geom_vinum_share.h projects/mips/sys/geom/vinum/geom_vinum_state.c projects/mips/sys/geom/vinum/geom_vinum_subr.c projects/mips/sys/geom/vinum/geom_vinum_var.h projects/mips/sys/geom/vinum/geom_vinum_volume.c projects/mips/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c projects/mips/sys/i386/conf/GENERIC projects/mips/sys/i386/conf/NOTES projects/mips/sys/i386/conf/XBOX projects/mips/sys/i386/i386/elf_machdep.c projects/mips/sys/i386/i386/i686_mem.c projects/mips/sys/i386/i386/k6_mem.c projects/mips/sys/i386/i386/machdep.c projects/mips/sys/i386/i386/pmap.c projects/mips/sys/i386/i386/vm_machdep.c projects/mips/sys/i386/include/cpufunc.h projects/mips/sys/i386/include/elf.h projects/mips/sys/i386/include/endian.h projects/mips/sys/i386/include/pmap.h projects/mips/sys/i386/include/signal.h projects/mips/sys/i386/include/ucontext.h projects/mips/sys/i386/include/vmparam.h projects/mips/sys/i386/include/xen/xenpmap.h projects/mips/sys/i386/include/xen/xenvar.h projects/mips/sys/i386/isa/npx.c projects/mips/sys/i386/linux/linux_sysvec.c projects/mips/sys/i386/pci/pci_cfgreg.c projects/mips/sys/i386/xen/pmap.c projects/mips/sys/i386/xen/xen_machdep.c projects/mips/sys/ia64/ia64/elf_machdep.c projects/mips/sys/ia64/include/elf.h projects/mips/sys/kern/imgact_elf.c projects/mips/sys/kern/kern_acct.c projects/mips/sys/kern/kern_alq.c projects/mips/sys/kern/kern_environment.c projects/mips/sys/kern/kern_exec.c projects/mips/sys/kern/kern_jail.c projects/mips/sys/kern/kern_ktrace.c projects/mips/sys/kern/kern_lock.c projects/mips/sys/kern/kern_mutex.c projects/mips/sys/kern/kern_poll.c projects/mips/sys/kern/kern_rwlock.c projects/mips/sys/kern/kern_shutdown.c projects/mips/sys/kern/kern_sig.c projects/mips/sys/kern/kern_sx.c projects/mips/sys/kern/kern_tc.c projects/mips/sys/kern/kern_thread.c projects/mips/sys/kern/kern_time.c projects/mips/sys/kern/kern_umtx.c projects/mips/sys/kern/kern_vimage.c projects/mips/sys/kern/sched_ule.c projects/mips/sys/kern/subr_bus.c projects/mips/sys/kern/subr_lock.c projects/mips/sys/kern/subr_param.c projects/mips/sys/kern/subr_rtc.c projects/mips/sys/kern/subr_smp.c projects/mips/sys/kern/sysv_sem.c projects/mips/sys/kern/tty.c projects/mips/sys/kern/uipc_domain.c projects/mips/sys/kern/uipc_sem.c projects/mips/sys/kern/uipc_syscalls.c projects/mips/sys/kern/uipc_usrreq.c projects/mips/sys/kern/vfs_acl.c projects/mips/sys/kern/vfs_bio.c projects/mips/sys/kern/vfs_cache.c projects/mips/sys/kern/vfs_default.c projects/mips/sys/kern/vfs_extattr.c projects/mips/sys/kern/vfs_lookup.c projects/mips/sys/kern/vfs_mount.c projects/mips/sys/kern/vfs_subr.c projects/mips/sys/kern/vfs_syscalls.c projects/mips/sys/kern/vfs_vnops.c projects/mips/sys/kern/vnode_if.src projects/mips/sys/legacy/dev/ata/ata-usb.c (props changed) projects/mips/sys/legacy/dev/sound/usb/uaudio.c (props changed) projects/mips/sys/legacy/dev/sound/usb/uaudio.h (props changed) projects/mips/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed) projects/mips/sys/legacy/dev/sound/usb/uaudioreg.h (props changed) projects/mips/sys/legacy/dev/usb/ (props changed) projects/mips/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) projects/mips/sys/mips/conf/ADM5120 projects/mips/sys/mips/conf/MALTA projects/mips/sys/mips/conf/QEMU projects/mips/sys/mips/conf/SENTRY5 projects/mips/sys/mips/include/bus.h projects/mips/sys/mips/include/elf.h projects/mips/sys/mips/mips/elf64_machdep.c (contents, props changed) projects/mips/sys/mips/mips/elf_machdep.c projects/mips/sys/mips/mips/nexus.c projects/mips/sys/mips/sentry5/files.sentry5 projects/mips/sys/modules/Makefile projects/mips/sys/modules/ath/Makefile projects/mips/sys/modules/cpufreq/Makefile projects/mips/sys/modules/dtrace/Makefile projects/mips/sys/modules/dtrace/dtraceall/dtraceall.c projects/mips/sys/modules/geom/geom_vinum/Makefile projects/mips/sys/modules/ip_mroute_mod/Makefile projects/mips/sys/modules/ipmi/Makefile projects/mips/sys/modules/ixgbe/Makefile projects/mips/sys/modules/linprocfs/Makefile projects/mips/sys/modules/mii/Makefile projects/mips/sys/modules/netgraph/Makefile projects/mips/sys/modules/nfsclient/Makefile projects/mips/sys/modules/opensolaris/Makefile projects/mips/sys/modules/usb/Makefile projects/mips/sys/modules/usb/usb/Makefile projects/mips/sys/net/bpf.h projects/mips/sys/net/if.c projects/mips/sys/net/if_bridge.c projects/mips/sys/net/if_gif.c projects/mips/sys/net/if_loop.c projects/mips/sys/net/if_spppsubr.c projects/mips/sys/net/if_tap.c projects/mips/sys/net/if_var.h projects/mips/sys/net/route.c projects/mips/sys/net/vnet.h projects/mips/sys/net80211/ieee80211.c projects/mips/sys/net80211/ieee80211.h projects/mips/sys/net80211/ieee80211_adhoc.c projects/mips/sys/net80211/ieee80211_ddb.c projects/mips/sys/net80211/ieee80211_freebsd.c projects/mips/sys/net80211/ieee80211_freebsd.h projects/mips/sys/net80211/ieee80211_hostap.c projects/mips/sys/net80211/ieee80211_input.c projects/mips/sys/net80211/ieee80211_input.h projects/mips/sys/net80211/ieee80211_ioctl.c projects/mips/sys/net80211/ieee80211_ioctl.h projects/mips/sys/net80211/ieee80211_node.c projects/mips/sys/net80211/ieee80211_node.h projects/mips/sys/net80211/ieee80211_output.c projects/mips/sys/net80211/ieee80211_proto.c projects/mips/sys/net80211/ieee80211_proto.h projects/mips/sys/net80211/ieee80211_scan.c projects/mips/sys/net80211/ieee80211_scan.h projects/mips/sys/net80211/ieee80211_scan_sta.c projects/mips/sys/net80211/ieee80211_sta.c projects/mips/sys/net80211/ieee80211_tdma.c projects/mips/sys/net80211/ieee80211_tdma.h projects/mips/sys/net80211/ieee80211_var.h projects/mips/sys/net80211/ieee80211_wds.c projects/mips/sys/netinet/icmp6.h projects/mips/sys/netinet/icmp_var.h projects/mips/sys/netinet/if_ether.c projects/mips/sys/netinet/igmp.c projects/mips/sys/netinet/igmp.h projects/mips/sys/netinet/igmp_var.h projects/mips/sys/netinet/in.c projects/mips/sys/netinet/in.h projects/mips/sys/netinet/in_gif.c projects/mips/sys/netinet/in_mcast.c projects/mips/sys/netinet/in_pcb.c projects/mips/sys/netinet/in_pcb.h projects/mips/sys/netinet/ip_carp.c projects/mips/sys/netinet/ip_carp.h projects/mips/sys/netinet/ip_divert.c projects/mips/sys/netinet/ip_dummynet.c projects/mips/sys/netinet/ip_dummynet.h projects/mips/sys/netinet/ip_fastfwd.c projects/mips/sys/netinet/ip_fw.h projects/mips/sys/netinet/ip_fw2.c projects/mips/sys/netinet/ip_fw_pfil.c projects/mips/sys/netinet/ip_icmp.c projects/mips/sys/netinet/ip_input.c projects/mips/sys/netinet/ip_ipsec.c projects/mips/sys/netinet/ip_mroute.c projects/mips/sys/netinet/ip_mroute.h projects/mips/sys/netinet/ip_options.c projects/mips/sys/netinet/ip_output.c projects/mips/sys/netinet/ip_var.h projects/mips/sys/netinet/libalias/alias.c projects/mips/sys/netinet/libalias/alias_cuseeme.c projects/mips/sys/netinet/libalias/alias_dummy.c projects/mips/sys/netinet/libalias/alias_ftp.c projects/mips/sys/netinet/libalias/alias_irc.c projects/mips/sys/netinet/libalias/alias_mod.c projects/mips/sys/netinet/libalias/alias_mod.h projects/mips/sys/netinet/libalias/alias_nbt.c projects/mips/sys/netinet/libalias/alias_pptp.c projects/mips/sys/netinet/libalias/alias_skinny.c projects/mips/sys/netinet/libalias/alias_smedia.c projects/mips/sys/netinet/pim_var.h projects/mips/sys/netinet/raw_ip.c projects/mips/sys/netinet/sctp.h projects/mips/sys/netinet/sctp_constants.h projects/mips/sys/netinet/sctp_indata.c projects/mips/sys/netinet/sctp_input.c projects/mips/sys/netinet/sctp_output.c projects/mips/sys/netinet/sctp_pcb.c projects/mips/sys/netinet/sctp_structs.h projects/mips/sys/netinet/sctp_sysctl.c projects/mips/sys/netinet/sctp_sysctl.h projects/mips/sys/netinet/sctp_timer.c projects/mips/sys/netinet/sctp_uio.h projects/mips/sys/netinet/sctp_usrreq.c projects/mips/sys/netinet/sctp_var.h projects/mips/sys/netinet/sctputil.c projects/mips/sys/netinet/sctputil.h projects/mips/sys/netinet/tcp_hostcache.c projects/mips/sys/netinet/tcp_input.c projects/mips/sys/netinet/tcp_output.c projects/mips/sys/netinet/tcp_reass.c projects/mips/sys/netinet/tcp_sack.c projects/mips/sys/netinet/tcp_subr.c projects/mips/sys/netinet/tcp_syncache.c projects/mips/sys/netinet/tcp_timer.c projects/mips/sys/netinet/tcp_timewait.c projects/mips/sys/netinet/tcp_usrreq.c projects/mips/sys/netinet/tcp_var.h projects/mips/sys/netinet/udp_usrreq.c projects/mips/sys/netinet/udp_var.h projects/mips/sys/netinet/vinet.h projects/mips/sys/netinet6/frag6.c projects/mips/sys/netinet6/icmp6.c projects/mips/sys/netinet6/in6.c projects/mips/sys/netinet6/in6_ifattach.c projects/mips/sys/netinet6/in6_pcb.c projects/mips/sys/netinet6/in6_src.c projects/mips/sys/netinet6/ip6_input.c projects/mips/sys/netinet6/ip6_mroute.c projects/mips/sys/netinet6/ip6_mroute.h projects/mips/sys/netinet6/mld6.c projects/mips/sys/netinet6/nd6.c projects/mips/sys/netinet6/nd6_nbr.c projects/mips/sys/netinet6/nd6_rtr.c projects/mips/sys/netinet6/raw_ip6.c projects/mips/sys/netinet6/scope6.c projects/mips/sys/netinet6/udp6_usrreq.c projects/mips/sys/netipsec/ipsec.c projects/mips/sys/netipsec/key.c projects/mips/sys/netipsec/xform_ah.c projects/mips/sys/netipsec/xform_esp.c projects/mips/sys/netipsec/xform_ipcomp.c projects/mips/sys/netipsec/xform_ipip.c projects/mips/sys/netnatm/natm.c projects/mips/sys/nfs4client/nfs4_socket.c projects/mips/sys/nfs4client/nfs4_vnops.c projects/mips/sys/nfsclient/nfs.h projects/mips/sys/nfsclient/nfs_bio.c projects/mips/sys/nfsclient/nfs_krpc.c projects/mips/sys/nfsclient/nfs_socket.c projects/mips/sys/nfsclient/nfs_subs.c projects/mips/sys/nfsclient/nfs_vnops.c projects/mips/sys/nfsclient/nfsnode.h projects/mips/sys/nfsserver/nfs.h projects/mips/sys/nfsserver/nfs_srvkrpc.c projects/mips/sys/nfsserver/nfs_srvsubs.c projects/mips/sys/nfsserver/nfs_syscalls.c projects/mips/sys/pc98/conf/GENERIC projects/mips/sys/pc98/conf/NOTES projects/mips/sys/pc98/pc98/machdep.c projects/mips/sys/pci/intpm.c projects/mips/sys/powerpc/aim/machdep.c projects/mips/sys/powerpc/aim/mmu_oea.c projects/mips/sys/powerpc/aim/mp_cpudep.c projects/mips/sys/powerpc/aim/ofw_machdep.c projects/mips/sys/powerpc/aim/swtch.S projects/mips/sys/powerpc/aim/trap_subr.S projects/mips/sys/powerpc/aim/uma_machdep.c projects/mips/sys/powerpc/aim/vm_machdep.c projects/mips/sys/powerpc/booke/machdep.c projects/mips/sys/powerpc/booke/pmap.c projects/mips/sys/powerpc/conf/GENERIC projects/mips/sys/powerpc/include/elf.h projects/mips/sys/powerpc/include/hid.h projects/mips/sys/powerpc/include/intr.h projects/mips/sys/powerpc/include/md_var.h projects/mips/sys/powerpc/include/pmap.h projects/mips/sys/powerpc/include/sf_buf.h projects/mips/sys/powerpc/include/spr.h projects/mips/sys/powerpc/include/vmparam.h projects/mips/sys/powerpc/mpc85xx/mpc85xx.c projects/mips/sys/powerpc/mpc85xx/mpc85xx.h projects/mips/sys/powerpc/mpc85xx/ocpbus.c projects/mips/sys/powerpc/ofw/ofw_syscons.c projects/mips/sys/powerpc/powermac/ata_macio.c projects/mips/sys/powerpc/powerpc/bus_machdep.c projects/mips/sys/powerpc/powerpc/cpu.c projects/mips/sys/powerpc/powerpc/elf_machdep.c projects/mips/sys/powerpc/powerpc/mem.c projects/mips/sys/powerpc/powerpc/mmu_if.m projects/mips/sys/powerpc/powerpc/pmap_dispatch.c projects/mips/sys/security/mac/mac_atalk.c projects/mips/sys/security/mac/mac_audit.c projects/mips/sys/security/mac/mac_cred.c projects/mips/sys/security/mac/mac_framework.c projects/mips/sys/security/mac/mac_inet.c projects/mips/sys/security/mac/mac_inet6.c projects/mips/sys/security/mac/mac_internal.h projects/mips/sys/security/mac/mac_net.c projects/mips/sys/security/mac/mac_pipe.c projects/mips/sys/security/mac/mac_posix_sem.c projects/mips/sys/security/mac/mac_posix_shm.c projects/mips/sys/security/mac/mac_priv.c projects/mips/sys/security/mac/mac_process.c projects/mips/sys/security/mac/mac_socket.c projects/mips/sys/security/mac/mac_syscalls.c projects/mips/sys/security/mac/mac_system.c projects/mips/sys/security/mac/mac_sysv_msg.c projects/mips/sys/security/mac/mac_sysv_sem.c projects/mips/sys/security/mac/mac_sysv_shm.c projects/mips/sys/security/mac/mac_vfs.c projects/mips/sys/security/mac_biba/mac_biba.c projects/mips/sys/security/mac_bsdextended/mac_bsdextended.c projects/mips/sys/security/mac_mls/mac_mls.c projects/mips/sys/security/mac_portacl/mac_portacl.c projects/mips/sys/sparc64/central/central.c projects/mips/sys/sparc64/conf/GENERIC projects/mips/sys/sparc64/ebus/ebus.c projects/mips/sys/sparc64/fhc/fhc.c projects/mips/sys/sparc64/include/elf.h projects/mips/sys/sparc64/include/trap.h projects/mips/sys/sparc64/isa/isa.c projects/mips/sys/sparc64/isa/ofw_isa.c projects/mips/sys/sparc64/pci/apb.c projects/mips/sys/sparc64/pci/ofw_pcib.c projects/mips/sys/sparc64/pci/ofw_pcibus.c projects/mips/sys/sparc64/pci/psycho.c projects/mips/sys/sparc64/pci/psychovar.h projects/mips/sys/sparc64/pci/schizo.c projects/mips/sys/sparc64/sbus/dma_sbus.c projects/mips/sys/sparc64/sbus/sbus.c projects/mips/sys/sparc64/sbus/sbusvar.h projects/mips/sys/sparc64/sparc64/db_disasm.c projects/mips/sys/sparc64/sparc64/eeprom.c projects/mips/sys/sparc64/sparc64/elf_machdep.c projects/mips/sys/sparc64/sparc64/jbusppm.c projects/mips/sys/sparc64/sparc64/mp_machdep.c projects/mips/sys/sparc64/sparc64/nexus.c projects/mips/sys/sparc64/sparc64/rtc.c projects/mips/sys/sparc64/sparc64/sc_machdep.c projects/mips/sys/sparc64/sparc64/schppm.c projects/mips/sys/sparc64/sparc64/trap.c projects/mips/sys/sparc64/sparc64/upa.c projects/mips/sys/sun4v/conf/GENERIC projects/mips/sys/sun4v/include/elf.h projects/mips/sys/sun4v/include/trap.h projects/mips/sys/sun4v/sun4v/trap.c projects/mips/sys/sys/_pthreadtypes.h projects/mips/sys/sys/aio.h projects/mips/sys/sys/buf.h projects/mips/sys/sys/dtrace_bsd.h projects/mips/sys/sys/elf_common.h projects/mips/sys/sys/imgact.h projects/mips/sys/sys/imgact_elf.h projects/mips/sys/sys/jail.h projects/mips/sys/sys/kernel.h projects/mips/sys/sys/kerneldump.h projects/mips/sys/sys/lock_profile.h projects/mips/sys/sys/mbuf.h projects/mips/sys/sys/memrange.h projects/mips/sys/sys/param.h projects/mips/sys/sys/proc.h projects/mips/sys/sys/sem.h projects/mips/sys/sys/shm.h projects/mips/sys/sys/smp.h projects/mips/sys/sys/stat.h projects/mips/sys/sys/syslog.h projects/mips/sys/sys/termios.h projects/mips/sys/sys/time.h projects/mips/sys/sys/uio.h projects/mips/sys/sys/vimage.h projects/mips/sys/sys/vnode.h projects/mips/sys/tools/vnode_if.awk projects/mips/sys/ufs/ffs/ffs_snapshot.c projects/mips/sys/ufs/ffs/ffs_softdep.c projects/mips/sys/ufs/ffs/ffs_vfsops.c projects/mips/sys/ufs/ffs/ffs_vnops.c projects/mips/sys/ufs/ufs/inode.h projects/mips/sys/vm/vm_extern.h projects/mips/sys/vm/vm_map.c projects/mips/sys/vm/vm_map.h projects/mips/sys/vm/vm_mmap.c projects/mips/sys/vm/vm_reserv.c projects/mips/sys/vm/vm_unix.c projects/mips/sys/xen/evtchn.h (props changed) projects/mips/sys/xen/evtchn/evtchn.c projects/mips/sys/xen/hypervisor.h (props changed) projects/mips/sys/xen/reboot.c (contents, props changed) projects/mips/sys/xen/xen_intr.h (props changed) projects/mips/tools/regression/bin/sh/builtins/alias.0 projects/mips/tools/regression/bin/sh/builtins/alias.0.stdout projects/mips/tools/regression/include/tgmath/Makefile projects/mips/tools/regression/lib/libc/stdio/test-getdelim.c projects/mips/tools/regression/lib/msun/test-conj.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/mips/tools/tools/ath/common/dumpregs.h (props changed) projects/mips/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/mips/tools/tools/nanobsd/rescue/AMD64 projects/mips/tools/tools/nanobsd/rescue/I386 projects/mips/tools/tools/sysbuild/sysbuild.sh projects/mips/usr.bin/ar/ar.c projects/mips/usr.bin/calendar/calendars/calendar.freebsd projects/mips/usr.bin/csup/ (props changed) projects/mips/usr.bin/cut/cut.1 projects/mips/usr.bin/kdump/kdump.c projects/mips/usr.bin/locate/locate/fastfind.c projects/mips/usr.bin/locate/locate/util.c projects/mips/usr.bin/login/login.c projects/mips/usr.bin/make/globals.h projects/mips/usr.bin/make/main.c projects/mips/usr.bin/make/make.1 projects/mips/usr.bin/make/make.c projects/mips/usr.bin/ministat/ministat.c projects/mips/usr.bin/ncal/ncal.1 projects/mips/usr.bin/ncal/ncal.c projects/mips/usr.bin/netstat/inet.c projects/mips/usr.bin/netstat/main.c projects/mips/usr.bin/netstat/mroute.c projects/mips/usr.bin/netstat/netstat.h projects/mips/usr.bin/procstat/ (props changed) projects/mips/usr.bin/su/su.c projects/mips/usr.bin/systat/netstat.c projects/mips/usr.sbin/Makefile projects/mips/usr.sbin/chown/chgrp.1 projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mips/usr.sbin/dumpcis/cis.h (props changed) projects/mips/usr.sbin/eeprom/ofw_options.c projects/mips/usr.sbin/fifolog/fifolog_create/fifolog.1 projects/mips/usr.sbin/gstat/gstat.8 projects/mips/usr.sbin/gstat/gstat.c projects/mips/usr.sbin/jexec/jexec.c projects/mips/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/mips/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/mips/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/mips/usr.sbin/makefs/getid.c (props changed) projects/mips/usr.sbin/mergemaster/mergemaster.8 projects/mips/usr.sbin/mergemaster/mergemaster.sh projects/mips/usr.sbin/portsnap/phttpget/phttpget.c projects/mips/usr.sbin/sysinstall/config.c projects/mips/usr.sbin/sysinstall/devices.c projects/mips/usr.sbin/sysinstall/dispatch.c projects/mips/usr.sbin/sysinstall/menus.c projects/mips/usr.sbin/sysinstall/modules.c projects/mips/usr.sbin/sysinstall/sysinstall.8 projects/mips/usr.sbin/sysinstall/sysinstall.h projects/mips/usr.sbin/sysinstall/user.c projects/mips/usr.sbin/tcpdump/tcpdump/Makefile projects/mips/usr.sbin/usbconfig/usbconfig.c projects/mips/usr.sbin/zic/ (props changed) Modified: projects/mips/MAINTAINERS ============================================================================== --- projects/mips/MAINTAINERS Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/MAINTAINERS Mon Apr 13 03:08:11 2009 (r190984) @@ -76,7 +76,7 @@ groff ru Recommends pre-commit review. share/mk ru This is a vital component of the build system, so I offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -drm anholt Just keep me informed of changes, try not to break it. +drm rnoland Just keep me informed of changes, try not to break it. libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. Modified: projects/mips/Makefile ============================================================================== --- projects/mips/Makefile Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/Makefile Mon Apr 13 03:08:11 2009 (r190984) @@ -88,7 +88,7 @@ TGTS= all all-man buildenv buildenvvars obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 distribute32 install32 + build32 distribute32 install32 xdev xdev-build xdev-install TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes @@ -279,7 +279,7 @@ tinderbox: # existing system is. # .if make(universe) || make(tinderbox) -TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed Modified: projects/mips/Makefile.inc1 ============================================================================== --- projects/mips/Makefile.inc1 Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/Makefile.inc1 Mon Apr 13 03:08:11 2009 (r190984) @@ -232,7 +232,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage @@ -291,7 +291,7 @@ LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTRE SHLIBDIR=/usr/lib32 LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ -DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP} LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif @@ -344,30 +344,13 @@ _worldtmp: rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ - usr/libexec usr/sbin usr/share/dict \ - usr/share/groff_font/devX100 \ - usr/share/groff_font/devX100-12 \ - usr/share/groff_font/devX75 \ - usr/share/groff_font/devX75-12 \ - usr/share/groff_font/devascii \ - usr/share/groff_font/devcp1047 \ - usr/share/groff_font/devdvi \ - usr/share/groff_font/devhtml \ - usr/share/groff_font/devkoi8-r \ - usr/share/groff_font/devlatin1 \ - usr/share/groff_font/devlbp \ - usr/share/groff_font/devlj4 \ - usr/share/groff_font/devps \ - usr/share/groff_font/devutf8 \ - usr/share/tmac/mdoc usr/share/tmac/mm - mkdir -p ${WORLDTMP}/legacy/${_dir} -.endfor -.for _dir in \ - lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc + lib usr legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} @@ -429,7 +412,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries + -DWITHOUT_MAN -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -448,10 +431,9 @@ build32: @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" -.for _dir in \ - usr/include usr/lib32 usr/share/misc - mkdir -p ${LIB32TMP}/${_dir} -.endfor + mkdir -p ${LIB32TMP}/usr/lib32 + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} @@ -612,8 +594,12 @@ installcheck_UGID: # # Required install tools to be saved in a scratch dir for safety. # +.if ${MK_INFO} != "no" +_install-info= install-info +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ + date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic @@ -1328,3 +1314,92 @@ check-old: check-old-files check-old-lib # showconfig: @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort + + +############### + +.if defined(XDEV) && defined(XDEV_ARCH) + +NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \ + -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS + +XDDIR=${XDEV}-freebsd +XDTP=/usr/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} +CDENV= ${CDBENV} \ + _SHLIBDIRPREFIX=${XDTP} \ + TOOLS_PREFIX=${XDTP} +CD2ENV=${CDENV} \ + MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH} + +CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp +CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}${XDTP} +.if !defined(OSREL) +OSREL!= uname -r | sed -e 's/[-(].*//' +.endif + +.ORDER: xdev-build xdev-install +xdev: xdev-build xdev-install + +.ORDER: _xb-build-tools _xb-cross-tools +xdev-build: _xb-build-tools _xb-cross-tools + +_xb-build-tools: + ${_+_}cd ${.CURDIR}; \ + ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools + +_xb-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all +.endfor + +_xi-mtree: + ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" + mkdir -p ${XDDESTDIR} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ + -p ${XDDESTDIR} >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${XDDESTDIR}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${XDDESTDIR}/usr/include >/dev/null + +.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links + +_xi-cross-tools: + @echo "_xi-cross-tools" +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} +.endfor + +_xi-includes: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \ + DESTDIR=${XDDESTDIR} + +_xi-libraries: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ + DESTDIR=${XDDESTDIR} + +_xi-links: + ${_+_}cd ${XDDESTDIR}/usr/bin; \ + for i in *; do \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}-$$i; \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ + done +.endif Modified: projects/mips/ObsoleteFiles.inc ============================================================================== --- projects/mips/ObsoleteFiles.inc Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/ObsoleteFiles.inc Mon Apr 13 03:08:11 2009 (r190984) @@ -14,14 +14,57 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090410: VOP_LEASE.9 removed +OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz +# 20090405: removal of if_ppp(4) and if_sl(4) +OLD_FILES+=sbin/slattach rescue/slattach +OLD_FILES+=sbin/startslip rescue/startslip +OLD_FILES+=usr/include/net/if_ppp.h +OLD_FILES+=usr/include/net/if_pppvar.h +OLD_FILES+=usr/include/net/if_slvar.h +OLD_FILES+=usr/include/net/ppp_comp.h +OLD_FILES+=usr/include/net/slip.h +OLD_FILES+=usr/sbin/sliplogin +OLD_FILES+=usr/sbin/slstat +OLD_FILES+=usr/sbin/pppd +OLD_FILES+=usr/sbin/pppstats +OLD_FILES+=usr/share/man/man1/startslip.1.gz +OLD_FILES+=usr/share/man/man4/if_ppp.4.gz +OLD_FILES+=usr/share/man/man4/if_sl.4.gz +OLD_FILES+=usr/share/man/man4/ppp.4.gz +OLD_FILES+=usr/share/man/man4/sl.4.gz +OLD_FILES+=usr/share/man/man8/pppd.8.gz +OLD_FILES+=usr/share/man/man8/pppstats.8.gz +OLD_FILES+=usr/share/man/man8/slattach.8.gz +OLD_FILES+=usr/share/man/man8/slip.8.gz +OLD_FILES+=usr/share/man/man8/sliplogin.8.gz +OLD_FILES+=usr/share/man/man8/slstat.8.gz +# 20090321: libpcap upgraded to 1.0.0 +OLD_LIBS+=lib/libpcap.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libpcap.so.5 +.endif +# 20090319: uscanner(4) has been removed +OLD_FILES+=usr/share/man/man4/uscanner.4.gz +# 20090313: k8temp(4) renamed to amdtemp(4) +OLD_FILES+=usr/share/man/man4/k8temp.4.gz # 20090308: libusb.so.1 renamed OLD_LIBS+=usr/lib/libusb20.so.1 OLD_FILES+=usr/lib/libusb20.a OLD_FILES+=usr/lib/libusb20.so OLD_FILES+=usr/lib/libusb20_p.a OLD_FILES+=usr/include/libusb20_compat01.h +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libusb20.so.1 +OLD_FILES+=usr/lib32/libusb20.a +OLD_FILES+=usr/lib32/libusb20.so +OLD_FILES+=usr/lib32/libusb20_p.a +.endif # 20090226: libmp(3) functions renamed OLD_LIBS+=usr/lib/libmp.so.6 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libmp.so.6 +.endif # 20090223: changeover of USB stacks OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h @@ -1436,6 +1479,8 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040713: fla(4) removed. +OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX OLD_FILES+=usr/sbin/kernbb OLD_FILES+=usr/sbin/ntp-genkeys Modified: projects/mips/UPDATING ============================================================================== --- projects/mips/UPDATING Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/UPDATING Mon Apr 13 03:08:11 2009 (r190984) @@ -22,6 +22,71 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090408: + Do not use Giant for kbdmux(4) locking. This is wrong and + apparently causing more problems than it solves. This will + re-open the issue where interrupt handlers may race with + kbdmux(4) in polling mode. Typical symptoms include (but + not limited to) duplicated and/or missing characters when + low level console functions (such as gets) are used while + interrupts are enabled (for example geli password prompt, + mountroot prompt etc.). Disabling kbdmux(4) may help. + +20090407: + The size of structs vnet_net, vnet_inet and vnet_ipfw has changed; + kernel modules referencing any of the above need to be recompiled. + Bump __FreeBSD_version to 800075. + +20090320: + GEOM_PART has become the default partition slicer for storage devices, + replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It + introduces some changes: + + MSDOS/EBR: the devices created from MSDOS extended partition entries + (EBR) can be named differently than with GEOM_MBR and are now symlinks + to devices with offset-based names. fstabs may need to be modified. + + BSD: the "geometry does not match label" warning is harmless in most + cases but it points to problems in file system misalignment with + disk geometry. The "c" partition is now implicit, covers the whole + top-level drive and cannot be (mis)used by users. + + General: Kernel dumps are now not allowed to be written to devices + whose partition types indicate they are meant to be used for file + systems (or, in case of MSDOS partitions, as something else than + the "386BSD" type). + + Most of these changes date approximately from 200812. + +20090319: + The uscanner(4) driver has been removed from the kernel. This follows + Linux removing theirs in 2.6 and making libusb the default interface + (supported by sane). + +20090319: + The multicast forwarding code has been cleaned up. netstat(1) + only relies on KVM now for printing bandwidth upcall meters. + The IPv4 and IPv6 modules are split into ip_mroute_mod and + ip6_mroute_mod respectively. The config(5) options for statically + compiling this code remain the same, i.e. 'options MROUTING'. + +20090315: + Support for the IFF_NEEDSGIANT network interface flag has been + removed, which means that non-MPSAFE network device drivers are no + longer supported. In particular, if_ar, if_sr, and network device + drivers from the old (legacy) USB stack can no longer be built or + used. + +20090313: + POSIX.1 Native Language Support (NLS) has been enabled in libc and + a bunch of new language catalog files have also been added. + This means that some common libc messages are now localized and + they depend on the LC_MESSAGES environmental variable. + +20090313: + The k8temp(4) driver has been renamed to amdtemp(4) since + support for K10 and K11 CPU families was added. + 20090309: IGMPv3 and Source-Specific Multicast (SSM) have been merged to the IPv4 stack. VIMAGE hooks are in but not yet used. Modified: projects/mips/bin/cat/Makefile ============================================================================== --- projects/mips/bin/cat/Makefile Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/bin/cat/Makefile Mon Apr 13 03:08:11 2009 (r190984) @@ -2,5 +2,6 @@ # $FreeBSD$ PROG= cat +WARNS?= 6 .include Modified: projects/mips/bin/sh/alias.c ============================================================================== --- projects/mips/bin/sh/alias.c Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/bin/sh/alias.c Mon Apr 13 03:08:11 2009 (r190984) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #define ATABSIZE 39 STATIC struct alias *atab[ATABSIZE]; +STATIC int aliases; STATIC void setalias(char *, char *); STATIC int unalias(const char *); @@ -106,6 +107,7 @@ setalias(char *name, char *val) ap->flag = 0; ap->next = *app; *app = ap; + aliases++; INTON; } @@ -135,6 +137,7 @@ unalias(const char *name) ckfree(ap); INTON; } + aliases--; return (0); } } @@ -168,6 +171,7 @@ rmaliases(void) ckfree(tmp); } } + aliases = 0; INTON; } @@ -187,9 +191,47 @@ lookupalias(char *name, int check) return (NULL); } -/* - * TODO - sort output - */ +static int +comparealiases(const void *p1, const void *p2) +{ + const struct alias *const *a1 = p1; + const struct alias *const *a2 = p2; + + return strcmp((*a1)->name, (*a2)->name); +} + +static void +printalias(const struct alias *a) +{ + char *p; + + out1fmt("%s=", a->name); + /* Don't print the space added above. */ + p = a->val + strlen(a->val) - 1; + *p = '\0'; + out1qstr(a->val); + *p = ' '; + out1c('\n'); +} + +static void +printaliases(void) +{ + int i, j; + struct alias **sorted, *ap; + + sorted = ckmalloc(aliases * sizeof(*sorted)); + j = 0; + for (i = 0; i < ATABSIZE; i++) + for (ap = atab[i]; ap; ap = ap->next) + if (*ap->name != '\0') + sorted[j++] = ap; + qsort(sorted, aliases, sizeof(*sorted), comparealiases); + for (i = 0; i < aliases; i++) + printalias(sorted[i]); + ckfree(sorted); +} + int aliascmd(int argc, char **argv) { @@ -198,16 +240,7 @@ aliascmd(int argc, char **argv) struct alias *ap; if (argc == 1) { - int i; - - for (i = 0; i < ATABSIZE; i++) - for (ap = atab[i]; ap; ap = ap->next) { - if (*ap->name != '\0') { - out1fmt("alias %s=", ap->name); - out1qstr(ap->val); - out1c('\n'); - } - } + printaliases(); return (0); } while ((n = *++argv) != NULL) { @@ -215,11 +248,8 @@ aliascmd(int argc, char **argv) if ((ap = lookupalias(n, 0)) == NULL) { outfmt(out2, "alias: %s not found\n", n); ret = 1; - } else { - out1fmt("alias %s=", n); - out1qstr(ap->val); - out1c('\n'); - } + } else + printalias(ap); else { *v++ = '\0'; setalias(n, v); Modified: projects/mips/bin/sh/eval.c ============================================================================== --- projects/mips/bin/sh/eval.c Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/bin/sh/eval.c Mon Apr 13 03:08:11 2009 (r190984) @@ -166,7 +166,8 @@ evalstring(char *s) setstackmark(&smark); setinputstring(s, 1); while ((n = parsecmd(0)) != NEOF) { - evaltree(n, 0); + if (n != NULL) + evaltree(n, 0); popstackmark(&smark); } popfile(); Modified: projects/mips/bin/sh/miscbltin.c ============================================================================== --- projects/mips/bin/sh/miscbltin.c Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/bin/sh/miscbltin.c Mon Apr 13 03:08:11 2009 (r190984) @@ -73,6 +73,16 @@ int ulimitcmd(int, char **); * ordinary characters. * * This uses unbuffered input, which may be avoidable in some cases. + * + * Note that if IFS=' :' then read x y should work so that: + * 'a b' x='a', y='b' + * ' a b ' x='a', y='b' + * ':b' x='', y='b' + * ':' x='', y='' + * '::' x='', y='' + * ': :' x='', y='' + * ':::' x='', y='::' + * ':b c:' x='', y='b c:' */ int @@ -88,6 +98,8 @@ readcmd(int argc __unused, char **argv _ int startword; int status; int i; + int is_ifs; + int saveall = 0; struct timeval tv; char *tvptr; fd_set ifds; @@ -135,7 +147,7 @@ readcmd(int argc __unused, char **argv _ if (*(ap = argptr) == NULL) error("arg count"); if ((ifs = bltinlookup("IFS", 1)) == NULL) - ifs = nullstr; + ifs = " \t\n"; if (tv.tv_sec >= 0) { /* @@ -167,7 +179,7 @@ readcmd(int argc __unused, char **argv _ } status = 0; - startword = 1; + startword = 2; backslash = 0; STARTSTACKSTR(p); for (;;) { @@ -189,22 +201,68 @@ readcmd(int argc __unused, char **argv _ } if (c == '\n') break; - if (startword && *ifs == ' ' && strchr(ifs, c)) { + if (strchr(ifs, c)) + is_ifs = strchr(" \t\n", c) ? 1 : 2; + else + is_ifs = 0; + + if (startword != 0) { + if (is_ifs == 1) { + /* Ignore leading IFS whitespace */ + if (saveall) + STPUTC(c, p); + continue; + } + if (is_ifs == 2 && startword == 1) { + /* Only one non-whitespace IFS per word */ + startword = 2; + if (saveall) + STPUTC(c, p); + continue; + } + } + + if (is_ifs == 0) { + /* append this character to the current variable */ + startword = 0; + if (saveall) + /* Not just a spare terminator */ + saveall++; + STPUTC(c, p); continue; } - startword = 0; - if (ap[1] != NULL && strchr(ifs, c) != NULL) { - STACKSTRNUL(p); - setvar(*ap, stackblock(), 0); - ap++; - startword = 1; - STARTSTACKSTR(p); - } else { + + /* end of variable... */ + startword = is_ifs; + + if (ap[1] == NULL) { + /* Last variable needs all IFS chars */ + saveall++; STPUTC(c, p); + continue; } + + STACKSTRNUL(p); + setvar(*ap, stackblock(), 0); + ap++; + STARTSTACKSTR(p); } STACKSTRNUL(p); + + /* Remove trailing IFS chars */ + for (; stackblock() <= --p; *p = 0) { + if (!strchr(ifs, *p)) + break; + if (strchr(" \t\n", *p)) + /* Always remove whitespace */ + continue; + if (saveall > 1) + /* Don't remove non-whitespace unless it was naked */ + break; + } setvar(*ap, stackblock(), 0); + + /* Set any remaining args to "" */ while (*++ap != NULL) setvar(*ap, nullstr, 0); return status; Modified: projects/mips/cddl/Makefile.inc ============================================================================== --- projects/mips/cddl/Makefile.inc Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/cddl/Makefile.inc Mon Apr 13 03:08:11 2009 (r190984) @@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../. IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN + +CSTD?= gnu89 Modified: projects/mips/cddl/lib/libzpool/Makefile ============================================================================== --- projects/mips/cddl/lib/libzpool/Makefile Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/cddl/lib/libzpool/Makefile Mon Apr 13 03:08:11 2009 (r190984) @@ -33,8 +33,6 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -60,4 +58,6 @@ LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= +CSTD= c99 + .include Modified: projects/mips/cddl/usr.bin/ztest/Makefile ============================================================================== --- projects/mips/cddl/usr.bin/ztest/Makefile Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/cddl/usr.bin/ztest/Makefile Mon Apr 13 03:08:11 2009 (r190984) @@ -5,8 +5,6 @@ PROG= ztest NO_MAN= -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem @@ -21,4 +19,6 @@ DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} $ ${LIBPTHREAD} ${LIBZ} ${LIBAVL} LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl +CSTD= c99 + .include Modified: projects/mips/cddl/usr.sbin/zdb/Makefile ============================================================================== --- projects/mips/cddl/usr.sbin/zdb/Makefile Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/cddl/usr.sbin/zdb/Makefile Mon Apr 13 03:08:11 2009 (r190984) @@ -6,8 +6,6 @@ PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -25,4 +23,6 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LI ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool +CSTD= c99 + .include Modified: projects/mips/contrib/bind9/CHANGES ============================================================================== --- projects/mips/contrib/bind9/CHANGES Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/contrib/bind9/CHANGES Mon Apr 13 03:08:11 2009 (r190984) @@ -1,3 +1,8 @@ + --- 9.4.3-P2 released --- + +2579. [bug] DNSSEC lookaside validation failed to handle unknown + algorithms. [RT #19479] + --- 9.4.3-P1 released --- 2522. [security] Handle -1 from DSA_do_verify(). Modified: projects/mips/contrib/bind9/lib/dns/validator.c ============================================================================== --- projects/mips/contrib/bind9/lib/dns/validator.c Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/contrib/bind9/lib/dns/validator.c Mon Apr 13 03:08:11 2009 (r190984) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.119.18.41 2008/08/21 04:59:42 marka Exp $ */ +/* $Id: validator.c,v 1.119.18.41.2.1 2009/03/17 02:23:49 marka Exp $ */ /*! \file */ @@ -211,6 +211,37 @@ exit_check(dns_validator_t *val) { return (ISC_TRUE); } +/* + * Check that we have atleast one supported algorithm in the DLV RRset. + */ +static inline isc_boolean_t +dlv_algorithm_supported(dns_validator_t *val) { + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_dlv_t dlv; + isc_result_t result; + + for (result = dns_rdataset_first(&val->dlv); + result == ISC_R_SUCCESS; + result = dns_rdataset_next(&val->dlv)) { + dns_rdata_reset(&rdata); + dns_rdataset_current(&val->dlv, &rdata); + result = dns_rdata_tostruct(&rdata, &dlv, NULL); + RUNTIME_CHECK(result == ISC_R_SUCCESS); + + if (!dns_resolver_algorithm_supported(val->view->resolver, + val->event->name, + dlv.algorithm)) + continue; + + if (dlv.digest_type != DNS_DSDIGEST_SHA256 && + dlv.digest_type != DNS_DSDIGEST_SHA1) + continue; + + return (ISC_TRUE); + } + return (ISC_FALSE); +} + /*% * Look in the NSEC record returned from a DS query to see if there is * a NS RRset at this name. If it is found we are at a delegation point. @@ -2297,19 +2328,36 @@ dlvfetched(isc_task_t *task, isc_event_t sizeof(namebuf)); dns_rdataset_clone(&val->frdataset, &val->dlv); val->havedlvsep = ISC_TRUE; - validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf); - dlv_validator_start(val); + if (dlv_algorithm_supported(val)) { + validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", + namebuf); + dlv_validator_start(val); + } else { + validator_log(val, ISC_LOG_DEBUG(3), + "DLV %s found with no supported algorithms", + namebuf); + markanswer(val); + validator_done(val, ISC_R_SUCCESS); + } } else if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NXDOMAIN || eresult == DNS_R_NCACHENXRRSET || eresult == DNS_R_NCACHENXDOMAIN) { - result = finddlvsep(val, ISC_TRUE); + result = finddlvsep(val, ISC_TRUE); if (result == ISC_R_SUCCESS) { - dns_name_format(dns_fixedname_name(&val->dlvsep), - namebuf, sizeof(namebuf)); - validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", - namebuf); - dlv_validator_start(val); + if (dlv_algorithm_supported(val)) { + dns_name_format(dns_fixedname_name(&val->dlvsep), + namebuf, sizeof(namebuf)); + validator_log(val, ISC_LOG_DEBUG(3), + "DLV %s found", namebuf); + dlv_validator_start(val); + } else { + validator_log(val, ISC_LOG_DEBUG(3), + "DLV %s found with no supported " + "algorithms", namebuf); + markanswer(val); + validator_done(val, ISC_R_SUCCESS); + } } else if (result == ISC_R_NOTFOUND) { validator_log(val, ISC_LOG_DEBUG(3), "DLV not found"); markanswer(val); @@ -2372,9 +2420,16 @@ startfinddlvsep(dns_validator_t *val, dn } dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf, sizeof(namebuf)); - validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf); - dlv_validator_start(val); - return (DNS_R_WAIT); + if (dlv_algorithm_supported(val)) { + validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf); + dlv_validator_start(val); + return (DNS_R_WAIT); + } + validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found with no supported " + "algorithms", namebuf); + markanswer(val); + validator_done(val, ISC_R_SUCCESS); + return (ISC_R_SUCCESS); } /*% Modified: projects/mips/contrib/bind9/version ============================================================================== --- projects/mips/contrib/bind9/version Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/contrib/bind9/version Mon Apr 13 03:08:11 2009 (r190984) @@ -1,4 +1,4 @@ -# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $ +# $Id: version,v 1.29.134.23.2.2 2009/03/17 02:23:49 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=4 PATCHVER=3 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 Modified: projects/mips/contrib/csup/rcsfile.c ============================================================================== --- projects/mips/contrib/csup/rcsfile.c Mon Apr 13 03:04:12 2009 (r190983) +++ projects/mips/contrib/csup/rcsfile.c Mon Apr 13 03:08:11 2009 (r190984) @@ -140,7 +140,7 @@ static void rcsfile_insertsorteddelta( struct delta *); static struct stream *rcsfile_getdeltatext(struct rcsfile *, struct delta *, struct buf **); -static void rcsdelta_writestring(char *, size_t, struct stream *); +static int rcsdelta_writestring(char *, size_t, struct stream *); static void rcsdelta_insertbranch(struct delta *, struct branch *); /* Space formatting of RCS file. */ @@ -308,14 +308,19 @@ rcsfile_write(struct rcsfile *rf, struct /* First write head. */ d = LIST_FIRST(&rf->trunk->deltalist); - stream_printf(dest, "head%s%s;\n", head_space, d->revnum); + if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0) + return (-1); /* Write branch, if we have. */ - if (rf->branch != NULL) - stream_printf(dest, "branch%s%s;\n", branch_space, rf->branch); + if (rf->branch != NULL) { + if (stream_printf(dest, "branch%s%s;\n", branch_space, + rf->branch) < 0) + return (-1); + } /* Write access. */ - stream_printf(dest, "access"); + if (stream_printf(dest, "access") < 0) + return (-1); #if 0 if (!STAILQ_EMPTY(&rf->accesslist)) { /* @@ -324,32 +329,44 @@ rcsfile_write(struct rcsfile *rf, struct */ } #endif - stream_printf(dest, ";\n"); + if (stream_printf(dest, ";\n") < 0) + return (-1); /* Write out taglist. */ - stream_printf(dest, "symbols"); + if (stream_printf(dest, "symbols") < 0) + return (-1); if (!STAILQ_EMPTY(&rf->taglist)) { STAILQ_FOREACH(t, &rf->taglist, tag_next) { - stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, - t->revnum); + if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, + t->revnum) < 0) + return (-1); } } - stream_printf(dest, ";\n"); /* Write out locks and strict. */ - stream_printf(dest, "locks;"); - if (rf->strictlock) - stream_printf(dest, " strict;"); - stream_printf(dest, "\n"); + if (stream_printf(dest, ";\nlocks;") < 0) + return (-1); + if (rf->strictlock) { + if (stream_printf(dest, " strict;") < 0) + return (-1); + } + if (stream_printf(dest, "\n") < 0) + return (-1); /* Write out the comment. */ - if (rf->comment != NULL) - stream_printf(dest, "comment%s%s;\n", comment_space, rf->comment); - if (rf->expand != EXPAND_DEFAULT) - stream_printf(dest, "expand%s@%s@;\n", expand_space, - keyword_encode_expand(rf->expand)); + if (rf->comment != NULL) { + if (stream_printf(dest, "comment%s%s;\n", comment_space, + rf->comment) < 0) + return (-1); + } + if (rf->expand != EXPAND_DEFAULT) { + if (stream_printf(dest, "expand%s@%s@;\n", expand_space, + keyword_encode_expand(rf->expand)) < 0) + return (-1); + } - stream_printf(dest, "\n\n"); + if (stream_printf(dest, "\n\n") < 0) + return (-1); /* * Write out deltas. We use a stack where we push the appropriate deltas @@ -364,14 +381,18 @@ rcsfile_write(struct rcsfile *rf, struct /* Do not write out placeholders just to be safe. */ if (d->placeholder) continue; - stream_printf(dest, "%s\n", d->revnum); - stream_printf(dest, "date%s%s;%sauthor %s;%sstate", + if (stream_printf(dest, "%s\n", d->revnum) < 0) + return (-1); + if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate", date_space, d->revdate, auth_space, d->author, - state_space); - if (d->state != NULL) - stream_printf(dest, " %s", d->state); - stream_printf(dest, ";\n"); - stream_printf(dest, "branches"); + state_space) < 0) + return (-1); + if (d->state != NULL) { + if (stream_printf(dest, " %s", d->state) < 0) + return (-1); + } + if (stream_printf(dest, ";\nbranches") < 0) + return (-1); /* * Write out our branches. Add them to a reversed list for use * later when we write out the text. @@ -385,30 +406,36 @@ rcsfile_write(struct rcsfile *rf, struct /* Push branch heads on stack. */ STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) { - if (d_tmp == NULL) - err(1, "empty branch!"); - stream_printf(dest, "\n%s%s", branches_space, - d_tmp->revnum); + if (d_tmp == NULL) { + lprintf(2, "Empty branch!\n"); + return (-1); + } + if (stream_printf(dest, "\n%s%s", branches_space, + d_tmp->revnum) < 0) + return (-1); } - stream_printf(dest, ";\n"); - stream_printf(dest, "next%s", next_space); + if (stream_printf(dest, ";\nnext%s", next_space) < 0) + return (-1); /* Push next delta on stack. */ d_next = LIST_NEXT(d, delta_next); if (d_next != NULL) { - stream_printf(dest, "%s", d_next->revnum); + if (stream_printf(dest, "%s", d_next->revnum) < 0) + return (-1); STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next); } - stream_printf(dest, ";\n\n"); + if (stream_printf(dest, ";\n\n") < 0) + return (-1); } - stream_printf(dest, "\n"); /* Write out desc. */ - stream_printf(dest, "desc\n@@"); + if (stream_printf(dest, "\ndesc\n@@") < 0) + return (-1); d = LIST_FIRST(&rf->trunk->deltalist); /* Write out deltatexts. */ error = rcsfile_write_deltatext(rf, dest); - stream_printf(dest, "\n"); + if (stream_printf(dest, "\n") < 0) + return (-1); return (error); } @@ -438,21 +465,25 @@ rcsfile_write_deltatext(struct rcsfile * /* Do not write out placeholders just to be safe. */ if (d->placeholder) return (0); - stream_printf(dest, "\n\n\n%s\n", d->revnum); - stream_printf(dest, "log\n@"); + if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0) + return (-1); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Apr 13 13:41:44 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6EB0106566B; Mon, 13 Apr 2009 13:41:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3FD88FC12; Mon, 13 Apr 2009 13:41:44 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3DDfinL073209; Mon, 13 Apr 2009 13:41:44 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3DDfiYe073206; Mon, 13 Apr 2009 13:41:44 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200904131341.n3DDfiYe073206@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 13 Apr 2009 13:41:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190999 - in projects/tcp_cc_8.x/sys: conf netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2009 13:41:45 -0000 Author: lstewart Date: Mon Apr 13 13:41:44 2009 New Revision: 190999 URL: http://svn.freebsd.org/changeset/base/190999 Log: Carve the newreno CC module out of cc.c into a separate file for consistency. Compile it into the kernel by default as there's no need to create an actual module for it. Added: projects/tcp_cc_8.x/sys/netinet/cc_newreno.c (contents, props changed) Modified: projects/tcp_cc_8.x/sys/conf/files projects/tcp_cc_8.x/sys/netinet/cc.c Modified: projects/tcp_cc_8.x/sys/conf/files ============================================================================== --- projects/tcp_cc_8.x/sys/conf/files Mon Apr 13 13:07:51 2009 (r190998) +++ projects/tcp_cc_8.x/sys/conf/files Mon Apr 13 13:41:44 2009 (r190999) @@ -2340,6 +2340,7 @@ netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet netinet/cc.c optional inet +netinet/cc_newreno.c optional inet netinet/sctp_asconf.c optional inet sctp netinet/sctp_auth.c optional inet sctp netinet/sctp_bsd_addr.c optional inet sctp Modified: projects/tcp_cc_8.x/sys/netinet/cc.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc.c Mon Apr 13 13:07:51 2009 (r190998) +++ projects/tcp_cc_8.x/sys/netinet/cc.c Mon Apr 13 13:41:44 2009 (r190999) @@ -1,13 +1,12 @@ /*- - * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995 - * The Regents of the University of California. - * Copyright (c) 2008 Swinburne University of Technology, Melbourne, Australia + * Copyright (c) 2007-2009 + * Swinburne University of Technology, Melbourne, Australia * All rights reserved. * - * The majority of this software was developed at the Centre for - * Advanced Internet Architectures, Swinburne University, by Lawrence Stewart - * and James Healy, made possible in part by a grant from the Cisco University - * Research Program Fund at Community Foundation Silicon Valley. + * This software was developed at the Centre for Advanced Internet + * Architectures, Swinburne University, by Lawrence Stewart and James Healy, + * made possible in part by a grant from the Cisco University Research Program + * Fund at Community Foundation Silicon Valley. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -51,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include /* list of available cc algorithms on the current system */ @@ -59,19 +57,6 @@ struct cc_head cc_list = STAILQ_HEAD_INI struct rwlock cc_list_lock; -/* create a struct to point to our newreno functions */ -struct cc_algo newreno_cc_algo = { - .name = "newreno", - .init = newreno_init, - .deinit = NULL, - .cwnd_init = newreno_cwnd_init, - .ack_received = newreno_ack_received, - .pre_fr = newreno_pre_fr, - .post_fr = newreno_post_fr, - .after_idle = newreno_after_idle, - .after_timeout = newreno_after_timeout -}; - /* the system wide default cc algorithm */ char cc_algorithm[TCP_CA_NAME_MAX]; @@ -238,210 +223,6 @@ cc_register_algorithm(struct cc_algo *ad return 1; } -/* - * NEW RENO - */ - -int -newreno_init(struct tcpcb *tp) -{ - return 0; -} - -/* - * update ssthresh to approx 1/2 of cwnd - */ -void -newreno_ssthresh_update(struct tcpcb *tp) -{ - u_int win; - - /* reset ssthresh */ - win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg; - - if (win < 2) - win = 2; - - tp->snd_ssthresh = win * tp->t_maxseg; -} - -/* - * initial cwnd at the start of a connection - * if there is a hostcache entry for the foreign host, base cwnd on that - * if rfc3390 is enabled, set cwnd to approx 4 MSS as recommended - * otherwise use the sysctl variables configured by the administrator - */ -void -newreno_cwnd_init(struct tcpcb *tp) -{ - struct hc_metrics_lite metrics; - struct inpcb *inp = tp->t_inpcb; - struct socket *so = inp->inp_socket; - - /* - * Set the slow-start flight size depending on whether this - * is a local network or not. - * - * Extend this so we cache the cwnd too and retrieve it here. - * Make cwnd even bigger than RFC3390 suggests but only if we - * have previous experience with the remote host. Be careful - * not make cwnd bigger than remote receive window or our own - * send socket buffer. Maybe put some additional upper bound - * on the retrieved cwnd. Should do incremental updates to - * hostcache when cwnd collapses so next connection doesn't - * overloads the path again. - * - * RFC3390 says only do this if SYN or SYN/ACK didn't got lost. - * We currently check only in syncache_socket for that. - */ - - tcp_hc_get(&inp->inp_inc, &metrics); - -#define TCP_METRICS_CWND -#ifdef TCP_METRICS_CWND - if (metrics.rmx_cwnd) - tp->snd_cwnd = max(tp->t_maxseg, - min(metrics.rmx_cwnd / 2, - min(tp->snd_wnd, so->so_snd.sb_hiwat))); - else -#endif - if (V_tcp_do_rfc3390) - tp->snd_cwnd = min(4 * tp->t_maxseg, max(2 * tp->t_maxseg, 4380)); -#ifdef INET6 - else if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) || - (!isipv6 && in_localaddr(inp->inp_faddr))) -#else - else if (in_localaddr(inp->inp_faddr)) -#endif - tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; - else - tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz; -} - -/* - * increase cwnd on receipt of a successful ACK - * if cwnd <= ssthresh, increases by 1 MSS per ACK - * if cwnd > ssthresh, increase by ~1 MSS per RTT - */ -void -newreno_ack_received(struct tcpcb *tp, struct tcphdr *th) -{ - u_int cw = tp->snd_cwnd; - u_int incr = tp->t_maxseg; - - /* - * If cwnd <= ssthresh, open exponentially (maxseg per packet). - * Otherwise, open linearly (approx. maxseg per RTT - * i.e. maxseg^2 / cwnd per ACK received). - * If cwnd > maxseg^2, fix the cwnd increment at 1 byte - * to avoid capping cwnd (as suggested in RFC2581). - */ - if (cw > tp->snd_ssthresh) - incr = max((incr * incr / cw), 1); - - tp->snd_cwnd = min(cw+incr, TCP_MAXWIN<snd_scale); -} - -/* - * update the value of ssthresh before entering FR - */ -void -newreno_pre_fr(struct tcpcb *tp, struct tcphdr *th) -{ - newreno_ssthresh_update(tp); -} - -/* - * decrease the cwnd in response to packet loss or a transmit timeout. - * th can be null, in which case cwnd will be set according to reno instead - * of new reno. - */ -void -newreno_post_fr(struct tcpcb *tp, struct tcphdr *th) -{ - /* - * Out of fast recovery. - * Window inflation should have left us - * with approximately snd_ssthresh - * outstanding data. - * But in case we would be inclined to - * send a burst, better to do it via - * the slow start mechanism. - */ - if (th && SEQ_GT(th->th_ack + tp->snd_ssthresh, tp->snd_max)) - tp->snd_cwnd = tp->snd_max - th->th_ack + tp->t_maxseg; - else - tp->snd_cwnd = tp->snd_ssthresh; -} - -/* - * if a connection has been idle for a while and more data is ready to be sent, - * reset cwnd - */ -void -newreno_after_idle(struct tcpcb *tp) -{ - /* - * We have been idle for "a while" and no acks are - * expected to clock out any data we send -- - * slow start to get ack "clock" running again. - * - * Set the slow-start flight size depending on whether - * this is a local network or not. - * - * Set the slow-start flight size depending on whether - * this is a local network or not. - */ - int ss = V_ss_fltsz; - -#ifdef INET6 - if (isipv6) { - if (in6_localaddr(&tp->t_inpcb->in6p_faddr)) - ss = V_ss_fltsz_local; - } else -#endif /* INET6 */ - - if (in_localaddr(tp->t_inpcb->inp_faddr)) - ss = V_ss_fltsz_local; - - tp->snd_cwnd = tp->t_maxseg * ss; -} - -/* - * reset the cwnd after a transmission timeout. - */ -void -newreno_after_timeout(struct tcpcb *tp) -{ - newreno_ssthresh_update(tp); - - /* - * Close the congestion window down to one segment - * (we'll open it by one segment for each ack we get). - * Since we probably have a window's worth of unacked - * data accumulated, this "slow start" keeps us from - * dumping all that data as back-to-back packets (which - * might overwhelm an intermediate gateway). - * - * There are two phases to the opening: Initially we - * open by one mss on each ack. This makes the window - * size increase exponentially with time. If the - * window is larger than the path can handle, this - * exponential growth results in dropped packet(s) - * almost immediately. To get more time between - * drops but still "push" the network to take advantage - * of improving conditions, we switch from exponential - * to linear window opening at some threshhold size. - * For a threshhold, we use half the current window - * size, truncated to a multiple of the mss. - * - * (the minimum cwnd that will give us exponential - * growth is 2 mss. We don't allow the threshhold - * to go below this.) - */ - tp->snd_cwnd = tp->t_maxseg; -} - SYSCTL_NODE(_net_inet_tcp, OID_AUTO, cc, CTLFLAG_RW, NULL, "congestion control related settings"); @@ -452,3 +233,4 @@ SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, available, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, cc_list_available, "A", "list available congestion control algorithms"); + Added: projects/tcp_cc_8.x/sys/netinet/cc_newreno.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/tcp_cc_8.x/sys/netinet/cc_newreno.c Mon Apr 13 13:41:44 2009 (r190999) @@ -0,0 +1,257 @@ +/*- + * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995 + * The Regents of the University of California. + * Copyright (c) 2007-2009 + * Swinburne University of Technology, Melbourne, Australia + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +/* newreno cc function pointers */ +struct cc_algo newreno_cc_algo = { + .name = "newreno", + .init = newreno_init, + .deinit = NULL, + .cwnd_init = newreno_cwnd_init, + .ack_received = newreno_ack_received, + .pre_fr = newreno_pre_fr, + .post_fr = newreno_post_fr, + .after_idle = newreno_after_idle, + .after_timeout = newreno_after_timeout +}; + +int +newreno_init(struct tcpcb *tp) +{ + return 0; +} + +/* + * update ssthresh to approx 1/2 of cwnd + */ +void +newreno_ssthresh_update(struct tcpcb *tp) +{ + u_int win; + + /* reset ssthresh */ + win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg; + + if (win < 2) + win = 2; + + tp->snd_ssthresh = win * tp->t_maxseg; +} + +/* + * initial cwnd at the start of a connection + * if there is a hostcache entry for the foreign host, base cwnd on that + * if rfc3390 is enabled, set cwnd to approx 4 MSS as recommended + * otherwise use the sysctl variables configured by the administrator + */ +void +newreno_cwnd_init(struct tcpcb *tp) +{ + struct hc_metrics_lite metrics; + struct inpcb *inp = tp->t_inpcb; + struct socket *so = inp->inp_socket; + + /* + * Set the slow-start flight size depending on whether this + * is a local network or not. + * + * Extend this so we cache the cwnd too and retrieve it here. + * Make cwnd even bigger than RFC3390 suggests but only if we + * have previous experience with the remote host. Be careful + * not make cwnd bigger than remote receive window or our own + * send socket buffer. Maybe put some additional upper bound + * on the retrieved cwnd. Should do incremental updates to + * hostcache when cwnd collapses so next connection doesn't + * overloads the path again. + * + * RFC3390 says only do this if SYN or SYN/ACK didn't got lost. + * We currently check only in syncache_socket for that. + */ + + tcp_hc_get(&inp->inp_inc, &metrics); + +#define TCP_METRICS_CWND +#ifdef TCP_METRICS_CWND + if (metrics.rmx_cwnd) + tp->snd_cwnd = max(tp->t_maxseg, + min(metrics.rmx_cwnd / 2, + min(tp->snd_wnd, so->so_snd.sb_hiwat))); + else +#endif + if (V_tcp_do_rfc3390) + tp->snd_cwnd = min(4 * tp->t_maxseg, max(2 * tp->t_maxseg, 4380)); +#ifdef INET6 + else if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) || + (!isipv6 && in_localaddr(inp->inp_faddr))) +#else + else if (in_localaddr(inp->inp_faddr)) +#endif + tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; + else + tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz; +} + +/* + * increase cwnd on receipt of a successful ACK + * if cwnd <= ssthresh, increases by 1 MSS per ACK + * if cwnd > ssthresh, increase by ~1 MSS per RTT + */ +void +newreno_ack_received(struct tcpcb *tp, struct tcphdr *th) +{ + u_int cw = tp->snd_cwnd; + u_int incr = tp->t_maxseg; + + /* + * If cwnd <= ssthresh, open exponentially (maxseg per packet). + * Otherwise, open linearly (approx. maxseg per RTT + * i.e. maxseg^2 / cwnd per ACK received). + * If cwnd > maxseg^2, fix the cwnd increment at 1 byte + * to avoid capping cwnd (as suggested in RFC2581). + */ + if (cw > tp->snd_ssthresh) + incr = max((incr * incr / cw), 1); + + tp->snd_cwnd = min(cw+incr, TCP_MAXWIN<snd_scale); +} + +/* + * update the value of ssthresh before entering FR + */ +void +newreno_pre_fr(struct tcpcb *tp, struct tcphdr *th) +{ + newreno_ssthresh_update(tp); +} + +/* + * decrease the cwnd in response to packet loss or a transmit timeout. + * th can be null, in which case cwnd will be set according to reno instead + * of new reno. + */ +void +newreno_post_fr(struct tcpcb *tp, struct tcphdr *th) +{ + /* + * Out of fast recovery. + * Window inflation should have left us + * with approximately snd_ssthresh + * outstanding data. + * But in case we would be inclined to + * send a burst, better to do it via + * the slow start mechanism. + */ + if (th && SEQ_GT(th->th_ack + tp->snd_ssthresh, tp->snd_max)) + tp->snd_cwnd = tp->snd_max - th->th_ack + tp->t_maxseg; + else + tp->snd_cwnd = tp->snd_ssthresh; +} + +/* + * if a connection has been idle for a while and more data is ready to be sent, + * reset cwnd + */ +void +newreno_after_idle(struct tcpcb *tp) +{ + /* + * We have been idle for "a while" and no acks are + * expected to clock out any data we send -- + * slow start to get ack "clock" running again. + * + * Set the slow-start flight size depending on whether + * this is a local network or not. + * + * Set the slow-start flight size depending on whether + * this is a local network or not. + */ + int ss = V_ss_fltsz; + +#ifdef INET6 + if (isipv6) { + if (in6_localaddr(&tp->t_inpcb->in6p_faddr)) + ss = V_ss_fltsz_local; + } else +#endif /* INET6 */ + + if (in_localaddr(tp->t_inpcb->inp_faddr)) + ss = V_ss_fltsz_local; + + tp->snd_cwnd = tp->t_maxseg * ss; +} + +/* + * reset the cwnd after a transmission timeout. + */ +void +newreno_after_timeout(struct tcpcb *tp) +{ + newreno_ssthresh_update(tp); + + /* + * Close the congestion window down to one segment + * (we'll open it by one segment for each ack we get). + * Since we probably have a window's worth of unacked + * data accumulated, this "slow start" keeps us from + * dumping all that data as back-to-back packets (which + * might overwhelm an intermediate gateway). + * + * There are two phases to the opening: Initially we + * open by one mss on each ack. This makes the window + * size increase exponentially with time. If the + * window is larger than the path can handle, this + * exponential growth results in dropped packet(s) + * almost immediately. To get more time between + * drops but still "push" the network to take advantage + * of improving conditions, we switch from exponential + * to linear window opening at some threshhold size. + * For a threshhold, we use half the current window + * size, truncated to a multiple of the mss. + * + * (the minimum cwnd that will give us exponential + * growth is 2 mss. We don't allow the threshhold + * to go below this.) + */ + tp->snd_cwnd = tp->t_maxseg; +} + From owner-svn-src-projects@FreeBSD.ORG Tue Apr 14 13:43:12 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 317AB106566B; Tue, 14 Apr 2009 13:43:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 17C758FC0A; Tue, 14 Apr 2009 13:43:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EDhBEK007335; Tue, 14 Apr 2009 13:43:11 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EDhAEO007311; Tue, 14 Apr 2009 13:43:10 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904141343.n3EDhAEO007311@svn.freebsd.org> From: Rui Paulo Date: Tue, 14 Apr 2009 13:43:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191059 - in projects/mesh11s: . bin/ls bin/sh contrib/gdb contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/pcap contrib/tcpdump include lib/libarchive lib/libarchive/test lib/li... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 13:43:13 -0000 Author: rpaulo Date: Tue Apr 14 13:43:09 2009 New Revision: 191059 URL: http://svn.freebsd.org/changeset/base/191059 Log: MFH Added: projects/mesh11s/lib/libarchive/archive_read_disk.3 - copied unchanged from r191056, head/lib/libarchive/archive_read_disk.3 projects/mesh11s/share/man/man4/uath.4 - copied unchanged from r191056, head/share/man/man4/uath.4 projects/mesh11s/sys/contrib/dev/uath/ - copied from r191056, head/sys/contrib/dev/uath/ projects/mesh11s/sys/dev/ixgbe/ixgbe_82599.c - copied unchanged from r191056, head/sys/dev/ixgbe/ixgbe_82599.c projects/mesh11s/sys/dev/usb/wlan/if_uath.c - copied unchanged from r191056, head/sys/dev/usb/wlan/if_uath.c projects/mesh11s/sys/dev/usb/wlan/if_uathreg.h - copied unchanged from r191056, head/sys/dev/usb/wlan/if_uathreg.h projects/mesh11s/sys/dev/usb/wlan/if_uathvar.h - copied unchanged from r191056, head/sys/dev/usb/wlan/if_uathvar.h projects/mesh11s/sys/modules/nfssvc/ - copied from r191056, head/sys/modules/nfssvc/ projects/mesh11s/sys/modules/usb/uath/ - copied from r191056, head/sys/modules/usb/uath/ projects/mesh11s/sys/nfs/nfs_nfssvc.c - copied unchanged from r191056, head/sys/nfs/nfs_nfssvc.c projects/mesh11s/sys/nfs/nfssvc.h - copied unchanged from r191056, head/sys/nfs/nfssvc.h projects/mesh11s/sys/powerpc/aim/mmu_oea64.c - copied unchanged from r191056, head/sys/powerpc/aim/mmu_oea64.c projects/mesh11s/sys/powerpc/include/sysarch.h - copied unchanged from r191056, head/sys/powerpc/include/sysarch.h projects/mesh11s/sys/powerpc/ofw/ofw_real.c - copied unchanged from r191056, head/sys/powerpc/ofw/ofw_real.c projects/mesh11s/sys/powerpc/powermac/cpcht.c - copied unchanged from r191056, head/sys/powerpc/powermac/cpcht.c projects/mesh11s/sys/powerpc/powermac/cpchtvar.h - copied unchanged from r191056, head/sys/powerpc/powermac/cpchtvar.h projects/mesh11s/sys/powerpc/powerpc/dump_machdep.c - copied unchanged from r191056, head/sys/powerpc/powerpc/dump_machdep.c projects/mesh11s/sys/powerpc/powerpc/uio_machdep.c - copied unchanged from r191056, head/sys/powerpc/powerpc/uio_machdep.c projects/mesh11s/tools/regression/bin/sh/parser/ - copied from r191056, head/tools/regression/bin/sh/parser/ projects/mesh11s/usr.sbin/uathload/ - copied from r191056, head/usr.sbin/uathload/ Deleted: projects/mesh11s/lib/libc/gen/dlfunc.c projects/mesh11s/sbin/slattach/ projects/mesh11s/sbin/startslip/ projects/mesh11s/share/man/man4/ppp.4 projects/mesh11s/share/man/man4/sl.4 projects/mesh11s/share/man/man9/VOP_LEASE.9 projects/mesh11s/sys/dev/usb/usb_sw_transfer.c projects/mesh11s/sys/dev/usb/usb_sw_transfer.h projects/mesh11s/sys/net/bsd_comp.c projects/mesh11s/sys/net/if_ppp.c projects/mesh11s/sys/net/if_ppp.h projects/mesh11s/sys/net/if_pppvar.h projects/mesh11s/sys/net/if_sl.c projects/mesh11s/sys/net/if_slvar.h projects/mesh11s/sys/net/ppp_comp.h projects/mesh11s/sys/net/ppp_deflate.c projects/mesh11s/sys/net/ppp_tty.c projects/mesh11s/sys/net/slip.h projects/mesh11s/sys/powerpc/aim/uio_machdep.c projects/mesh11s/sys/powerpc/booke/uio_machdep.c projects/mesh11s/tools/build/options/WITHOUT_SLIP projects/mesh11s/usr.sbin/pppd/ projects/mesh11s/usr.sbin/pppstats/ projects/mesh11s/usr.sbin/sliplogin/ projects/mesh11s/usr.sbin/slstat/ Modified: projects/mesh11s/ (props changed) projects/mesh11s/Makefile.inc1 projects/mesh11s/ObsoleteFiles.inc projects/mesh11s/UPDATING projects/mesh11s/bin/ls/ls.1 projects/mesh11s/bin/sh/eval.c projects/mesh11s/bin/sh/parser.c projects/mesh11s/contrib/gdb/ (props changed) projects/mesh11s/contrib/gdb/FREEBSD-Xlist projects/mesh11s/contrib/libpcap/ (props changed) projects/mesh11s/contrib/libpcap/bpf/net/bpf_filter.c projects/mesh11s/contrib/libpcap/bpf_dump.c projects/mesh11s/contrib/libpcap/bpf_image.c projects/mesh11s/contrib/libpcap/pcap/bpf.h projects/mesh11s/contrib/libpcap/pcap/pcap.h projects/mesh11s/contrib/tcpdump/ (props changed) projects/mesh11s/include/signal.h projects/mesh11s/lib/libarchive/Makefile projects/mesh11s/lib/libarchive/archive.h projects/mesh11s/lib/libarchive/archive_check_magic.c projects/mesh11s/lib/libarchive/archive_entry.c projects/mesh11s/lib/libarchive/archive_entry.h projects/mesh11s/lib/libarchive/archive_read_disk_set_standard_lookup.c projects/mesh11s/lib/libarchive/archive_read_support_compression_program.c projects/mesh11s/lib/libarchive/archive_read_support_format_empty.c projects/mesh11s/lib/libarchive/archive_string.c projects/mesh11s/lib/libarchive/archive_string.h projects/mesh11s/lib/libarchive/archive_write_disk.c projects/mesh11s/lib/libarchive/archive_write_disk_set_standard_lookup.c projects/mesh11s/lib/libarchive/archive_write_set_compression_program.c projects/mesh11s/lib/libarchive/archive_write_set_format_mtree.c projects/mesh11s/lib/libarchive/config_freebsd.h projects/mesh11s/lib/libarchive/test/main.c projects/mesh11s/lib/libarchive/test/test.h projects/mesh11s/lib/libarchive/test/test_read_compress_program.c projects/mesh11s/lib/libarchive/test/test_read_disk.c projects/mesh11s/lib/libarchive/test/test_read_extract.c projects/mesh11s/lib/libarchive/test/test_tar_large.c projects/mesh11s/lib/libarchive/test/test_write_disk.c projects/mesh11s/lib/libarchive/test/test_write_disk_failures.c projects/mesh11s/lib/libarchive/test/test_write_disk_hardlink.c projects/mesh11s/lib/libarchive/test/test_write_disk_perms.c projects/mesh11s/lib/libarchive/test/test_write_disk_secure.c projects/mesh11s/lib/libc/gen/Makefile.inc projects/mesh11s/lib/libc/gen/dlfcn.c projects/mesh11s/lib/libc/rpc/clnt_bcast.c projects/mesh11s/lib/libc/stdio/getdelim.c projects/mesh11s/lib/libc/stdio/getline.3 projects/mesh11s/lib/libc/string/memchr.3 projects/mesh11s/lib/libc/string/memcmp.3 projects/mesh11s/lib/libc/string/memcpy.3 projects/mesh11s/lib/libc/string/memmove.3 projects/mesh11s/lib/libc/string/memset.3 projects/mesh11s/lib/libc/string/strcasecmp.3 projects/mesh11s/lib/libc/string/strcat.3 projects/mesh11s/lib/libc/string/strchr.3 projects/mesh11s/lib/libc/string/strcmp.3 projects/mesh11s/lib/libc/string/strcpy.3 projects/mesh11s/lib/libc/string/strdup.3 projects/mesh11s/lib/libc/string/strlcpy.3 projects/mesh11s/lib/libc/string/strlen.3 projects/mesh11s/lib/libc/string/strmode.3 projects/mesh11s/lib/libc/string/strmode.c projects/mesh11s/lib/libc/string/strpbrk.3 projects/mesh11s/lib/libc/string/strspn.3 projects/mesh11s/lib/libc/string/strstr.3 projects/mesh11s/lib/libc/sys/sctp_generic_recvmsg.2 projects/mesh11s/lib/libc/sys/sctp_generic_sendmsg.2 projects/mesh11s/lib/libc/sys/sctp_peeloff.2 projects/mesh11s/lib/libkvm/kvm_powerpc.c projects/mesh11s/lib/libusb/ (props changed) projects/mesh11s/lib/libusb/libusb.3 (contents, props changed) projects/mesh11s/libexec/ftpd/extern.h projects/mesh11s/libexec/ftpd/ftpcmd.y projects/mesh11s/libexec/ftpd/ftpd.c projects/mesh11s/libexec/rtld-elf/Symbol.map projects/mesh11s/libexec/rtld-elf/map_object.c projects/mesh11s/libexec/rtld-elf/rtld.c projects/mesh11s/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/mesh11s/release/picobsd/bridge/PICOBSD projects/mesh11s/release/picobsd/mfs_tree/etc/rc projects/mesh11s/rescue/rescue/Makefile projects/mesh11s/sbin/Makefile projects/mesh11s/sbin/gvinum/gvinum.8 projects/mesh11s/sbin/gvinum/gvinum.c projects/mesh11s/sbin/ipfw/ (props changed) projects/mesh11s/sbin/ipfw/dummynet.c projects/mesh11s/sbin/ipfw/ipfw.8 projects/mesh11s/sbin/ipfw/ipfw2.h projects/mesh11s/sbin/newfs_msdos/newfs_msdos.8 projects/mesh11s/sbin/newfs_msdos/newfs_msdos.c projects/mesh11s/sbin/route/route.c projects/mesh11s/sbin/routed/Makefile projects/mesh11s/sbin/routed/defs.h projects/mesh11s/sbin/routed/if.c projects/mesh11s/sbin/routed/input.c projects/mesh11s/sbin/routed/main.c projects/mesh11s/sbin/routed/output.c projects/mesh11s/sbin/routed/parms.c projects/mesh11s/sbin/routed/radix.c projects/mesh11s/sbin/routed/radix.h projects/mesh11s/sbin/routed/rdisc.c projects/mesh11s/sbin/routed/table.c projects/mesh11s/sbin/routed/trace.c projects/mesh11s/share/man/man4/Makefile projects/mesh11s/share/man/man4/bce.4 projects/mesh11s/share/man/man4/ed.4 projects/mesh11s/share/man/man4/man4.powerpc/pmu.4 projects/mesh11s/share/man/man4/textdump.4 projects/mesh11s/share/man/man4/wpi.4 projects/mesh11s/share/man/man5/src.conf.5 projects/mesh11s/share/man/man7/operator.7 projects/mesh11s/share/man/man9/Makefile projects/mesh11s/share/man/man9/acl.9 projects/mesh11s/share/man/man9/vm_map_lock.9 projects/mesh11s/share/misc/committers-ports.dot projects/mesh11s/share/misc/operator projects/mesh11s/share/mk/bsd.cpu.mk projects/mesh11s/share/mk/bsd.own.mk projects/mesh11s/share/timedef/Makefile projects/mesh11s/share/zoneinfo/ (props changed) projects/mesh11s/share/zoneinfo/asia projects/mesh11s/sys/ (props changed) projects/mesh11s/sys/amd64/amd64/busdma_machdep.c projects/mesh11s/sys/amd64/amd64/elf_machdep.c projects/mesh11s/sys/amd64/amd64/machdep.c projects/mesh11s/sys/amd64/conf/GENERIC projects/mesh11s/sys/amd64/include/cpufunc.h projects/mesh11s/sys/amd64/include/endian.h projects/mesh11s/sys/amd64/include/xen/ (props changed) projects/mesh11s/sys/amd64/linux32/linux32_sysvec.c projects/mesh11s/sys/arm/arm/busdma_machdep.c projects/mesh11s/sys/arm/arm/elf_machdep.c projects/mesh11s/sys/arm/arm/trap.c projects/mesh11s/sys/arm/at91/files.at91 projects/mesh11s/sys/arm/include/vmparam.h projects/mesh11s/sys/boot/forth/loader.conf projects/mesh11s/sys/boot/i386/libi386/Makefile projects/mesh11s/sys/boot/i386/libi386/smbios.c projects/mesh11s/sys/boot/sparc64/loader/main.c projects/mesh11s/sys/cddl/compat/opensolaris/sys/vnode.h projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mesh11s/sys/cddl/dev/dtnfsclient/ (props changed) projects/mesh11s/sys/compat/ia32/ia32_sysvec.c projects/mesh11s/sys/compat/ndis/subr_usbd.c projects/mesh11s/sys/conf/NOTES projects/mesh11s/sys/conf/files projects/mesh11s/sys/conf/files.powerpc projects/mesh11s/sys/contrib/pf/net/pf.c projects/mesh11s/sys/dev/acpi_support/acpi_asus.c projects/mesh11s/sys/dev/ata/ata-queue.c projects/mesh11s/sys/dev/ata/ata-usb.c (props changed) projects/mesh11s/sys/dev/ata/chipsets/ata-serverworks.c projects/mesh11s/sys/dev/ath/ath_hal/ah.c projects/mesh11s/sys/dev/ath/ath_hal/ah_internal.h projects/mesh11s/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c projects/mesh11s/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c projects/mesh11s/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c projects/mesh11s/sys/dev/ath/ath_rate/sample/sample.c projects/mesh11s/sys/dev/ath/if_ath.c projects/mesh11s/sys/dev/ath/if_athvar.h projects/mesh11s/sys/dev/cxgb/ (props changed) projects/mesh11s/sys/dev/cxgb/cxgb_sge.c projects/mesh11s/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/mesh11s/sys/dev/dcons/dcons_os.c projects/mesh11s/sys/dev/drm/drm_pciids.h projects/mesh11s/sys/dev/drm/r300_cmdbuf.c projects/mesh11s/sys/dev/drm/r300_reg.h projects/mesh11s/sys/dev/drm/r600_cp.c projects/mesh11s/sys/dev/drm/radeon_cp.c projects/mesh11s/sys/dev/drm/radeon_drv.h projects/mesh11s/sys/dev/e1000/e1000_80003es2lan.c projects/mesh11s/sys/dev/e1000/e1000_82540.c projects/mesh11s/sys/dev/e1000/e1000_82541.c projects/mesh11s/sys/dev/e1000/e1000_82571.c projects/mesh11s/sys/dev/e1000/e1000_82575.c projects/mesh11s/sys/dev/e1000/e1000_82575.h projects/mesh11s/sys/dev/e1000/e1000_api.c projects/mesh11s/sys/dev/e1000/e1000_api.h projects/mesh11s/sys/dev/e1000/e1000_defines.h projects/mesh11s/sys/dev/e1000/e1000_hw.h projects/mesh11s/sys/dev/e1000/e1000_ich8lan.c projects/mesh11s/sys/dev/e1000/e1000_ich8lan.h projects/mesh11s/sys/dev/e1000/e1000_mac.c projects/mesh11s/sys/dev/e1000/e1000_mac.h projects/mesh11s/sys/dev/e1000/e1000_nvm.c projects/mesh11s/sys/dev/e1000/e1000_nvm.h projects/mesh11s/sys/dev/e1000/e1000_phy.c projects/mesh11s/sys/dev/e1000/e1000_phy.h projects/mesh11s/sys/dev/e1000/e1000_regs.h projects/mesh11s/sys/dev/e1000/if_em.c projects/mesh11s/sys/dev/e1000/if_em.h projects/mesh11s/sys/dev/e1000/if_igb.c projects/mesh11s/sys/dev/e1000/if_igb.h projects/mesh11s/sys/dev/ed/if_ed.c projects/mesh11s/sys/dev/ed/if_ed_cbus.c projects/mesh11s/sys/dev/ed/if_ed_isa.c projects/mesh11s/sys/dev/ed/if_ed_pccard.c projects/mesh11s/sys/dev/ed/if_ed_pci.c projects/mesh11s/sys/dev/ed/if_edreg.h projects/mesh11s/sys/dev/ed/if_edvar.h projects/mesh11s/sys/dev/ep/if_ep.c projects/mesh11s/sys/dev/ep/if_ep_pccard.c projects/mesh11s/sys/dev/ep/if_epreg.h projects/mesh11s/sys/dev/ep/if_epvar.h projects/mesh11s/sys/dev/firewire/firewire.c projects/mesh11s/sys/dev/firewire/sbp.h projects/mesh11s/sys/dev/fxp/if_fxp.c projects/mesh11s/sys/dev/hptmv/access601.h projects/mesh11s/sys/dev/hptmv/amd64-elf.raid.o.uu projects/mesh11s/sys/dev/hptmv/array.h projects/mesh11s/sys/dev/hptmv/command.h projects/mesh11s/sys/dev/hptmv/entry.c projects/mesh11s/sys/dev/hptmv/global.h projects/mesh11s/sys/dev/hptmv/gui_lib.c projects/mesh11s/sys/dev/hptmv/hptintf.h projects/mesh11s/sys/dev/hptmv/hptproc.c projects/mesh11s/sys/dev/hptmv/i386-elf.raid.o.uu projects/mesh11s/sys/dev/hptmv/ioctl.c projects/mesh11s/sys/dev/hptmv/mvOs.h projects/mesh11s/sys/dev/hptmv/mvSata.h projects/mesh11s/sys/dev/hptmv/mvStorageDev.h projects/mesh11s/sys/dev/hptmv/osbsd.h projects/mesh11s/sys/dev/hptmv/raid5n.h projects/mesh11s/sys/dev/hptmv/readme.txt projects/mesh11s/sys/dev/hptmv/vdevice.h projects/mesh11s/sys/dev/if_ndis/if_ndis.c projects/mesh11s/sys/dev/ixgbe/LICENSE projects/mesh11s/sys/dev/ixgbe/README projects/mesh11s/sys/dev/ixgbe/ixgbe.c projects/mesh11s/sys/dev/ixgbe/ixgbe.h projects/mesh11s/sys/dev/ixgbe/ixgbe_82598.c projects/mesh11s/sys/dev/ixgbe/ixgbe_api.c projects/mesh11s/sys/dev/ixgbe/ixgbe_api.h projects/mesh11s/sys/dev/ixgbe/ixgbe_common.c projects/mesh11s/sys/dev/ixgbe/ixgbe_common.h projects/mesh11s/sys/dev/ixgbe/ixgbe_osdep.h projects/mesh11s/sys/dev/ixgbe/ixgbe_phy.c projects/mesh11s/sys/dev/ixgbe/ixgbe_phy.h projects/mesh11s/sys/dev/ixgbe/ixgbe_type.h projects/mesh11s/sys/dev/joy/joy.c projects/mesh11s/sys/dev/kbd/kbdreg.h projects/mesh11s/sys/dev/kbdmux/kbdmux.c projects/mesh11s/sys/dev/pccard/pccarddevs projects/mesh11s/sys/dev/pci/pci.c projects/mesh11s/sys/dev/powermac_nvram/powermac_nvram.c projects/mesh11s/sys/dev/sound/usb/uaudio.c (contents, props changed) projects/mesh11s/sys/dev/sound/usb/uaudio.h (props changed) projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/mesh11s/sys/dev/sound/usb/uaudioreg.h (props changed) projects/mesh11s/sys/dev/syscons/syscons.c projects/mesh11s/sys/dev/tdfx/tdfx_pci.c projects/mesh11s/sys/dev/uart/uart_cpu_powerpc.c projects/mesh11s/sys/dev/uart/uart_dev_ns8250.c projects/mesh11s/sys/dev/usb/README.TXT (props changed) projects/mesh11s/sys/dev/usb/bluetooth/TODO.TXT (props changed) projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt.c (contents, props changed) projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed) projects/mesh11s/sys/dev/usb/bluetooth/ubtbcmfw.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/at91dci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/at91dci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/atmegadci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/atmegadci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ehci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ehci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ehci_pci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ohci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ohci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/ohci_pci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uhci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uhci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uhci_pci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/usb_controller.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uss820dci.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uss820dci.h (contents, props changed) projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c (contents, props changed) projects/mesh11s/sys/dev/usb/input/uhid.c (contents, props changed) projects/mesh11s/sys/dev/usb/input/ukbd.c (contents, props changed) projects/mesh11s/sys/dev/usb/input/ums.c (contents, props changed) projects/mesh11s/sys/dev/usb/input/usb_rdesc.h (props changed) projects/mesh11s/sys/dev/usb/misc/udbp.c (contents, props changed) projects/mesh11s/sys/dev/usb/misc/udbp.h (props changed) projects/mesh11s/sys/dev/usb/misc/ufm.c (props changed) projects/mesh11s/sys/dev/usb/net/if_aue.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_axe.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_cdce.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_cue.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_kue.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_kuefw.h (props changed) projects/mesh11s/sys/dev/usb/net/if_kuereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_rue.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_udav.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_udavreg.h (props changed) projects/mesh11s/sys/dev/usb/net/usb_ethernet.c (props changed) projects/mesh11s/sys/dev/usb/net/usb_ethernet.h (props changed) projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/mesh11s/sys/dev/usb/serial/u3g.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uark.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/ubsa.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/ubser.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uchcom.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/ucycom.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/ufoma.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uftdi.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/mesh11s/sys/dev/usb/serial/ugensa.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uipaq.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/ulpt.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/umct.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/umodem.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/umoscom.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uplcom.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/usb_serial.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/usb_serial.h (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uslcom.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uvisor.c (contents, props changed) projects/mesh11s/sys/dev/usb/serial/uvscom.c (contents, props changed) projects/mesh11s/sys/dev/usb/storage/rio500_usb.h (props changed) projects/mesh11s/sys/dev/usb/storage/umass.c (contents, props changed) projects/mesh11s/sys/dev/usb/storage/urio.c (contents, props changed) projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c (contents, props changed) projects/mesh11s/sys/dev/usb/template/usb_template.c (props changed) projects/mesh11s/sys/dev/usb/template/usb_template.h (props changed) projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/mesh11s/sys/dev/usb/template/usb_template_msc.c (props changed) projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/mesh11s/sys/dev/usb/ufm_ioctl.h (props changed) projects/mesh11s/sys/dev/usb/usb.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_bus.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_busdma.c (props changed) projects/mesh11s/sys/dev/usb/usb_busdma.h (props changed) projects/mesh11s/sys/dev/usb/usb_cdc.h (props changed) projects/mesh11s/sys/dev/usb/usb_compat_linux.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_compat_linux.h (props changed) projects/mesh11s/sys/dev/usb/usb_controller.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_core.c (props changed) projects/mesh11s/sys/dev/usb/usb_core.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_debug.c (props changed) projects/mesh11s/sys/dev/usb/usb_debug.h (props changed) projects/mesh11s/sys/dev/usb/usb_defs.h (props changed) projects/mesh11s/sys/dev/usb/usb_dev.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_dev.h (props changed) projects/mesh11s/sys/dev/usb/usb_device.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_device.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_dynamic.c (props changed) projects/mesh11s/sys/dev/usb/usb_dynamic.h (props changed) projects/mesh11s/sys/dev/usb/usb_endian.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_error.c (props changed) projects/mesh11s/sys/dev/usb/usb_error.h (props changed) projects/mesh11s/sys/dev/usb/usb_generic.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_generic.h (props changed) projects/mesh11s/sys/dev/usb/usb_handle_request.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_handle_request.h (props changed) projects/mesh11s/sys/dev/usb/usb_hid.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_hid.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_hub.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_hub.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_if.m (props changed) projects/mesh11s/sys/dev/usb/usb_ioctl.h (props changed) projects/mesh11s/sys/dev/usb/usb_lookup.c (props changed) projects/mesh11s/sys/dev/usb/usb_lookup.h (props changed) projects/mesh11s/sys/dev/usb/usb_mbuf.c (props changed) projects/mesh11s/sys/dev/usb/usb_mbuf.h (props changed) projects/mesh11s/sys/dev/usb/usb_mfunc.h (props changed) projects/mesh11s/sys/dev/usb/usb_msctest.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_msctest.h (props changed) projects/mesh11s/sys/dev/usb/usb_parse.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_parse.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_pci.h (props changed) projects/mesh11s/sys/dev/usb/usb_process.c (props changed) projects/mesh11s/sys/dev/usb/usb_process.h (props changed) projects/mesh11s/sys/dev/usb/usb_request.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_request.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_revision.h (props changed) projects/mesh11s/sys/dev/usb/usb_transfer.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_transfer.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_util.c (props changed) projects/mesh11s/sys/dev/usb/usb_util.h (props changed) projects/mesh11s/sys/dev/usb/usbdevs (props changed) projects/mesh11s/sys/dev/usb/usbhid.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_rum.c (contents, props changed) projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_ural.c (contents, props changed) projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_zyd.c (contents, props changed) projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/mesh11s/sys/dev/usb/wlan/usb_wlan.h (props changed) projects/mesh11s/sys/dev/xen/netfront/ (props changed) projects/mesh11s/sys/dev/xen/xenpci/ (props changed) projects/mesh11s/sys/fs/devfs/devfs_vnops.c projects/mesh11s/sys/fs/fifofs/fifo_vnops.c projects/mesh11s/sys/fs/pseudofs/pseudofs_vnops.c projects/mesh11s/sys/fs/unionfs/union_subr.c projects/mesh11s/sys/fs/unionfs/union_vnops.c projects/mesh11s/sys/geom/part/g_part_ebr.c projects/mesh11s/sys/geom/vinum/geom_vinum_share.c projects/mesh11s/sys/geom/vinum/geom_vinum_share.h projects/mesh11s/sys/i386/i386/busdma_machdep.c projects/mesh11s/sys/i386/i386/elf_machdep.c projects/mesh11s/sys/i386/i386/machdep.c projects/mesh11s/sys/i386/include/cpufunc.h projects/mesh11s/sys/i386/include/endian.h projects/mesh11s/sys/i386/include/vmparam.h projects/mesh11s/sys/i386/linux/linux_sysvec.c projects/mesh11s/sys/ia64/ia64/busdma_machdep.c projects/mesh11s/sys/ia64/ia64/elf_machdep.c projects/mesh11s/sys/kern/imgact_elf.c projects/mesh11s/sys/kern/kern_acct.c projects/mesh11s/sys/kern/kern_alq.c projects/mesh11s/sys/kern/kern_ktrace.c projects/mesh11s/sys/kern/kern_shutdown.c projects/mesh11s/sys/kern/kern_sig.c projects/mesh11s/sys/kern/kern_tc.c projects/mesh11s/sys/kern/kern_time.c projects/mesh11s/sys/kern/kern_umtx.c projects/mesh11s/sys/kern/kern_vimage.c projects/mesh11s/sys/kern/tty.c projects/mesh11s/sys/kern/uipc_domain.c projects/mesh11s/sys/kern/uipc_syscalls.c projects/mesh11s/sys/kern/uipc_usrreq.c projects/mesh11s/sys/kern/vfs_acl.c projects/mesh11s/sys/kern/vfs_cache.c projects/mesh11s/sys/kern/vfs_default.c projects/mesh11s/sys/kern/vfs_extattr.c projects/mesh11s/sys/kern/vfs_lookup.c projects/mesh11s/sys/kern/vfs_syscalls.c projects/mesh11s/sys/kern/vfs_vnops.c projects/mesh11s/sys/kern/vnode_if.src projects/mesh11s/sys/legacy/dev/ata/ata-usb.c (props changed) projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.c (props changed) projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.h (props changed) projects/mesh11s/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed) projects/mesh11s/sys/legacy/dev/sound/usb/uaudioreg.h (props changed) projects/mesh11s/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) projects/mesh11s/sys/mips/mips/elf64_machdep.c projects/mesh11s/sys/mips/mips/elf_machdep.c projects/mesh11s/sys/modules/Makefile projects/mesh11s/sys/modules/dtrace/dtnfsclient/ (props changed) projects/mesh11s/sys/modules/ip6_mroute_mod/ (props changed) projects/mesh11s/sys/modules/ipmi/ipmi_linux/ (props changed) projects/mesh11s/sys/modules/ixgbe/Makefile projects/mesh11s/sys/modules/nfsclient/Makefile projects/mesh11s/sys/modules/usb/Makefile projects/mesh11s/sys/modules/usb/usb/Makefile projects/mesh11s/sys/net/if.c projects/mesh11s/sys/net/if_bridge.c projects/mesh11s/sys/net/if_gif.c projects/mesh11s/sys/net/if_loop.c projects/mesh11s/sys/net/if_spppsubr.c projects/mesh11s/sys/net/if_var.h projects/mesh11s/sys/net/route.c projects/mesh11s/sys/net/vnet.h projects/mesh11s/sys/net80211/ieee80211_freebsd.h projects/mesh11s/sys/net80211/ieee80211_node.c projects/mesh11s/sys/net80211/ieee80211_output.c projects/mesh11s/sys/net80211/ieee80211_tdma.c projects/mesh11s/sys/net80211/ieee80211_var.h projects/mesh11s/sys/net80211/ieee80211_wds.c projects/mesh11s/sys/netinet/icmp6.h projects/mesh11s/sys/netinet/icmp_var.h projects/mesh11s/sys/netinet/if_ether.c projects/mesh11s/sys/netinet/igmp.c projects/mesh11s/sys/netinet/igmp_var.h projects/mesh11s/sys/netinet/in_gif.c projects/mesh11s/sys/netinet/in_mcast.c projects/mesh11s/sys/netinet/in_pcb.h projects/mesh11s/sys/netinet/ip_carp.c projects/mesh11s/sys/netinet/ip_carp.h projects/mesh11s/sys/netinet/ip_divert.c projects/mesh11s/sys/netinet/ip_dummynet.c projects/mesh11s/sys/netinet/ip_dummynet.h projects/mesh11s/sys/netinet/ip_fastfwd.c projects/mesh11s/sys/netinet/ip_fw.h projects/mesh11s/sys/netinet/ip_icmp.c projects/mesh11s/sys/netinet/ip_input.c projects/mesh11s/sys/netinet/ip_ipsec.c projects/mesh11s/sys/netinet/ip_mroute.c projects/mesh11s/sys/netinet/ip_mroute.h projects/mesh11s/sys/netinet/ip_options.c projects/mesh11s/sys/netinet/ip_output.c projects/mesh11s/sys/netinet/ip_var.h projects/mesh11s/sys/netinet/libalias/alias.c projects/mesh11s/sys/netinet/libalias/alias_cuseeme.c projects/mesh11s/sys/netinet/libalias/alias_dummy.c projects/mesh11s/sys/netinet/libalias/alias_ftp.c projects/mesh11s/sys/netinet/libalias/alias_irc.c projects/mesh11s/sys/netinet/libalias/alias_mod.c projects/mesh11s/sys/netinet/libalias/alias_mod.h projects/mesh11s/sys/netinet/libalias/alias_nbt.c projects/mesh11s/sys/netinet/libalias/alias_pptp.c projects/mesh11s/sys/netinet/libalias/alias_skinny.c projects/mesh11s/sys/netinet/libalias/alias_smedia.c projects/mesh11s/sys/netinet/pim_var.h projects/mesh11s/sys/netinet/raw_ip.c projects/mesh11s/sys/netinet/sctp_indata.c projects/mesh11s/sys/netinet/sctp_input.c projects/mesh11s/sys/netinet/sctp_output.c projects/mesh11s/sys/netinet/sctp_pcb.c projects/mesh11s/sys/netinet/sctp_structs.h projects/mesh11s/sys/netinet/sctp_sysctl.c projects/mesh11s/sys/netinet/sctp_sysctl.h projects/mesh11s/sys/netinet/sctp_uio.h projects/mesh11s/sys/netinet/sctp_usrreq.c projects/mesh11s/sys/netinet/sctputil.c projects/mesh11s/sys/netinet/tcp_hostcache.c projects/mesh11s/sys/netinet/tcp_input.c projects/mesh11s/sys/netinet/tcp_output.c projects/mesh11s/sys/netinet/tcp_reass.c projects/mesh11s/sys/netinet/tcp_sack.c projects/mesh11s/sys/netinet/tcp_subr.c projects/mesh11s/sys/netinet/tcp_syncache.c projects/mesh11s/sys/netinet/tcp_timer.c projects/mesh11s/sys/netinet/tcp_timewait.c projects/mesh11s/sys/netinet/tcp_usrreq.c projects/mesh11s/sys/netinet/tcp_var.h projects/mesh11s/sys/netinet/udp_usrreq.c projects/mesh11s/sys/netinet/udp_var.h projects/mesh11s/sys/netinet/vinet.h projects/mesh11s/sys/netinet6/frag6.c projects/mesh11s/sys/netinet6/icmp6.c projects/mesh11s/sys/netinet6/in6_src.c projects/mesh11s/sys/netinet6/ip6_input.c projects/mesh11s/sys/netinet6/mld6.c projects/mesh11s/sys/netinet6/nd6.c projects/mesh11s/sys/netinet6/nd6_nbr.c projects/mesh11s/sys/netinet6/nd6_rtr.c projects/mesh11s/sys/netinet6/raw_ip6.c projects/mesh11s/sys/netinet6/scope6.c projects/mesh11s/sys/netinet6/udp6_usrreq.c projects/mesh11s/sys/netipsec/ipsec.c projects/mesh11s/sys/netipsec/key.c projects/mesh11s/sys/netipsec/xform_ah.c projects/mesh11s/sys/netipsec/xform_esp.c projects/mesh11s/sys/netipsec/xform_ipcomp.c projects/mesh11s/sys/netipsec/xform_ipip.c projects/mesh11s/sys/nfs4client/nfs4_socket.c projects/mesh11s/sys/nfs4client/nfs4_vnops.c projects/mesh11s/sys/nfsclient/nfs.h projects/mesh11s/sys/nfsclient/nfs_krpc.c projects/mesh11s/sys/nfsclient/nfs_socket.c projects/mesh11s/sys/nfsclient/nfs_subs.c projects/mesh11s/sys/nfsclient/nfs_vnops.c projects/mesh11s/sys/nfsserver/nfs.h projects/mesh11s/sys/nfsserver/nfs_srvkrpc.c projects/mesh11s/sys/nfsserver/nfs_srvsubs.c projects/mesh11s/sys/nfsserver/nfs_syscalls.c projects/mesh11s/sys/pc98/pc98/machdep.c projects/mesh11s/sys/powerpc/aim/machdep.c projects/mesh11s/sys/powerpc/aim/mmu_oea.c projects/mesh11s/sys/powerpc/aim/mp_cpudep.c projects/mesh11s/sys/powerpc/aim/ofw_machdep.c projects/mesh11s/sys/powerpc/aim/swtch.S projects/mesh11s/sys/powerpc/aim/trap_subr.S projects/mesh11s/sys/powerpc/aim/uma_machdep.c projects/mesh11s/sys/powerpc/aim/vm_machdep.c projects/mesh11s/sys/powerpc/booke/machdep.c projects/mesh11s/sys/powerpc/booke/pmap.c projects/mesh11s/sys/powerpc/include/hid.h projects/mesh11s/sys/powerpc/include/intr.h projects/mesh11s/sys/powerpc/include/md_var.h projects/mesh11s/sys/powerpc/include/pmap.h projects/mesh11s/sys/powerpc/include/sf_buf.h projects/mesh11s/sys/powerpc/include/spr.h projects/mesh11s/sys/powerpc/include/vmparam.h projects/mesh11s/sys/powerpc/ofw/ofw_syscons.c projects/mesh11s/sys/powerpc/powerpc/bus_machdep.c projects/mesh11s/sys/powerpc/powerpc/cpu.c projects/mesh11s/sys/powerpc/powerpc/elf_machdep.c projects/mesh11s/sys/powerpc/powerpc/mem.c projects/mesh11s/sys/powerpc/powerpc/mmu_if.m projects/mesh11s/sys/powerpc/powerpc/pmap_dispatch.c projects/mesh11s/sys/sparc64/sparc64/elf_machdep.c projects/mesh11s/sys/sys/elf_common.h projects/mesh11s/sys/sys/imgact_elf.h projects/mesh11s/sys/sys/kernel.h projects/mesh11s/sys/sys/kerneldump.h projects/mesh11s/sys/sys/mbuf.h projects/mesh11s/sys/sys/param.h projects/mesh11s/sys/sys/vimage.h projects/mesh11s/sys/sys/vnode.h projects/mesh11s/sys/ufs/ffs/ffs_snapshot.c projects/mesh11s/sys/ufs/ffs/ffs_softdep.c projects/mesh11s/sys/vm/vm_map.c projects/mesh11s/sys/vm/vm_map.h projects/mesh11s/sys/vm/vm_mmap.c projects/mesh11s/sys/vm/vm_reserv.c projects/mesh11s/sys/vm/vm_unix.c projects/mesh11s/sys/xen/evtchn.h (props changed) projects/mesh11s/sys/xen/hypervisor.h (props changed) projects/mesh11s/sys/xen/xen_intr.h (props changed) projects/mesh11s/tools/regression/acltools/tools-posix.test projects/mesh11s/tools/regression/lib/libc/stdio/test-getdelim.c projects/mesh11s/tools/regression/lib/msun/test-conj.t (props changed) projects/mesh11s/tools/tools/ath/common/dumpregs.h (props changed) projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/mesh11s/tools/tools/nanobsd/gateworks/G2348 projects/mesh11s/tools/tools/nanobsd/gateworks/G2358 projects/mesh11s/tools/tools/sysbuild/sysbuild.sh projects/mesh11s/usr.bin/make/globals.h projects/mesh11s/usr.bin/make/main.c projects/mesh11s/usr.bin/make/make.1 projects/mesh11s/usr.bin/make/make.c projects/mesh11s/usr.bin/su/su.c projects/mesh11s/usr.bin/truss/main.c projects/mesh11s/usr.bin/truss/setup.c projects/mesh11s/usr.sbin/Makefile projects/mesh11s/usr.sbin/fifolog/fifolog_create/fifolog.1 projects/mesh11s/usr.sbin/jexec/jexec.c projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/mesh11s/usr.sbin/makefs/getid.c (props changed) projects/mesh11s/usr.sbin/portsnap/phttpget/phttpget.c projects/mesh11s/usr.sbin/ppp/iface.c projects/mesh11s/usr.sbin/sysinstall/devices.c Modified: projects/mesh11s/Makefile.inc1 ============================================================================== --- projects/mesh11s/Makefile.inc1 Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/Makefile.inc1 Tue Apr 14 13:43:09 2009 (r191059) @@ -1017,7 +1017,6 @@ cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ Modified: projects/mesh11s/ObsoleteFiles.inc ============================================================================== --- projects/mesh11s/ObsoleteFiles.inc Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/ObsoleteFiles.inc Tue Apr 14 13:43:09 2009 (r191059) @@ -14,6 +14,36 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090410: VOP_LEASE.9 removed +OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz +# 20090405: removal of if_ppp(4) and if_sl(4) +OLD_FILES+=sbin/slattach rescue/slattach +OLD_FILES+=sbin/startslip rescue/startslip +OLD_FILES+=usr/include/net/if_ppp.h +OLD_FILES+=usr/include/net/if_pppvar.h +OLD_FILES+=usr/include/net/if_slvar.h +OLD_FILES+=usr/include/net/ppp_comp.h +OLD_FILES+=usr/include/net/slip.h +OLD_FILES+=usr/sbin/sliplogin +OLD_FILES+=usr/sbin/slstat +OLD_FILES+=usr/sbin/pppd +OLD_FILES+=usr/sbin/pppstats +OLD_FILES+=usr/share/man/man1/startslip.1.gz +OLD_FILES+=usr/share/man/man4/if_ppp.4.gz +OLD_FILES+=usr/share/man/man4/if_sl.4.gz +OLD_FILES+=usr/share/man/man4/ppp.4.gz +OLD_FILES+=usr/share/man/man4/sl.4.gz +OLD_FILES+=usr/share/man/man8/pppd.8.gz +OLD_FILES+=usr/share/man/man8/pppstats.8.gz +OLD_FILES+=usr/share/man/man8/slattach.8.gz +OLD_FILES+=usr/share/man/man8/slip.8.gz +OLD_FILES+=usr/share/man/man8/sliplogin.8.gz +OLD_FILES+=usr/share/man/man8/slstat.8.gz +# 20090321: libpcap upgraded to 1.0.0 +OLD_LIBS+=lib/libpcap.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libpcap.so.5 +.endif # 20090319: uscanner(4) has been removed OLD_FILES+=usr/share/man/man4/uscanner.4.gz # 20090313: k8temp(4) renamed to amdtemp(4) @@ -24,8 +54,17 @@ OLD_FILES+=usr/lib/libusb20.a OLD_FILES+=usr/lib/libusb20.so OLD_FILES+=usr/lib/libusb20_p.a OLD_FILES+=usr/include/libusb20_compat01.h +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libusb20.so.1 +OLD_FILES+=usr/lib32/libusb20.a +OLD_FILES+=usr/lib32/libusb20.so +OLD_FILES+=usr/lib32/libusb20_p.a +.endif # 20090226: libmp(3) functions renamed OLD_LIBS+=usr/lib/libmp.so.6 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libmp.so.6 +.endif # 20090223: changeover of USB stacks OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h Modified: projects/mesh11s/UPDATING ============================================================================== --- projects/mesh11s/UPDATING Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/UPDATING Tue Apr 14 13:43:09 2009 (r191059) @@ -22,6 +22,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090408: + Do not use Giant for kbdmux(4) locking. This is wrong and + apparently causing more problems than it solves. This will + re-open the issue where interrupt handlers may race with + kbdmux(4) in polling mode. Typical symptoms include (but + not limited to) duplicated and/or missing characters when + low level console functions (such as gets) are used while + interrupts are enabled (for example geli password prompt, + mountroot prompt etc.). Disabling kbdmux(4) may help. + +20090407: + The size of structs vnet_net, vnet_inet and vnet_ipfw has changed; + kernel modules referencing any of the above need to be recompiled. + Bump __FreeBSD_version to 800075. + 20090320: GEOM_PART has become the default partition slicer for storage devices, replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It Modified: projects/mesh11s/bin/ls/ls.1 ============================================================================== --- projects/mesh11s/bin/ls/ls.1 Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/bin/ls/ls.1 Tue Apr 14 13:43:09 2009 (r191059) @@ -680,6 +680,7 @@ specification. .Xr sort 1 , .Xr xterm 1 , .Xr strftime 3 , +.Xr strmode 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , Modified: projects/mesh11s/bin/sh/eval.c ============================================================================== --- projects/mesh11s/bin/sh/eval.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/bin/sh/eval.c Tue Apr 14 13:43:09 2009 (r191059) @@ -166,7 +166,8 @@ evalstring(char *s) setstackmark(&smark); setinputstring(s, 1); while ((n = parsecmd(0)) != NEOF) { - evaltree(n, 0); + if (n != NULL) + evaltree(n, 0); popstackmark(&smark); } popfile(); Modified: projects/mesh11s/bin/sh/parser.c ============================================================================== --- projects/mesh11s/bin/sh/parser.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/bin/sh/parser.c Tue Apr 14 13:43:09 2009 (r191059) @@ -250,6 +250,7 @@ pipeline(void) int negate; negate = 0; + checkkwd = 2; TRACE(("pipeline: entered\n")); while (readtoken() == TNOT) negate = !negate; Modified: projects/mesh11s/contrib/gdb/FREEBSD-Xlist ============================================================================== --- projects/mesh11s/contrib/gdb/FREEBSD-Xlist Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/gdb/FREEBSD-Xlist Tue Apr 14 13:43:09 2009 (r191059) @@ -1,60 +1,69 @@ $FreeBSD$ -gdb-6.1.1/bfd/* -gdb-6.1.1/config/* -gdb-6.1.1/etc/* -gdb-6.1.1/gdb/avr* -gdb-6.1.1/gdb/config/avr/* -gdb-6.1.1/gdb/config/cris/* -gdb-6.1.1/gdb/config/d10v/* -gdb-6.1.1/gdb/config/djgpp/* -gdb-6.1.1/gdb/config/frv/* -gdb-6.1.1/gdb/config/h8300/* -gdb-6.1.1/gdb/config/m32r/* -gdb-6.1.1/gdb/config/m68hc11/* -gdb-6.1.1/gdb/config/m68k/* -gdb-6.1.1/gdb/config/mcore/* -gdb-6.1.1/gdb/config/mn10300/* -gdb-6.1.1/gdb/config/ns32k/* -gdb-6.1.1/gdb/config/pa/* -gdb-6.1.1/gdb/config/sh/* -gdb-6.1.1/gdb/config/v850/* -gdb-6.1.1/gdb/config/vax/* -gdb-6.1.1/gdb/config/xstormy16/* -gdb-6.1.1/gdb/cris* -gdb-6.1.1/gdb/d10v* -gdb-6.1.1/gdb/frv* -gdb-6.1.1/gdb/h8300* -gdb-6.1.1/gdb/*m32r* -gdb-6.1.1/gdb/m68* -gdb-6.1.1/gdb/mcore* -gdb-6.1.1/gdb/mn10300* -gdb-6.1.1/gdb/nlm/* -gdb-6.1.1/gdb/ns32k* -gdb-6.1.1/gdb/osf-share/* -gdb-6.1.1/gdb/hppa* -gdb-6.1.1/gdb/rdi-share/* -gdb-6.1.1/gdb/sh* -gdb-6.1.1/gdb/testsuite/* -gdb-6.1.1/gdb/v850* -gdb-6.1.1/gdb/vax* -gdb-6.1.1/gdb/vx-share/* -gdb-6.1.1/gdb/xstormy16* -gdb-6.1.1/include/aout/* -gdb-6.1.1/include/coff/* -gdb-6.1.1/include/elf/* -gdb-6.1.1/include/mpw/* -gdb-6.1.1/include/nlm/* -gdb-6.1.1/include/opcode/* -gdb-6.1.1/intl/* -gdb-6.1.1/libiberty/* -gdb-6.1.1/mmalloc/* -gdb-6.1.1/opcodes/* -gdb-6.1.1/readline/* -gdb-6.1.1/sim/* -gdb-6.1.1/texinfo/* -gdb-6.1.1/utils/* +gdb-*/bfd/* +gdb-*/config/* +gdb-*/etc/* +gdb-*/gdb/avr* +gdb-*/gdb/config/avr/* +gdb-*/gdb/config/cris/* +gdb-*/gdb/config/d10v/* +gdb-*/gdb/config/djgpp/* +gdb-*/gdb/config/frv/* +gdb-*/gdb/config/h8300/* +gdb-*/gdb/config/m32r/* +gdb-*/gdb/config/m68hc11/* +gdb-*/gdb/config/m68k/* +gdb-*/gdb/config/mcore/* +gdb-*/gdb/config/mn10300/* +gdb-*/gdb/config/ns32k/* +gdb-*/gdb/config/pa/* +gdb-*/gdb/config/sh/* +gdb-*/gdb/config/v850/* +gdb-*/gdb/config/vax/* +gdb-*/gdb/config/xstormy16/* +gdb-*/gdb/cris* +gdb-*/gdb/d10v* +gdb-*/gdb/frv* +gdb-*/gdb/h8300* +gdb-*/gdb/iq2000* +gdb-*/gdb/i386nbsd* +gdb-*/gdb/m32c* +gdb-*/gdb/*m32r* +gdb-*/gdb/m68* +gdb-*/gdb/m88* +gdb-*/gdb/mcore* +gdb-*/gdb/mn10300* +gdb-*/gdb/mt-* +gdb-*/gdb/nlm/* +gdb-*/gdb/ns32k* +gdb-*/gdb/osf-share/* +gdb-*/gdb/ppcobsd* +gdb-*/gdb/hppa* +gdb-*/gdb/rdi-share/* +gdb-*/gdb/sh* +gdb-*/gdb/testsuite/* +gdb-*/gdb/v850* +gdb-*/gdb/vax* +gdb-*/gdb/vx-share/* +gdb-*/gdb/xstormy16* +gdb-*/gdb/xtensa* +gdb-*/include/aout/* +gdb-*/include/coff/* +gdb-*/include/elf/* +gdb-*/include/mpw/* +gdb-*/include/nlm/* +gdb-*/include/opcode/* +gdb-*/intl/* +gdb-*/libiberty/* +gdb-*/mmalloc/* +gdb-*/opcodes/* +gdb-*/readline/* +gdb-*/regformats/reg-cris* +gdb-*/sim/* +gdb-*/texinfo/* +gdb-*/utils/* *ChangeLog* *Makefile* +*TODO* *aix* *config.* *configure* @@ -63,4 +72,6 @@ gdb-6.1.1/utils/* *interix* *irix* *linux* +*mingw* *osf1* +*win32* Modified: projects/mesh11s/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- projects/mesh11s/contrib/libpcap/bpf/net/bpf_filter.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/libpcap/bpf/net/bpf_filter.c Tue Apr 14 13:43:09 2009 (r191059) @@ -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/mesh11s/contrib/libpcap/bpf_dump.c ============================================================================== --- projects/mesh11s/contrib/libpcap/bpf_dump.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/libpcap/bpf_dump.c Tue Apr 14 13:43:09 2009 (r191059) @@ -31,7 +31,7 @@ static const char rcsid[] _U_ = #include 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/mesh11s/contrib/libpcap/bpf_image.c ============================================================================== --- projects/mesh11s/contrib/libpcap/bpf_image.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/libpcap/bpf_image.c Tue Apr 14 13:43:09 2009 (r191059) @@ -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/mesh11s/contrib/libpcap/pcap/bpf.h ============================================================================== --- projects/mesh11s/contrib/libpcap/pcap/bpf.h Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/libpcap/pcap/bpf.h Tue Apr 14 13:43:09 2009 (r191059) @@ -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/mesh11s/contrib/libpcap/pcap/pcap.h ============================================================================== --- projects/mesh11s/contrib/libpcap/pcap/pcap.h Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/contrib/libpcap/pcap/pcap.h Tue Apr 14 13:43:09 2009 (r191059) @@ -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/mesh11s/include/signal.h ============================================================================== --- projects/mesh11s/include/signal.h Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/include/signal.h Tue Apr 14 13:43:09 2009 (r191059) @@ -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/mesh11s/lib/libarchive/Makefile ============================================================================== --- projects/mesh11s/lib/libarchive/Makefile Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/Makefile Tue Apr 14 13:43:09 2009 (r191059) @@ -77,6 +77,7 @@ SRCS= archive_check_magic.c \ # Man pages to be installed. MAN= archive_entry.3 \ archive_read.3 \ + archive_read_disk.3 \ archive_util.3 \ archive_write.3 \ archive_write_disk.3 \ @@ -186,6 +187,16 @@ MLINKS+= archive_read.3 archive_read_sup MLINKS+= archive_read.3 archive_read_support_format_iso9660.3 MLINKS+= archive_read.3 archive_read_support_format_tar.3 MLINKS+= archive_read.3 archive_read_support_format_zip.3 +MLINKS+= archive_read_disk.3 archive_read_disk_entry_from_file.3 +MLINKS+= archive_read_disk.3 archive_read_disk_gname.3 +MLINKS+= archive_read_disk.3 archive_read_disk_new.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_gname_lookup.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_standard_lookup.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_hybrid.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_logical.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_physical.3 +MLINKS+= archive_read_disk.3 archive_read_disk_set_uname_lookup.3 +MLINKS+= archive_read_disk.3 archive_read_disk_uname.3 MLINKS+= archive_util.3 archive_clear_error.3 MLINKS+= archive_util.3 archive_compression.3 MLINKS+= archive_util.3 archive_compression_name.3 Modified: projects/mesh11s/lib/libarchive/archive.h ============================================================================== --- projects/mesh11s/lib/libarchive/archive.h Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive.h Tue Apr 14 13:43:09 2009 (r191059) @@ -46,7 +46,7 @@ /* Get appropriate definitions of standard POSIX-style types. */ /* These should match the types used in 'struct stat' */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #define __LA_INT64_T __int64 # if defined(_WIN64) # define __LA_SSIZE_T __int64 @@ -68,7 +68,7 @@ * .lib. The default here assumes you're building a DLL. Only * libarchive source should ever define __LIBARCHIVE_BUILD. */ -#if ((defined __WIN32__) || (defined _WIN32)) && (!defined LIBARCHIVE_STATIC) +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC) # ifdef __LIBARCHIVE_BUILD # ifdef __GNUC__ # define __LA_DECL __attribute__((dllexport)) extern Modified: projects/mesh11s/lib/libarchive/archive_check_magic.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_check_magic.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_check_magic.c Tue Apr 14 13:43:09 2009 (r191059) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_UNISTD_H #include #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include #include #endif @@ -56,7 +56,7 @@ errmsg(const char *m) static void diediedie(void) { -#if defined(_WIN32) && defined(_DEBUG) +#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) /* Cause a breakpoint exception */ DebugBreak(); #endif Modified: projects/mesh11s/lib/libarchive/archive_entry.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_entry.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_entry.c Tue Apr 14 13:43:09 2009 (r191059) @@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$"); #elif defined makedev /* There's a "makedev" macro. */ #define ae_makedev(maj, min) makedev((maj), (min)) -#elif defined mkdev || defined _WIN32 || defined __WIN32__ +#elif defined mkdev || ((defined _WIN32 || defined __WIN32__) && !defined(__CYGWIN__)) /* Windows. */ #define ae_makedev(maj, min) mkdev((maj), (min)) #else Modified: projects/mesh11s/lib/libarchive/archive_entry.h ============================================================================== --- projects/mesh11s/lib/libarchive/archive_entry.h Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_entry.h Tue Apr 14 13:43:09 2009 (r191059) @@ -42,7 +42,7 @@ /* Get appropriate definitions of standard POSIX-style types. */ /* These should match the types used in 'struct stat' */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #define __LA_INT64_T __int64 #define __LA_UID_T unsigned int #define __LA_GID_T unsigned int @@ -71,7 +71,7 @@ * .lib. The default here assumes you're building a DLL. Only * libarchive source should ever define __LIBARCHIVE_BUILD. */ -#if ((defined __WIN32__) || (defined _WIN32)) && (!defined LIBARCHIVE_STATIC) +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC) # ifdef __LIBARCHIVE_BUILD # ifdef __GNUC__ # define __LA_DECL __attribute__((dllexport)) extern Copied: projects/mesh11s/lib/libarchive/archive_read_disk.3 (from r191056, head/lib/libarchive/archive_read_disk.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mesh11s/lib/libarchive/archive_read_disk.3 Tue Apr 14 13:43:09 2009 (r191059, copy of r191056, head/lib/libarchive/archive_read_disk.3) @@ -0,0 +1,308 @@ +.\" Copyright (c) 2003-2009 Tim Kientzle +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 10, 2009 +.Dt archive_read_disk 3 +.Os +.Sh NAME +.Nm archive_read_disk_new , +.Nm archive_read_disk_set_symlink_logical , +.Nm archive_read_disk_set_symlink_physical , +.Nm archive_read_disk_set_symlink_hybrid , +.Nm archive_read_disk_entry_from_file , +.Nm archive_read_disk_gname , +.Nm archive_read_disk_uname , +.Nm archive_read_disk_set_uname_lookup , +.Nm archive_read_disk_set_gname_lookup , +.Nm archive_read_disk_set_standard_lookup , +.Nm archive_read_close , +.Nm archive_read_finish +.Nd functions for reading objects from disk +.Sh SYNOPSIS +.In archive.h +.Ft struct archive * +.Fn archive_read_disk_new "void" +.Ft int +.Fn archive_read_disk_set_symlink_logical "struct archive *" +.Ft int +.Fn archive_read_disk_set_symlink_physical "struct archive *" +.Ft int +.Fn archive_read_disk_set_symlink_hybrid "struct archive *" +.Ft int +.Fn archive_read_disk_gname "struct archive *" "gid_t" +.Ft int +.Fn archive_read_disk_uname "struct archive *" "uid_t" +.Ft int +.Fo archive_read_disk_set_gname_lookup +.Fa "struct archive *" +.Fa "void *" +.Fa "const char *(*lookup)(void *, gid_t)" +.Fa "void (*cleanup)(void *)" +.Fc +.Ft int +.Fo archive_read_disk_set_uname_lookup +.Fa "struct archive *" +.Fa "void *" +.Fa "const char *(*lookup)(void *, uid_t)" +.Fa "void (*cleanup)(void *)" +.Fc +.Ft int +.Fn archive_read_disk_set_standard_lookup "struct archive *" +.Ft int +.Fo archive_read_disk_entry_from_file +.Fa "struct archive *" +.Fa "struct archive_entry *" +.Fa "int fd" +.Fa "const struct stat *" +.Fc +.Ft int +.Fn archive_read_close "struct archive *" +.Ft int +.Fn archive_read_finish "struct archive *" +.Sh DESCRIPTION +These functions provide an API for reading information about +objects on disk. +In particular, they provide an interface for populating +.Tn struct archive_entry +objects. +.Bl -tag -width indent +.It Fn archive_read_disk_new +Allocates and initializes a +.Tn struct archive +object suitable for reading object information from disk. +.It Xo +.Fn archive_read_disk_set_symlink_logical , +.Fn archive_read_disk_set_symlink_physical , +.Fn archive_read_disk_set_symlink_hybrid +.Xc +This sets the mode used for handling symbolic links. +The +.Dq logical +mode follows all symbolic links. +The +.Dq physical +mode does not follow any symbolic links. +The +.Dq hybrid +mode currently behaves identically to the +.Dq logical +mode. +.It Xo +.Fn archive_read_disk_gname , +.Fn archive_read_disk_uname +.Xc +Returns a user or group name given a gid or uid value. +By default, these always return a NULL string. +.It Xo +.Fn archive_read_disk_set_gname_lookup , +.Fn archive_read_disk_set_uname_lookup +.Xc +These allow you to override the functions used for +user and group name lookups. +You may also provide a +.Tn void * +pointer to a private data structure and a cleanup function for +that data. +The cleanup function will be invoked when the +.Tn struct archive +object is destroyed or when new lookup functions are registered. +.It Fn archive_read_disk_set_standard_lookup +This convenience function installs a standard set of user +and group name lookup functions. +These functions use +.Xr getpwid 3 +and +.Xr getgrid 3 +to convert ids to names, defaulting to NULL if the names cannot +be looked up. +These functions also implement a simple memory cache to reduce +the number of calls to +.Xr getpwid 3 +and +.Xr getgrid 3 . +.It Fn archive_read_disk_entry_from_file +Populates a +.Tn struct archive_entry +object with information about a particular file. +The +.Tn archive_entry +object must have already been created with +.Xr archive_entry_new 3 +and at least one of the source path or path fields must already be set. +(If both are set, the source path will be used.) +.Pp +Information is read from disk using the path name from the +.Tn struct archive_entry +object. +If a file descriptor is provided, some information will be obtained using +that file descriptor, on platforms that support the appropriate +system calls. +.Pp +If a pointer to a +.Tn struct stat +is provided, information from that structure will be used instead +of reading from the disk where appropriate. +This can provide performance benefits in scenarios where +.Tn struct stat +information has already been read from the disk as a side effect +of some other operation. +(For example, directory traversal libraries often provide this information.) +.Pp +Where necessary, user and group ids are converted to user and group names +using the currently registered lookup functions above. +This affects the file ownership fields and ACL values in the +.Tn struct archive_entry +object. +.It Fn archive_read_close +This currently does nothing. +.It Fn archive_write_finish +Invokes +.Fn archive_write_close +if it was not invoked manually, then releases all resources. +.El +More information about the +.Va struct archive +object and the overall design of the library can be found in the +.Xr libarchive 3 +overview. +.Sh EXAMPLE +The following illustrates basic usage of the library by +showing how to use it to copy an item on disk into an archive. +.Bd -literal -offset indent +void +file_to_archive(struct archive *a, const char *name) +{ + char buff[8192]; + size_t bytes_read; + struct archive *ard; + struct archive_entry *entry; + int fd; + + ard = archive_read_disk_new(); + archive_read_disk_set_standard_lookup(ard); + entry = archive_entry_new(); + fd = open(name, O_RDONLY); + if (fd < 0) + return; + archive_entry_copy_sourcepath(entry, name); + archive_read_disk_entry_from_file(ard, entry, fd, NULL); + archive_write_header(a, entry); + while ((bytes_read = read(fd, buff, sizeof(buff))) > 0) + archive_write_data(a, buff, bytes_read); + archive_write_finish_entry(a); + archive_read_finish(ard); + archive_entry_free(entry); +} +.Ed +.Sh RETURN VALUES +Most functions return +.Cm ARCHIVE_OK +(zero) on success, or one of several negative +error codes for errors. +Specific error codes include: +.Cm ARCHIVE_RETRY +for operations that might succeed if retried, +.Cm ARCHIVE_WARN +for unusual conditions that do not prevent further operations, and +.Cm ARCHIVE_FATAL +for serious errors that make remaining operations impossible. +The +.Xr archive_errno 3 +and +.Xr archive_error_string 3 +functions can be used to retrieve an appropriate error code and a +textual error message. +(See +.Xr archive_util 3 +for details.) +.Pp +.Fn archive_read_disk_new +returns a pointer to a newly-allocated +.Tn struct archive +object or NULL if the allocation failed for any reason. +.Pp +.Fn archive_read_disk_gname +and +.Fn archive_read_disk_uname +return +.Tn const char * +pointers to the textual name or NULL if the lookup failed for any reason. +The returned pointer points to internal storage that +may be reused on the next call to either of these functions; +callers should copy the string if they need to continue accessing it. +.Pp +.Sh SEE ALSO +.Xr archive_read 3 , +.Xr archive_write 3 , +.Xr archive_write_disk 3 , +.Xr tar 1 , +.Xr libarchive 3 +.Sh HISTORY +The +.Nm libarchive +library first appeared in +.Fx 5.3 . +The +.Nm archive_read_disk +interface was added to +.Nm libarchive 2.6 +and first appeared in +.Fx 8.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm libarchive +library was written by +.An Tim Kientzle Aq kientzle@freebsd.org . +.Sh BUGS +The +.Dq standard +user name and group name lookup functions are not the defaults because +.Xr getgrid 3 +and +.Xr getpwid 3 +are sometimes too large for particular applications. +The current design allows the application author to use a more +compact implementation when appropriate. +.Pp +The full list of metadata read from disk by +.Fn archive_read_disk_entry_from_file +is necessarily system-dependent. +.Pp +The +.Fn archive_read_disk_entry_from_file +function reads as much information as it can from disk. +Some method should be provided to limit this so that clients who +do not need ACLs, for instance, can avoid the extra work needed +to look up such information. +.Pp +This API should provide a set of methods for walking a directory tree. +That would make it a direct parallel of the +.Xr archive_read 3 +API. +When such methods are implemented, the +.Dq hybrid +symbolic link mode will make sense. Modified: projects/mesh11s/lib/libarchive/archive_read_disk_set_standard_lookup.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_read_disk_set_standard_lookup.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_read_disk_set_standard_lookup.c Tue Apr 14 13:43:09 2009 (r191059) @@ -47,14 +47,14 @@ __FBSDID("$FreeBSD$"); #include "archive.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) int archive_read_disk_set_standard_lookup(struct archive *a) { archive_set_error(a, -1, "Standard lookups not available on Windows"); return (ARCHIVE_FATAL); } -#else +#else /* ! (_WIN32 && !__CYGWIN__) */ #define name_cache_size 127 static const char * const NO_NAME = "(noname)"; @@ -182,7 +182,7 @@ lookup_uname(void *data, uid_t uid) static const char * lookup_uname_helper(struct archive *a, id_t id) { - char buffer[64]; + char buffer[512]; struct passwd pwent, *result; int r; @@ -210,7 +210,7 @@ lookup_gname(void *data, gid_t gid) static const char * lookup_gname_helper(struct archive *a, id_t id) { - char buffer[64]; + char buffer[512]; struct group grent, *result; int r; @@ -226,4 +226,4 @@ lookup_gname_helper(struct archive *a, i return strdup(grent.gr_name); } -#endif /* _WIN32 */ +#endif /* ! (_WIN32 && !__CYGWIN__) */ Modified: projects/mesh11s/lib/libarchive/archive_read_support_compression_program.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_read_support_compression_program.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_read_support_compression_program.c Tue Apr 14 13:43:09 2009 (r191059) @@ -38,6 +38,9 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_LIMITS_H # include #endif +#ifdef HAVE_SIGNAL_H +# include +#endif #ifdef HAVE_STDLIB_H # include #endif @@ -61,7 +64,7 @@ archive_read_support_compression_program /* This capability is only available on POSIX systems. */ #if (!defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \ - !(defined(HAVE_FORK) || defined(HAVE_VFORK))) && !defined(_WIN32) + !(defined(HAVE_FORK) || defined(HAVE_VFORK))) && (!defined(_WIN32) || defined(__CYGWIN__)) /* * On non-Posix systems, allow the program to build, but choke if @@ -119,6 +122,8 @@ static int program_bidder_free(struct ar struct program_filter { char *description; pid_t child; + int exit_status; + int waitpid_return; int child_stdin, child_stdout; char *out_buf; @@ -211,6 +216,73 @@ program_bidder_bid(struct archive_read_f } /* + * Shut down the child, return ARCHIVE_OK if it exited normally. + * + * Note that the return value is sticky; if we're called again, + * we won't reap the child again, but we will return the same status + * (including error message if the child came to a bad end). + */ +static int +child_stop(struct archive_read_filter *self, struct program_filter *state) +{ + /* Close our side of the I/O with the child. */ + if (state->child_stdin != -1) { + close(state->child_stdin); + state->child_stdin = -1; + } + if (state->child_stdout != -1) { + close(state->child_stdout); + state->child_stdout = -1; + } + + if (state->child != 0) { + /* Reap the child. */ + do { + state->waitpid_return + = waitpid(state->child, &state->exit_status, 0); + } while (state->waitpid_return == -1 && errno == EINTR); + state->child = 0; + } + + if (state->waitpid_return < 0) { + /* waitpid() failed? This is ugly. */ + archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC, + "Child process exited badly"); + return (ARCHIVE_WARN); + } + + if (WIFSIGNALED(state->exit_status)) { +#ifdef SIGPIPE + /* If the child died because we stopped reading before + * it was done, that's okay. Some archive formats + * have padding at the end that we routinely ignore. */ + /* The alternative to this would be to add a step + * before close(child_stdout) above to read from the + * child until the child has no more to write. */ + if (WTERMSIG(state->exit_status) == SIGPIPE) + return (ARCHIVE_OK); +#endif + archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC, + "Child process exited with signal %d", + WTERMSIG(state->exit_status)); + return (ARCHIVE_WARN); + } + + if (WIFEXITED(state->exit_status)) { + if (WEXITSTATUS(state->exit_status) == 0) + return (ARCHIVE_OK); + + archive_set_error(&self->archive->archive, + ARCHIVE_ERRNO_MISC, + "Child process exited with status %d", + WEXITSTATUS(state->exit_status)); + return (ARCHIVE_WARN); + } + + return (ARCHIVE_WARN); +} + +/* * Use select() to decide whether the child is ready for read or write. */ static ssize_t @@ -229,11 +301,10 @@ child_read(struct archive_read_filter *s if (ret > 0) return (ret); - if (ret == 0 || (ret == -1 && errno == EPIPE)) { - close(state->child_stdout); - state->child_stdout = -1; - return (0); - } + if (ret == 0 || (ret == -1 && errno == EPIPE)) + /* Child has closed its output; reap the child + * and return the status. */ + return (child_stop(self, state)); if (ret == -1 && errno != EAGAIN) return (-1); @@ -352,8 +423,11 @@ program_filter_read(struct archive_read_ while (state->child_stdout != -1 && total < state->out_buf_len) { bytes = child_read(self, p, state->out_buf_len - total); if (bytes < 0) - return (bytes); + /* No recovery is possible if we can no longer + * read from the child. */ + return (ARCHIVE_FATAL); if (bytes == 0) + /* We got EOF from the child. */ break; total += bytes; p += bytes; @@ -367,24 +441,17 @@ static int program_filter_close(struct archive_read_filter *self) { struct program_filter *state; - int status; + int e; state = (struct program_filter *)self->data; - - /* Shut down the child. */ - if (state->child_stdin != -1) - close(state->child_stdin); - if (state->child_stdout != -1) - close(state->child_stdout); - while (waitpid(state->child, &status, 0) == -1 && errno == EINTR) - continue; + e = child_stop(self, state); /* Release our private data. */ free(state->out_buf); free(state->description); free(state); - return (ARCHIVE_OK); + return (e); } #endif /* !defined(HAVE_PIPE) || !defined(HAVE_VFORK) || !defined(HAVE_FCNTL) */ Modified: projects/mesh11s/lib/libarchive/archive_read_support_format_empty.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_read_support_format_empty.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_read_support_format_empty.c Tue Apr 14 13:43:09 2009 (r191059) @@ -59,12 +59,14 @@ archive_read_support_format_empty(struct static int archive_read_format_empty_bid(struct archive_read *a) { - const void *h; + ssize_t avail; - h = __archive_read_ahead(a, 1, NULL); - if (h != NULL) - return (-1); - return (1); + (void)__archive_read_ahead(a, 1, &avail); + /* Bid 1 if we successfully read exactly zero bytes. */ + if (avail == 0) + return (1); + /* Otherwise, we don't bid on this. */ + return (-1); } static int Modified: projects/mesh11s/lib/libarchive/archive_string.c ============================================================================== --- projects/mesh11s/lib/libarchive/archive_string.c Tue Apr 14 13:18:39 2009 (r191058) +++ projects/mesh11s/lib/libarchive/archive_string.c Tue Apr 14 13:43:09 2009 (r191059) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_WCHAR_H #include #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include #endif @@ -115,11 +115,11 @@ __archive_string_ensure(struct archive_s as->buffer_length = 32; else if (as->buffer_length < 8192) /* Buffers under 8k are doubled for speed. */ - as->buffer_length *= 2; + as->buffer_length += as->buffer_length; else { /* Buffers 8k and over grow by at least 25% each time. */ size_t old_length = as->buffer_length; - as->buffer_length = (as->buffer_length * 5) / 4; + as->buffer_length += as->buffer_length / 4; /* Be safe: If size wraps, release buffer and return NULL. */ if (as->buffer_length < old_length) { free(as->s); @@ -142,10 +142,12 @@ __archive_string_ensure(struct archive_s } struct archive_string * -__archive_strncat(struct archive_string *as, const char *p, size_t n) +__archive_strncat(struct archive_string *as, const void *_p, size_t n) { size_t s; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Apr 14 16:24:57 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A2891065675; Tue, 14 Apr 2009 16:24:57 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC4478FC12; Tue, 14 Apr 2009 16:24:56 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EGOuSh013388; Tue, 14 Apr 2009 16:24:56 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EGOuoW013387; Tue, 14 Apr 2009 16:24:56 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904141624.n3EGOuoW013387@svn.freebsd.org> From: Rui Paulo Date: Tue, 14 Apr 2009 16:24:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191062 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 16:24:57 -0000 Author: rpaulo Date: Tue Apr 14 16:24:56 2009 New Revision: 191062 URL: http://svn.freebsd.org/changeset/base/191062 Log: Remove a printf that snuck in. Modified: projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Tue Apr 14 14:19:18 2009 (r191061) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Tue Apr 14 16:24:56 2009 (r191062) @@ -207,7 +207,6 @@ ieee80211_start(struct ifnet *ifp) } if (ni->ni_associd == 0 && (ni->ni_flags & IEEE80211_NODE_ASSOCID)) { - printf("%x %x\n", ni->ni_associd, ni->ni_flags); IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_OUTPUT, eh->ether_dhost, NULL, "sta not associated (type 0x%04x)", From owner-svn-src-projects@FreeBSD.ORG Tue Apr 14 19:51:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 625BD1065670; Tue, 14 Apr 2009 19:51:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50BF38FC0C; Tue, 14 Apr 2009 19:51:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EJpEpc018050; Tue, 14 Apr 2009 19:51:14 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EJpEZb018049; Tue, 14 Apr 2009 19:51:14 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904141951.n3EJpEZb018049@svn.freebsd.org> From: Rui Paulo Date: Tue, 14 Apr 2009 19:51:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191074 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 19:51:14 -0000 Author: rpaulo Date: Tue Apr 14 19:51:14 2009 New Revision: 191074 URL: http://svn.freebsd.org/changeset/base/191074 Log: Restore revisions 189493 and 189495 that were mismerged. Modified: projects/mesh11s/sys/net80211/ieee80211.h Modified: projects/mesh11s/sys/net80211/ieee80211.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211.h Tue Apr 14 19:20:27 2009 (r191073) +++ projects/mesh11s/sys/net80211/ieee80211.h Tue Apr 14 19:51:14 2009 (r191074) @@ -696,6 +696,36 @@ enum { IEEE80211_ELEMID_TPC = 150, IEEE80211_ELEMID_CCKM = 156, IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ + + /* + * XXXRP: new IEs for 11s. Keep them compatible with Linux until + * ANA defines new ones. + */ + IEEE80211_ELEMID_MESHCONF = 51, + IEEE80211_ELEMID_MESHID = 52, + IEEE80211_ELEMID_MESHLINK = 55, + IEEE80211_ELEMID_MESHCNGST = 36, + IEEE80211_ELEMID_MESHPEER = 37, + IEEE80211_ELEMID_MESHCSA = 38, + IEEE80211_ELEMID_MESHTIM = 39, + IEEE80211_ELEMID_MESHAWAKEW = 40, + IEEE80211_ELEMID_MESHBEACONT = 41, + IEEE80211_ELEMID_MESHTIMINGINFO = 42, + IEEE80211_ELEMID_MESHSYNCPROTO = 43, + IEEE80211_ELEMID_MESHDAOPSREQ = 44, /* MDAOP Setup Request */ + IEEE80211_ELEMID_MESHDAOPSREPLY = 45, /* MDAOP Setup Request */ + IEEE80211_ELEMID_MESHDAOPADV = 46, /* MDAOP Advertisements */ + IEEE80211_ELEMID_MESHDAOPST = 47, /* MDAOP Set Teardown */ + IEEE80211_ELEMID_MESHPANN = 48, + IEEE80211_ELEMID_MESHRANN = 49, + IEEE80211_ELEMID_MESHPREQ = 68, + IEEE80211_ELEMID_MESHPREP = 69, + IEEE80211_ELEMID_MESHPERR = 70, + IEEE80211_ELEMID_MESHPU = 53, + IEEE80211_ELEMID_MESHPUC = 54, + IEEE80211_ELEMID_MESHSC = 55, + IEEE80211_ELEMID_MESHSA = 56, + IEEE80211_ELEMID_MESHACT = 57, /* Anti-Clogging Token */ }; struct ieee80211_tim_ie { @@ -745,6 +775,253 @@ struct ieee80211_csa_ie { #define IEEE80211_ERP_BITS \ "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE" +/* + * 802.11s Information Elements. +*/ +/* Mesh Configuration */ +struct ieee80211_meshconf_ie { + uint8_t conf_ie; /* IEEE80211_ELEMID_MESHCONF */ + uint8_t conf_len; + uint8_t conf_ver; + uint32_t conf_apspi; /* Active Path Sel. Proto. ID */ + uint32_t conf_apsmi; /* APS Metric Identifier */ + uint32_t conf_ccmi; /* Congestion Control Mode ID */ + uint8_t conf_meshinfo; + uint8_t conf_meshcap; +} __packed; + +/* Mesh Identifier */ +struct ieee80211_meshid_ie { + uint8_t id_ie; /* IEEE80211_ELEMID_MESHID */ + uint8_t id_len; +} __packed; + +#define IEEE80211_MESHID_MAX_SIZE \ + (sizeof(struct ieee80211_meshid_ie) + 32) + +/* Link Metric Report */ +struct ieee80211_meshlink_ie { + uint8_t link_ie; /* IEEE80211_ELEMID_MESHLINK */ + uint8_t link_len; + /* XXXRP: missing variable metric */ +} __packed; + +/* Congestion Notification */ +struct ieee80211_meshcngst_ie { + uint8_t cngst_ie; /* IEEE80211_ELEMID_MESHCNGST */ + uint8_t cngst_len; + uint16_t cngst_timer[4]; /* Expiration Timers: AC_BK, + AC_BE, AC_VI, AC_VO */ +} __packed; + +/* Peer Link Management */ +struct ieee80211_meshpeer_ie { + uint8_t peer_ie; /* IEEE80211_ELEMID_MESHPEER */ + uint8_t peer_len; + uint8_t peer_subtype; + uint16_t peer_llinkid; /* Local Link ID */ + uint16_t peer_linkid; /* Peer Link ID */ + uint16_t peer_rcode; +} __packed; + +enum { + IEEE80211_MESH_PEER_LINK_OPEN = 0, + IEEE80211_MESH_PEER_LINK_CONFIRM = 1, + IEEE80211_MESH_PEER_LINK_CLOSE = 2, + /* values 3-255 are reserved */ +}; + +/* Mesh Channel Switch Annoucement */ +struct ieee80211_meshcsa_ie { + uint8_t csa_ie; /* IEEE80211_ELEMID_MESHCSA */ + uint8_t csa_len; + uint8_t csa_mode; + uint8_t csa_newclass; /* New Regulatory Class */ + uint8_t csa_newchan; + uint8_t csa_precvalue; /* Precedence Value */ + uint8_t csa_count; +} __packed; + +/* XXXRP: this is equal to the non mesh version. Should we simplify ? */ +/* Mesh TIM */ +struct ieee80211_meshtim_ie { + uint8_t tim_ie; /* IEEE80211_ELEMID_MESHTIM */ + uint8_t tim_len; + uint8_t tim_count; /* DTIM count */ + uint8_t tim_period; /* DTIM period */ + uint8_t tim_bitctl; /* bitmap control */ + uint8_t tim_bitmap[1]; /* variable-length bitmap */ +} __packed; + +/* Mesh Awake Window */ +struct ieee80211_meshawakew_ie { + uint8_t awakew_ie; /* IEEE80211_ELEMID_MESHAWAKEW */ + uint8_t awakew_len; + uint8_t awakew_windowlen; /* in TUs */ +} __packed; + +/* Mesh Beacon Timing */ +struct ieee80211_meshbeacont_ie { + uint8_t beacont_ie; /* IEEE80211_ELEMID_MESHBEACONT */ + uint8_t beacont_len; + struct { + uint8_t mp_aid; /* Least Octet of AID */ + uint16_t mp_btime; /* Beacon Time */ + uint16_t mp_bint; /* Beacon Interval */ + } mp[1] __packed; /* NB: variable size */ +} __packed; + +/* Mesh Timing Info */ +struct ieee80211_meshtinfo_ie { + uint8_t tinfo_ie; /* IEEE80211_ELEMID_MESHTIMINGINFO */ + uint8_t tinfo_len; + uint8_t tinfo_field; +} __packed; + +#define IEEE80211_MESH_TINFO_BEACON_PARAMS_CHANGED (1 << 8) +#define IEEE80211_MESH_TINFO_MDA_ENABLED (1 << 7) + +/* Synchronization Protocol */ +struct ieee80211_meshsyncproto_ie { + uint8_t syncproto_ie; /* IEEE80211_ELEMID_MESHSYNCPROTO */ + uint8_t syncproto_len; + uint32_t syncproto_id; /* Sync Protocol ID OUI */ +} __packed; + +/* Neighbour Offset Protocol */ +#define IEEE80211_MESH_SYNCPROTO_NEIGHOFFSET_OUI 0x000fac +#define IEEE80211_MESH_SYNCPROTO_NEIGHOFFSET_VALUE 0 + +/* MDAOP Setup Request */ +struct ieee80211_meshdaopsreq_ie { + uint8_t daopsreq_ie; /* IEEE80211_ELEMID_MESHDAOPSREQ */ + uint8_t daopsreq_len; + uint8_t daopsreq_setid; + uint32_t daposreq_reserv; /* MDAOP Reservation */ +} __packed; + +/* MDAOP Setup Reply */ +struct ieee80211_meshdaopsrep_ie { + uint8_t daopsrep_ie; /* IEEE80211_ELEMID_MESHDAOPSREPLY */ + uint8_t daopsrep_len; + uint8_t daopsrep_setid; + uint8_t daopsrep_code; /* Reply Code */ + uint8_t daopsrep_reserv; /* MDAOP Reservation */ +} __packed; + +enum { + IEEE80211_MESH_DAOP_REPLY_ACCEPT = 0, + IEEE80211_MESH_DAOP_REPLY_RESERV_CONFLICT = 1, + IEEE80211_MESH_DAOP_REPLY_MAF_LIMIT = 2, + /* everything else is reserved */ +}; + +/* MDAOP Advertisements */ +/* TBD */ + + +/* MDAOP Set Teardown */ +struct ieee80211_meshdaopst_ie { + uint8_t daopsrep_ie; /* IEEE80211_ELEMID_MESHDAOPSREP */ + uint8_t daopsrep_len; + uint8_t daopsrep_setid; + uint8_t daopsrep_setowner[IEEE80211_ADDR_LEN]; +} __packed; + +/* Portal (MP) Annoucement */ +struct ieee80211_meshpann_ie { + uint8_t pann_ie; /* IEEE80211_ELEMID_MESHPANN */ + uint8_t pann_len; + uint8_t pann_flags; + uint8_t pann_hopcount; + uint8_t pann_ttl; + uint8_t pann_addr[IEEE80211_ADDR_LEN]; + uint8_t pann_seq; /* PANN Sequence Number */ +} __packed; + +/* Root (MP) Annoucement */ +struct ieee80211_meshrann_ie { + uint8_t rann_ie; /* IEEE80211_ELEMID_MESHRANN */ + uint8_t rann_len; + uint8_t rann_flags; + uint8_t rann_hopcount; + uint8_t rann_ttl; + uint8_t rann_addr[IEEE80211_ADDR_LEN]; + uint32_t rann_seq; /* HWMP Sequence Number */ + uint32_t rann_metric; +} __packed; + +/* Mesh Path Request */ +struct ieee80211_meshpreq_ie { + uint8_t preq_ie; /* IEEE80211_ELEMID_MESHPREQ */ + uint8_t preq_len; + /* XXXRP: TBD */ +} __packed; + +/* Mesh Path Reply */ +struct ieee80211_meshprep_ie { + uint8_t prep_ie; /* IEEE80211_ELEMID_MESHPREP */ + uint8_t prep_len; + /* XXXRP: TBD */ +} __packed; + +/* Mesh Path Error */ +struct ieee80211_meshperr_ie { + uint8_t perr_ie; /* IEEE80211_ELEMID_MESHPERR */ + uint8_t perr_len; + uint8_t perr_mode; + uint8_t perr_ndests; /* Number of Destinations */ + struct { + uint8_t dest_addr[IEEE80211_ADDR_LEN]; + uint32_t dest_seq; + } dests[1] __packed; /* NB: variable size */ +} __packed; + +/* Mesh Proxy Update */ +struct ieee80211_meshpu_ie { + uint8_t pu_ie; /* IEEE80211_ELEMID_MESHPU */ + uint8_t pu_len; + /* XXXRP: TBD */ +} __packed; + +/* Mesh Proxy Update Confirmation */ +struct ieee80211_meshpuc_ie { + uint8_t puc_ie; /* IEEE80211_ELEMID_MESHPUC */ + uint8_t puc_len; + uint8_t puc_flags; + uint8_t puc_seq; /* PU Sequence Number */ + uint8_t puc_daddr[IEEE80211_ADDR_LEN]; +} __packed; + +/* Mesh Security Capability */ +struct ieee80211_meshsc_ie { + uint8_t sc_ie; /* IEEE80211_ELEMID_MESHSC */ + uint8_t sc_len; + uint8_t sc_mkdid[IEEE80211_ADDR_LEN]; /* MKD Domain ID */ + uint8_t sc_sconfig; /* Security Configuration */ +} __packed; + +/* Mesh Security Authentication */ +struct ieee80211_meshsa_ie { + uint8_t sa_ie; /* IEEE80211_ELEMID_MESHSA */ + uint8_t sa_len; + uint8_t sa_handshake; + uint8_t sa_maid[IEEE80211_ADDR_LEN]; /* MA-ID */ + uint8_t sa_lmpid[IEEE80211_ADDR_LEN]; + uint32_t sa_akm; /* Selected AKM Suite */ + uint32_t sa_pcs; /* Selected Pairwise Cipher Suite */ + uint8_t sa_pmk[16]; + uint8_t sa_lnonce[32]; + uint8_t sa_pnonce[32]; + /* XXX more parameters */ +} __packed; + +/* Mesh Anti-Clogging Token */ +struct ieee80211_meshact_ie { + uint8_t act_ie; /* IEEE80211_ELEMID_MESHACT */ + uint8_t act_len; +} __packed; + #define ATH_OUI 0x7f0300 /* Atheros OUI */ #define ATH_OUI_TYPE 0x01 /* Atheros protocol ie */ @@ -872,6 +1149,19 @@ enum { IEEE80211_REASON_BAD_MECHANISM = 37, /* 11e */ IEEE80211_REASON_SETUP_NEEDED = 38, /* 11e */ IEEE80211_REASON_TIMEOUT = 39, /* 11e */ + /* values not yet allocated by ANA */ + IEEE80211_REASON_PEER_LINK_CANCELED = 2, /* 11s */ + IEEE80211_REASON_MESH_MAX_PEERS = 3, /* 11s */ + IEEE80211_REASON_MESH_CAP_POLICY_VIOLATION = 4, /* 11s */ + IEEE80211_REASON_MESH_CLOSE_RCVD = 5, /* 11s */ + IEEE80211_REASON_MESH_MAX_RETRIES = 6, /* 11s */ + IEEE80211_REASON_MESH_CONFIRM_TIMEOUT = 7, /* 11s */ + IEEE80211_REASON_MESH_SEC_ROLE_NEG_DIFFERS = 8, /* 11s */ + IEEE80211_REASON_MESH_SEC_AUTH_IMPOSSIBLE = 9, /* 11s */ + IEEE80211_REASON_MESH_SEC_FAILED_VERIF = 10, /* 11s */ + IEEE80211_REASON_MESH_INVALID_GTK = 11, /* 11s */ + IEEE80211_REASON_MESH_MISMATCH_GTK = 12, /* 11s */ + IEEE80211_REASON_MESH_INCONSISTENT_PARAMS = 13, /* 11s */ IEEE80211_STATUS_SUCCESS = 0, IEEE80211_STATUS_UNSPECIFIED = 1, @@ -899,6 +1189,18 @@ enum { IEEE80211_STATUS_UNSUPP_RSN_IE_VERSION = 44, /* 11i */ IEEE80211_STATUS_INVALID_RSN_IE_CAP = 45, /* 11i */ IEEE80211_STATUS_CIPHER_SUITE_REJECTED = 46, /* 11i */ + /* values not yet allocated by ANA */ + IEEE80211_STATUS_PEER_LINK_ESTABLISHED = 14, /* 11s */ + IEEE80211_STATUS_PEER_LINK_CLOSED = 15, /* 11s */ + /* XXXRP: no identifiers for 16-17 */ + IEEE80211_STATUS_PEER_LINK_MAX_RETRIES = 18, /* 11s */ + IEEE80211_STATUS_PEER_LINK_NO_PMK = 19, /* 11s */ + IEEE80211_STATUS_PEER_LINK_ALT_PMK = 20, /* 11s */ + IEEE80211_STATUS_PEER_LINK_NO_AKM = 21, /* 11s */ + IEEE80211_STATUS_PEER_LINK_ALT_AKM = 22, /* 11s */ + IEEE80211_STATUS_PEER_LINK_NO_KDF = 23, /* 11s */ + IEEE80211_STATUS_PEER_LINK_SA_ESTABLISHED = 24, /* 11s */ + /* XXRP: no identifier for 25 */ }; #define IEEE80211_WEP_KEYLEN 5 /* 40bit */ From owner-svn-src-projects@FreeBSD.ORG Tue Apr 14 22:53:23 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1984C1065677; Tue, 14 Apr 2009 22:53:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0630E8FC13; Tue, 14 Apr 2009 22:53:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EMrNQZ022326; Tue, 14 Apr 2009 22:53:23 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EMrMXZ022304; Tue, 14 Apr 2009 22:53:22 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904142253.n3EMrMXZ022304@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 14 Apr 2009 22:53:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191079 - in projects/mips/sys: conf dev/siba mips/alchemy mips/atheros mips/conf mips/include mips/mips mips/sentry5 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 22:53:23 -0000 Author: gonzo Date: Tue Apr 14 22:53:22 2009 New Revision: 191079 URL: http://svn.freebsd.org/changeset/base/191079 Log: - Revert changes accidentally killed by merge operation Added: projects/mips/sys/dev/siba/siba_cc.c - copied unchanged from r190983, projects/mips/sys/dev/siba/siba_cc.c projects/mips/sys/dev/siba/siba_mips.c - copied unchanged from r190983, projects/mips/sys/dev/siba/siba_mips.c projects/mips/sys/dev/siba/siba_sdram.c - copied unchanged from r190983, projects/mips/sys/dev/siba/siba_sdram.c projects/mips/sys/mips/alchemy/ - copied from r190983, projects/mips/sys/mips/alchemy/ projects/mips/sys/mips/atheros/ - copied from r190983, projects/mips/sys/mips/atheros/ projects/mips/sys/mips/conf/ALCHEMY - copied unchanged from r190983, projects/mips/sys/mips/conf/ALCHEMY projects/mips/sys/mips/conf/AR71XX - copied unchanged from r190983, projects/mips/sys/mips/conf/AR71XX projects/mips/sys/mips/conf/AR71XX.hints - copied unchanged from r190983, projects/mips/sys/mips/conf/AR71XX.hints projects/mips/sys/mips/mips/elf_trampoline.c - copied unchanged from r190983, projects/mips/sys/mips/mips/elf_trampoline.c projects/mips/sys/mips/mips/inckern.S - copied unchanged from r190983, projects/mips/sys/mips/mips/inckern.S Deleted: projects/mips/sys/mips/sentry5/siba_cc.c projects/mips/sys/mips/sentry5/siba_mips.c projects/mips/sys/mips/sentry5/siba_sdram.c Modified: projects/mips/sys/conf/Makefile.mips projects/mips/sys/conf/files.mips projects/mips/sys/conf/ldscript.mips projects/mips/sys/mips/conf/ADM5120 projects/mips/sys/mips/conf/MALTA projects/mips/sys/mips/conf/QEMU projects/mips/sys/mips/conf/SENTRY5 projects/mips/sys/mips/include/bus.h projects/mips/sys/mips/mips/elf_machdep.c projects/mips/sys/mips/mips/nexus.c projects/mips/sys/mips/sentry5/files.sentry5 Modified: projects/mips/sys/conf/Makefile.mips ============================================================================== --- projects/mips/sys/conf/Makefile.mips Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/conf/Makefile.mips Tue Apr 14 22:53:22 2009 (r191079) @@ -28,35 +28,73 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" +SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M} +SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} + # XXX: Such sweeping assumptions... MACHINE=mips MACHINE_ARCH=mips +KERNLOADADDR?=0x80001000 +# This obscure value is defined by CFE for WR160N +# To be changed later +TRAMPLOADADDR?=0x807963c0 MKMODULESENV+= MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} # We default to the MIPS32 ISA, if none specified in the # kernel configuration file. ARCH_FLAGS?=-march=mips32 +EXTRA_FLAGS=-fno-pic -mno-abicalls -mno-dsp -G0 HACK_EXTRA_FLAGS=-shared .if defined(TARGET_BIG_ENDIAN) CFLAGS+=-EB SYSTEM_LD+=-EB +EXTRA_FLAGS+=-EB +TRAMP_LDFLAGS+=-Wl,-EB HACK_EXTRA_FLAGS+=-EB -Wl,-EB .else CFLAGS+=-EL SYSTEM_LD+=-EL +EXTRA_FLAGS+=-EL +TRAMP_LDFLAGS+=-Wl,-EL HACK_EXTRA_FLAGS+=-EL -Wl,-EL .endif # We add the -fno-pic flag to kernels because otherwise performance # is extremely poor, as well as -mno-abicalls to force no ABI usage. -CFLAGS+=-fno-pic -mno-abicalls -G0 $(ARCH_FLAGS) -HACK_EXTRA_FLAGS+=-fno-pic -mno-abicalls -G0 $(ARCH_FLAGS) +CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) +HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) # XXX hardcoded kernel entry point ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE +KERNEL_EXTRA=trampoline +trampoline: ${KERNEL_KO}.tramp.bin +${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \ + $S/$M/$M/inckern.S + ${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \ + -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp + sed s/${KERNLOADADDR}/${TRAMPLOADADDR}/ ldscript.$M | \ + sed s/" + SIZEOF_HEADERS"// > ldscript.$M.tramp.noheader + # Generate .S file that setups stack and jumps to trampoline + echo "#include " >tmphack.S + echo "ENTRY(_start)" >>tmphack.S + echo "la t0, kernel_end" >>tmphack.S + echo "move sp, t0" >>tmphack.S + echo "add sp, 0x2000" >>tmphack.S + echo "and sp, ~0x7" >>tmphack.S + echo "la t0, _startC" >>tmphack.S + echo "j t0" >>tmphack.S + echo "END(_start)" >>tmphack.S + echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h + ${CC} -O -nostdlib -I. -I$S ${EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ + -T -Xlinker ldscript.$M.tramp.noheader tmphack.S \ + $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ + -o ${KERNEL_KO}.tramp.noheader + ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ + ${KERNEL_KO}.tramp.bin \ + %BEFORE_DEPEND %OBJS @@ -69,6 +107,12 @@ ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE %CLEAN +CLEAN+= ldscript.$M ldscript.$M.tramp.noheader \ + ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin + +ldscript.$M: $S/conf/ldscript.$M + cat $S/conf/ldscript.$M|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ + > ldscript.$M %RULES .include "$S/conf/kern.post.mk" Modified: projects/mips/sys/conf/files.mips ============================================================================== --- projects/mips/sys/conf/files.mips Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/conf/files.mips Tue Apr 14 22:53:22 2009 (r191079) @@ -96,3 +96,7 @@ dev/cfe/cfe_api.c optional cfe dev/cfe/cfe_console.c optional cfe_console #dev/cfe/cfe_resource.c optional cfe # not yet needed +dev/siba/siba.c optional siba +dev/siba/siba_pcib.c optional siba pci +dev/siba/siba_cc.c optional siba +#mips/sentry5/siba_mips.c optional siba # not yet Modified: projects/mips/sys/conf/ldscript.mips ============================================================================== --- projects/mips/sys/conf/ldscript.mips Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/conf/ldscript.mips Tue Apr 14 22:53:22 2009 (r191079) @@ -43,7 +43,7 @@ PROVIDE (_DYNAMIC = 0); SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x80100000 + SIZEOF_HEADERS; + . = KERNLOADADDR + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } Copied: projects/mips/sys/dev/siba/siba_cc.c (from r190983, projects/mips/sys/dev/siba/siba_cc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/dev/siba/siba_cc.c Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/dev/siba/siba_cc.c) @@ -0,0 +1,154 @@ +/*- + * Copyright (c) 2007 Bruce M. Simpson. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Child driver for ChipCommon core. + * This is not MI code at the moment. + * Two 16C550 compatible UARTs live here. On the WGT634U, uart1 is the + * system console, and uart0 is not pinned out. + * Because their presence is conditional, they should probably + * be attached from here. + * GPIO lives here. + * The hardware watchdog lives here. + * Clock control registers live here. + * You don't need to read them to determine the clock speed on the 5365, + * which is always 200MHz and thus may be hardcoded (for now). + * Flash config registers live here. There may or may not be system flash. + * The external interface bus lives here (conditionally). + * There is a JTAG interface here which may be used to attach probes to + * the SoC for debugging. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +static int siba_cc_attach(device_t); +static int siba_cc_probe(device_t); +static void siba_cc_intr(void *v); + +static int +siba_cc_probe(device_t dev) +{ + + if (siba_get_vendor(dev) == SIBA_VID_BROADCOM && + siba_get_device(dev) == SIBA_DEVID_CHIPCOMMON) { + device_set_desc(dev, "ChipCommon core"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +struct siba_cc_softc { + void *notused; +}; + +static int +siba_cc_attach(device_t dev) +{ + //struct siba_cc_softc *sc = device_get_softc(dev); + struct resource *mem; + struct resource *irq; + int rid; + + /* + * Allocate the resources which the parent bus has already + * determined for us. + * TODO: interrupt routing + */ +#define MIPS_MEM_RID 0x20 + rid = MIPS_MEM_RID; + mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (mem == NULL) { + device_printf(dev, "unable to allocate memory\n"); + return (ENXIO); + } + + rid = 0; + irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0); + if (irq == NULL) { + device_printf(dev, "unable to allocate irq\n"); + return (ENXIO); + } + + /* now setup the interrupt */ + /* may be fast, exclusive or mpsafe at a later date */ + + /* + * XXX is this interrupt line in ChipCommon used for anything + * other than the uart? in that case we shouldn't hog it ourselves + * and let uart claim it to avoid polled mode. + */ + int err; + void *cookie; + err = bus_setup_intr(dev, irq, INTR_TYPE_TTY, NULL, siba_cc_intr, NULL, + &cookie); + if (err != 0) { + device_printf(dev, "unable to setup intr\n"); + return (ENXIO); + } + + /* TODO: attach uart child */ + + return (0); +} + +static void +siba_cc_intr(void *v) +{ + +} + +static device_method_t siba_cc_methods[] = { + /* Device interface */ + DEVMETHOD(device_attach, siba_cc_attach), + DEVMETHOD(device_probe, siba_cc_probe), + + {0, 0}, +}; + +static driver_t siba_cc_driver = { + "siba_cc", + siba_cc_methods, + sizeof(struct siba_softc), +}; +static devclass_t siba_cc_devclass; + +DRIVER_MODULE(siba_cc, siba, siba_cc_driver, siba_cc_devclass, 0, 0); Copied: projects/mips/sys/dev/siba/siba_mips.c (from r190983, projects/mips/sys/dev/siba/siba_mips.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/dev/siba/siba_mips.c Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/dev/siba/siba_mips.c) @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2007 Bruce M. Simpson. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Child driver for MIPS 3302 core. + * Interrupt controller registers live here. Interrupts may not be routed + * to the MIPS core if they are masked out. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +static int siba_mips_attach(device_t); +static int siba_mips_probe(device_t); + +static int +siba_mips_probe(device_t dev) +{ + + if (siba_get_vendor(dev) == SIBA_VID_BROADCOM && + siba_get_device(dev) == SIBA_DEVID_MIPS_3302) { + device_set_desc(dev, "MIPS 3302 processor"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +struct siba_mips_softc { + void *notused; +}; + +static int +siba_mips_attach(device_t dev) +{ + //struct siba_mips_softc *sc = device_get_softc(dev); + struct resource *mem; + int rid; + + /* + * Allocate the resources which the parent bus has already + * determined for us. + * TODO: interrupt routing + */ +#define MIPS_MEM_RID 0x20 + rid = MIPS_MEM_RID; + mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (mem == NULL) { + device_printf(dev, "unable to allocate memory\n"); + return (ENXIO); + } +#if 0 + device_printf(dev, "start %08lx size %04lx\n", + rman_get_start(mem), rman_get_size(mem)); +#endif + + return (0); +} + +static device_method_t siba_mips_methods[] = { + /* Device interface */ + DEVMETHOD(device_attach, siba_mips_attach), + DEVMETHOD(device_probe, siba_mips_probe), + + {0, 0}, +}; + +static driver_t siba_mips_driver = { + "siba_mips", + siba_mips_methods, + sizeof(struct siba_softc), +}; +static devclass_t siba_mips_devclass; + +DRIVER_MODULE(siba_mips, siba, siba_mips_driver, siba_mips_devclass, 0, 0); Copied: projects/mips/sys/dev/siba/siba_sdram.c (from r190983, projects/mips/sys/dev/siba/siba_sdram.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/dev/siba/siba_sdram.c Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/dev/siba/siba_sdram.c) @@ -0,0 +1,114 @@ +/*- + * Copyright (c) 2007 Bruce M. Simpson. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Child driver for SDRAM/DDR controller core. + * Generally the OS should not need to access this device unless the + * firmware has not configured the SDRAM controller. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +static int siba_sdram_attach(device_t); +static int siba_sdram_probe(device_t); + +static int +siba_sdram_probe(device_t dev) +{ + + if (siba_get_vendor(dev) == SIBA_VID_BROADCOM && + siba_get_device(dev) == SIBA_DEVID_SDRAMDDR) { + device_set_desc(dev, "SDRAM/DDR core"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +struct siba_sdram_softc { + void *notused; +}; + +static int +siba_sdram_attach(device_t dev) +{ + //struct siba_sdram_softc *sc = device_get_softc(dev); + struct resource *mem; + int rid; + + /* + * Allocate the resources which the parent bus has already + * determined for us. + * TODO: interrupt routing + */ +#define MIPS_MEM_RID 0x20 + rid = MIPS_MEM_RID; + mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (mem == NULL) { + device_printf(dev, "unable to allocate memory\n"); + return (ENXIO); + } + +#if 0 + device_printf(dev, "start %08lx size %04lx\n", + rman_get_start(mem), rman_get_size(mem)); +#endif + + return (0); +} + +static device_method_t siba_sdram_methods[] = { + /* Device interface */ + DEVMETHOD(device_attach, siba_sdram_attach), + DEVMETHOD(device_probe, siba_sdram_probe), + + {0, 0}, +}; + +static driver_t siba_sdram_driver = { + "siba_sdram", + siba_sdram_methods, + sizeof(struct siba_softc), +}; +static devclass_t siba_sdram_devclass; + +DRIVER_MODULE(siba_sdram, siba, siba_sdram_driver, siba_sdram_devclass, 0, 0); Modified: projects/mips/sys/mips/conf/ADM5120 ============================================================================== --- projects/mips/sys/mips/conf/ADM5120 Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/conf/ADM5120 Tue Apr 14 22:53:22 2009 (r191079) @@ -25,7 +25,6 @@ makeoptions MIPS_LITTLE_ENDIAN=defined # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" hints "ADM5120.hints" #Default places to look for devices. Copied: projects/mips/sys/mips/conf/ALCHEMY (from r190983, projects/mips/sys/mips/conf/ALCHEMY) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/conf/ALCHEMY Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/mips/conf/ALCHEMY) @@ -0,0 +1,66 @@ +# ALCHEMY -- Generic kernel for Alchemy Au1xxx CPUs. +# +# For more information on this file, please read the handbook section on +# Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +ident ALCHEMY + +makeoptions ARCH_FLAGS=-march=mips32 +makeoptions MIPS_LITTLE_ENDIAN=defined + +# Don't build any modules yet. +makeoptions MODULES_OVERRIDE="" + +include "../alchemy/std.alchemy" + +hints "ALCHEMY.hints" #Default places to look for devices. + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols + +options DDB +options KDB + +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions + +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=admsw0 +options BOOTP_COMPAT + +# options FFS #Berkeley Fast Filesystem +# options SOFTUPDATES #Enable FFS soft updates support +# options UFS_ACL #Support for access control lists +# options UFS_DIRHASH #Improve performance on big directories +options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" + + +# Debugging for use in -current +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + +device loop +device ether +device uart +# device md Copied: projects/mips/sys/mips/conf/AR71XX (from r190983, projects/mips/sys/mips/conf/AR71XX) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/conf/AR71XX Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/mips/conf/AR71XX) @@ -0,0 +1,37 @@ +# +# $FreeBSD$ +# + +ident AR71XX +cpu CPU_MIPS4KC +options CPU_NOFPU +options ISA_MIPS32 +makeoptions TARGET_BIG_ENDIAN +makeoptions KERNLOADADDR=0x80050000 + +files "../atheros/files.ar71xx" +hints "AR71XX.hints" + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="" + +options DDB +options KDB + +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions + +# Debugging for use in -current +options INVARIANTS +options INVARIANT_SUPPORT + +device pci +device uart + +device loop +device ether +device md Copied: projects/mips/sys/mips/conf/AR71XX.hints (from r190983, projects/mips/sys/mips/conf/AR71XX.hints) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/conf/AR71XX.hints Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/mips/conf/AR71XX.hints) @@ -0,0 +1,25 @@ +# $FreeBSD$ +hint.apb.0.at="nexus0" +hint.apb.0.maddr=0x18000000 +hint.apb.0.msize=0x01000000 +hint.apb.0.irq=4 + +# uart0 +hint.uart.0.at="apb0" +# see atheros/uart_cpu_ar71xx.c why +3 +hint.uart.0.maddr=0x18020003 +hint.uart.0.msize=0x18 +hint.uart.0.irq=3 + +# pci +hint.pcib.0.at="nexus0" +hint.pcib.0.irq=0 + +hint.arge.0.at="nexus0" +hint.arge.0.maddr=0x19000000 +hint.arge.0.msize=0x1000 +hint.arge.0.irq=2 +# hint.arge.1.at="nexus0" +# hint.arge.1.maddr=0x1A000000 +# hint.arge.1.msize=0x1000 +# hint.arge.1.irq=3 Modified: projects/mips/sys/mips/conf/MALTA ============================================================================== --- projects/mips/sys/mips/conf/MALTA Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/conf/MALTA Tue Apr 14 22:53:22 2009 (r191079) @@ -27,7 +27,6 @@ options YAMON # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 options TICK_USE_YAMON_FREQ=defined #options TICK_USE_MALTA_RTC=defined Modified: projects/mips/sys/mips/conf/QEMU ============================================================================== --- projects/mips/sys/mips/conf/QEMU Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/conf/QEMU Tue Apr 14 22:53:22 2009 (r191079) @@ -27,7 +27,6 @@ makeoptions ARCH_FLAGS=-march=mips32 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" #hints "GENERIC.hints" #Default places to look for devices. Modified: projects/mips/sys/mips/conf/SENTRY5 ============================================================================== --- projects/mips/sys/mips/conf/SENTRY5 Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/conf/SENTRY5 Tue Apr 14 22:53:22 2009 (r191079) @@ -41,13 +41,6 @@ options CFE options CFE_CONSOLE options ALT_BREAK_TO_DEBUGGER -# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards -# offsets in the linked elf image (see ldscript hack) -# XXX can we conditionalize the linker stuff on options CFE? -options KERNVIRTADDR=0x80001000 - -makeoptions LDSCRIPT_NAME= ldscript.mips.cfe - #makeoptions ARCH_FLAGS=-march=mips32 makeoptions MIPS_LITTLE_ENDIAN=defined makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -73,8 +66,8 @@ options INVARIANT_SUPPORT device siba # Sonics SiliconBackplane device pci # siba_pcib -device bfe # XXX will build both pci and siba -device miibus # attachments +# device bfe # XXX will build both pci and siba +# device miibus # attachments # pci devices # notyet: Modified: projects/mips/sys/mips/include/bus.h ============================================================================== --- projects/mips/sys/mips/include/bus.h Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/include/bus.h Tue Apr 14 22:53:22 2009 (r191079) @@ -101,9 +101,8 @@ * Map a region of device bus space into CPU virtual address space. */ -static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int flags, - bus_space_handle_t *bshp); +__inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + bus_size_t size, int flags, bus_space_handle_t *bshp); static __inline int bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, Modified: projects/mips/sys/mips/mips/elf_machdep.c ============================================================================== --- projects/mips/sys/mips/mips/elf_machdep.c Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/mips/elf_machdep.c Tue Apr 14 22:53:22 2009 (r191079) @@ -86,8 +86,7 @@ static Elf32_Brandinfo freebsd_brand_inf .interp_path = "/libexec/ld-elf.so.1", .sysvec = &elf32_freebsd_sysvec, .interp_newpath = NULL, - .brand_note = &elf32_freebsd_brandnote, - .flags = BI_BRAND_NOTE + .flags = 0 }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, Copied: projects/mips/sys/mips/mips/elf_trampoline.c (from r190983, projects/mips/sys/mips/mips/elf_trampoline.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/mips/elf_trampoline.c Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/mips/mips/elf_trampoline.c) @@ -0,0 +1,133 @@ +/*- + * Copyright (c) 2005 Olivier Houchard. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); +#include +#include +#include +#include +#include +#include +#include + +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ +#include "opt_global.h" +#include "opt_kernname.h" + +extern char kernel_start[]; +extern char kernel_end[]; + +static __inline void * +memcpy(void *dst, const void *src, int len) +{ + const char *s = src; + char *d = dst; + + while (len) { + if (0 && len >= 4 && !((vm_offset_t)d & 3) && + !((vm_offset_t)s & 3)) { + *(uint32_t *)d = *(uint32_t *)s; + s += 4; + d += 4; + len -= 4; + } else { + *d++ = *s++; + len--; + } + } + return (dst); +} + +static __inline void +bzero(void *addr, int count) +{ + char *tmp = (char *)addr; + + while (count > 0) { + if (count >= 4 && !((vm_offset_t)tmp & 3)) { + *(uint32_t *)tmp = 0; + tmp += 4; + count -= 4; + } else { + *tmp = 0; + tmp++; + count--; + } + } +} + +/* + * Relocate PT_LOAD segements of kernel ELF image to their respective + * virtual addresses and return entry point + */ +void * +load_kernel(void * kstart) +{ + Elf32_Ehdr *eh; + Elf32_Phdr phdr[64] /* XXX */; + int i; + void *entry_point; + + eh = (Elf32_Ehdr *)kstart; + entry_point = (void*)eh->e_entry; + memcpy(phdr, (void *)(kstart + eh->e_phoff ), + eh->e_phnum * sizeof(phdr[0])); + + for (i = 0; i < eh->e_phnum; i++) { + volatile char c; + + if (phdr[i].p_type != PT_LOAD) + continue; + + memcpy((void *)(phdr[i].p_vaddr), + (void*)(kstart + phdr[i].p_offset), phdr[i].p_filesz); + /* Clean space from oversized segments, eg: bss. */ + if (phdr[i].p_filesz < phdr[i].p_memsz) + bzero((void *)(phdr[i].p_vaddr + phdr[i].p_filesz), + phdr[i].p_memsz - phdr[i].p_filesz); + } + + return entry_point; +} + +void +_startC(register_t a0, register_t a1, register_t a2, register_t a3) +{ + unsigned int * code; + int i; + void (*entry_point)(register_t, register_t, register_t, register_t); + + /* + * Relocate segment to the predefined memory location + * Most likely it will be KSEG0/KSEG1 address + */ + entry_point = load_kernel(kernel_start); + + /* Pass saved registers to original _start */ + entry_point(a0, a1, a2, a3); +} Copied: projects/mips/sys/mips/mips/inckern.S (from r190983, projects/mips/sys/mips/mips/inckern.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/mips/inckern.S Tue Apr 14 22:53:22 2009 (r191079, copy of r190983, projects/mips/sys/mips/mips/inckern.S) @@ -0,0 +1,34 @@ +/*- + * Copyright (c) 2005 Olivier Houchard. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "opt_kernname.h" + +#include +__FBSDID("$FreeBSD$") +.section ".real_kernel","aw" +.globl kernel_start; +kernel_start: +.incbin KERNNAME +.globl kernel_end; +kernel_end: Modified: projects/mips/sys/mips/mips/nexus.c ============================================================================== --- projects/mips/sys/mips/mips/nexus.c Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/mips/nexus.c Tue Apr 14 22:53:22 2009 (r191079) @@ -249,6 +249,8 @@ nexus_hinted_child(device_t bus, const c long maddr; int msize; int result; + int irq; + int mem_hints_count; child = BUS_ADD_CHILD(bus, 0, dname, dunit); @@ -256,17 +258,34 @@ nexus_hinted_child(device_t bus, const c * Set hard-wired resources for hinted child using * specific RIDs. */ - resource_long_value(dname, dunit, "maddr", &maddr); - resource_int_value(dname, dunit, "msize", &msize); + mem_hints_count = 0; + if (resource_long_value(dname, dunit, "maddr", &maddr) == 0) + mem_hints_count++; + if (resource_int_value(dname, dunit, "msize", &msize) == 0) + mem_hints_count++; + + /* check if all info for mem resource has been provided */ + if ((mem_hints_count > 0) && (mem_hints_count < 2)) { + printf("Either maddr or msize hint is missing for %s%d\n", + dname, dunit); + } else if (mem_hints_count) { + dprintf("%s: discovered hinted child %s at maddr %p(%d)\n", + __func__, device_get_nameunit(child), + (void *)(intptr_t)maddr, msize); + + result = bus_set_resource(child, SYS_RES_MEMORY, MIPS_MEM_RID, + maddr, msize); + if (result != 0) { + device_printf(bus, + "warning: bus_set_resource() failed\n"); + } + } - dprintf("%s: discovered hinted child %s at maddr %p(%d)\n", - __func__, device_get_nameunit(child), - (void *)(intptr_t)maddr, msize); - - result = bus_set_resource(child, SYS_RES_MEMORY, MIPS_MEM_RID, - maddr, msize); - if (result != 0) { - device_printf(bus, "warning: bus_set_resource() failed\n"); + if (resource_int_value(dname, dunit, "irq", &irq) == 0) { + result = bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1); + if (result != 0) + device_printf(bus, + "warning: bus_set_resource() failed\n"); } } Modified: projects/mips/sys/mips/sentry5/files.sentry5 ============================================================================== --- projects/mips/sys/mips/sentry5/files.sentry5 Tue Apr 14 21:07:47 2009 (r191078) +++ projects/mips/sys/mips/sentry5/files.sentry5 Tue Apr 14 22:53:22 2009 (r191079) @@ -4,11 +4,4 @@ # for USB 1.1 OHCI, Ethernet and IPSEC cores # which are believed to be devices we have drivers for # which just need to be tweaked for attachment to an SSB system bus. - mips/sentry5/s5_machdep.c standard -dev/siba/siba.c optional siba -dev/siba/siba_pcib.c optional siba pci -mips/sentry5/siba_cc.c optional siba - -# notyet -#mips/sentry5/siba_mips.c optional siba From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 01:47:53 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 352631065672; Wed, 15 Apr 2009 01:47:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0982A8FC17; Wed, 15 Apr 2009 01:47:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F1lqQr026934; Wed, 15 Apr 2009 01:47:52 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F1lq7g026933; Wed, 15 Apr 2009 01:47:52 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150147.n3F1lq7g026933@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 01:47:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191083 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 01:47:53 -0000 Author: gonzo Date: Wed Apr 15 01:47:52 2009 New Revision: 191083 URL: http://svn.freebsd.org/changeset/base/191083 Log: - Cleanout stale #ifdef'ed chunk of code - Fix whitespaces - Explicitly undefine NEXUS_DEBUG flag Modified: projects/mips/sys/mips/mips/nexus.c Modified: projects/mips/sys/mips/mips/nexus.c ============================================================================== --- projects/mips/sys/mips/mips/nexus.c Tue Apr 14 23:56:48 2009 (r191082) +++ projects/mips/sys/mips/mips/nexus.c Wed Apr 15 01:47:52 2009 (r191083) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include +#undef NEXUS_DEBUG #ifdef NEXUS_DEBUG #define dprintf printf #else @@ -77,20 +78,6 @@ struct nexus_device { static struct rman irq_rman; static struct rman mem_rman; -#ifdef notyet -/* - * XXX: TODO: Implement bus space barrier functions. - * Currently tag and handle are set when memory resources - * are activated. - */ -struct bus_space_tag nexus_bustag = { - NULL, /* cookie */ - NULL, /* parent bus tag */ - NEXUS_BUS_SPACE, /* type */ - nexus_bus_barrier, /* bus_space_barrier */ -}; -#endif - static struct resource * nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); @@ -386,22 +373,22 @@ nexus_activate_resource(device_t bus, de struct resource *r) { #ifdef TARGET_OCTEON - uint64_t temp; + uint64_t temp; #endif /* * If this is a memory resource, track the direct mapping * in the uncached MIPS KSEG1 segment. */ if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - caddr_t vaddr = 0; - u_int32_t paddr; - u_int32_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; + caddr_t vaddr = 0; + u_int32_t paddr; + u_int32_t psize; + u_int32_t poffs; + + paddr = rman_get_start(r); + psize = rman_get_size(r); + poffs = paddr - trunc_page(paddr); + vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; rman_set_virtual(r, vaddr); rman_set_bustag(r, MIPS_BUS_SPACE_MEM); From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 02:28:26 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA6AE106564A; Wed, 15 Apr 2009 02:28:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 952448FC0C; Wed, 15 Apr 2009 02:28:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F2SQXC028103; Wed, 15 Apr 2009 02:28:26 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F2SQIP028093; Wed, 15 Apr 2009 02:28:26 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150228.n3F2SQIP028093@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 02:28:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191084 - in projects/mips/sys: conf mips/adm5120 mips/alchemy mips/idt mips/include mips/malta mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 02:28:27 -0000 Author: gonzo Date: Wed Apr 15 02:28:26 2009 New Revision: 191084 URL: http://svn.freebsd.org/changeset/base/191084 Log: Use FreeBSD/arm approach for handling bus space access: space tag is a pointer to bus_space structure that defines access methods and hence every bus can define own accessors. Default space is mips_bus_space_generic. It's a simple interface to physical memory, values are read with regard to host system byte order. Added: projects/mips/sys/mips/mips/bus_space_generic.c Modified: projects/mips/sys/conf/files.mips projects/mips/sys/mips/adm5120/obio.c projects/mips/sys/mips/adm5120/uart_cpu_adm5120.c projects/mips/sys/mips/alchemy/obio.c projects/mips/sys/mips/alchemy/uart_cpu_alchemy.c projects/mips/sys/mips/idt/uart_bus_rc32434.c projects/mips/sys/mips/idt/uart_cpu_rc32434.c projects/mips/sys/mips/include/_bus.h projects/mips/sys/mips/include/bus.h projects/mips/sys/mips/malta/gt_pci.c projects/mips/sys/mips/malta/obio.c projects/mips/sys/mips/malta/uart_bus_maltausart.c projects/mips/sys/mips/malta/uart_cpu_maltausart.c Modified: projects/mips/sys/conf/files.mips ============================================================================== --- projects/mips/sys/conf/files.mips Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/conf/files.mips Wed Apr 15 02:28:26 2009 (r191084) @@ -54,6 +54,7 @@ mips/mips/pm_machdep.c standard mips/mips/swtch.S standard mips/mips/tlb.S standard +mips/mips/bus_space_generic.c standard mips/mips/busdma_machdep.c standard mips/mips/cache.c standard mips/mips/cache_mipsNN.c standard Modified: projects/mips/sys/mips/adm5120/obio.c ============================================================================== --- projects/mips/sys/mips/adm5120/obio.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/adm5120/obio.c Wed Apr 15 02:28:26 2009 (r191084) @@ -269,7 +269,7 @@ obio_activate_resource(device_t bus, dev vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r)); rman_set_virtual(r, vaddr); - rman_set_bustag(r, MIPS_BUS_SPACE_MEM); + rman_set_bustag(r, &mips_bus_space_generic); rman_set_bushandle(r, (bus_space_handle_t)vaddr); } Modified: projects/mips/sys/mips/adm5120/uart_cpu_adm5120.c ============================================================================== --- projects/mips/sys/mips/adm5120/uart_cpu_adm5120.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/adm5120/uart_cpu_adm5120.c Wed Apr 15 02:28:26 2009 (r191084) @@ -67,7 +67,7 @@ uart_cpu_getdev(int devtype, struct uart di->ops = uart_getops(&uart_adm5120_uart_class); di->bas.chan = 0; - di->bas.bst = 0; + di->bas.bst = &mips_bus_space_generic; di->bas.regshft = 0; di->bas.rclk = 0; di->baudrate = 115200; @@ -76,7 +76,7 @@ uart_cpu_getdev(int devtype, struct uart di->parity = UART_PARITY_NONE; uart_bus_space_io = 0; - uart_bus_space_mem = MIPS_PHYS_TO_KSEG1(ADM5120_BASE_UART0); + uart_bus_space_mem = &mips_bus_space_generic; di->bas.bsh = MIPS_PHYS_TO_KSEG1(ADM5120_BASE_UART0); return (0); Modified: projects/mips/sys/mips/alchemy/obio.c ============================================================================== --- projects/mips/sys/mips/alchemy/obio.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/alchemy/obio.c Wed Apr 15 02:28:26 2009 (r191084) @@ -269,7 +269,7 @@ obio_activate_resource(device_t bus, dev vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r)); rman_set_virtual(r, vaddr); - rman_set_bustag(r, MIPS_BUS_SPACE_MEM); + rman_set_bustag(r, &mips_bus_space_generic); rman_set_bushandle(r, (bus_space_handle_t)vaddr); } Modified: projects/mips/sys/mips/alchemy/uart_cpu_alchemy.c ============================================================================== --- projects/mips/sys/mips/alchemy/uart_cpu_alchemy.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/alchemy/uart_cpu_alchemy.c Wed Apr 15 02:28:26 2009 (r191084) @@ -63,7 +63,7 @@ uart_cpu_getdev(int devtype, struct uart di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = 0; + di->bas.bst = &mips_bus_space_generic; di->bas.regshft = 0; di->bas.rclk = 0; di->baudrate = 115200; @@ -72,7 +72,7 @@ uart_cpu_getdev(int devtype, struct uart di->parity = UART_PARITY_NONE; uart_bus_space_io = 0; - uart_bus_space_mem = MIPS_PHYS_TO_KSEG1(UART0_BASE); + uart_bus_space_mem = &mips_bus_space_generic; di->bas.bsh = MIPS_PHYS_TO_KSEG1(UART0_BASE); return (0); Modified: projects/mips/sys/mips/idt/uart_bus_rc32434.c ============================================================================== --- projects/mips/sys/mips/idt/uart_bus_rc32434.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/idt/uart_bus_rc32434.c Wed Apr 15 02:28:26 2009 (r191084) @@ -88,10 +88,10 @@ uart_rc32434_probe(device_t dev) sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); sc->sc_sysdev->bas.regshft = 2; - sc->sc_sysdev->bas.bst = 0; + sc->sc_sysdev->bas.bst = &mips_bus_space_generic; sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(IDT_BASE_UART0); sc->sc_bas.regshft = 2; - sc->sc_bas.bst = 0; + sc->sc_bas.bst = &mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(IDT_BASE_UART0); return (uart_bus_probe(dev, 2, 330000000UL/2, 0, 0)); Modified: projects/mips/sys/mips/idt/uart_cpu_rc32434.c ============================================================================== --- projects/mips/sys/mips/idt/uart_cpu_rc32434.c Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/idt/uart_cpu_rc32434.c Wed Apr 15 02:28:26 2009 (r191084) @@ -71,7 +71,7 @@ uart_cpu_getdev(int devtype, struct uart /* Got it. Fill in the instance and return it. */ di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = 0; + di->bas.bst = &mips_bus_space_generic; di->bas.regshft = 2; di->bas.rclk = 330000000UL/2; /* IPbus clock */ di->baudrate = 115200; @@ -79,7 +79,7 @@ uart_cpu_getdev(int devtype, struct uart di->stopbits = 1; di->parity = UART_PARITY_NONE; uart_bus_space_io = 0; - uart_bus_space_mem = 0; + uart_bus_space_mem = &mips_bus_space_generic; di->bas.bsh = MIPS_PHYS_TO_KSEG1(maddr); return (0); } Modified: projects/mips/sys/mips/include/_bus.h ============================================================================== --- projects/mips/sys/mips/include/_bus.h Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/include/_bus.h Wed Apr 15 02:28:26 2009 (r191084) @@ -43,7 +43,7 @@ typedef uintptr_t bus_size_t; /* * Access methods for bus resources and address space. */ -typedef long bus_space_tag_t; +typedef struct bus_space *bus_space_tag_t; typedef u_long bus_space_handle_t; #endif #endif /* MIPS_INCLUDE__BUS_H */ Modified: projects/mips/sys/mips/include/bus.h ============================================================================== --- projects/mips/sys/mips/include/bus.h Wed Apr 15 01:47:52 2009 (r191083) +++ projects/mips/sys/mips/include/bus.h Wed Apr 15 02:28:26 2009 (r191084) @@ -1,8 +1,7 @@ -/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ +/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ + /*- - * $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $ - * - * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. + * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -38,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Copyright (c) 1996 Charles M. Hannum. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * @@ -68,842 +67,657 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter * $FreeBSD$ -*/ + */ #ifndef _MACHINE_BUS_H_ -#define _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ -#ifdef TARGET_OCTEON -#include -#else #include -#include - -/* - * Values for the mips bus space tag, not to be used directly by MI code. - */ -#define MIPS_BUS_SPACE_IO 0 /* space is i/o space */ -#define MIPS_BUS_SPACE_MEM 1 /* space is mem space */ +struct bus_space { + /* cookie */ + void *bs_cookie; + + /* mapping/unmapping */ + int (*bs_map) (void *, bus_addr_t, bus_size_t, + int, bus_space_handle_t *); + void (*bs_unmap) (void *, bus_space_handle_t, bus_size_t); + int (*bs_subregion) (void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); + + /* allocation/deallocation */ + int (*bs_alloc) (void *, bus_addr_t, bus_addr_t, + bus_size_t, bus_size_t, bus_size_t, int, + bus_addr_t *, bus_space_handle_t *); + void (*bs_free) (void *, bus_space_handle_t, + bus_size_t); + + /* get kernel virtual address */ + /* barrier */ + void (*bs_barrier) (void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); + + /* read (single) */ + u_int8_t (*bs_r_1) (void *, bus_space_handle_t, bus_size_t); + u_int16_t (*bs_r_2) (void *, bus_space_handle_t, bus_size_t); + u_int32_t (*bs_r_4) (void *, bus_space_handle_t, bus_size_t); + u_int64_t (*bs_r_8) (void *, bus_space_handle_t, bus_size_t); + + /* read multiple */ + void (*bs_rm_1) (void *, bus_space_handle_t, bus_size_t, + u_int8_t *, bus_size_t); + void (*bs_rm_2) (void *, bus_space_handle_t, bus_size_t, + u_int16_t *, bus_size_t); + void (*bs_rm_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rm_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* read region */ + void (*bs_rr_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); + void (*bs_rr_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); + void (*bs_rr_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rr_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* write (single) */ + void (*bs_w_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t); + void (*bs_w_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t); + void (*bs_w_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t); + void (*bs_w_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t); + + /* write multiple */ + void (*bs_wm_1) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wm_2) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wm_4) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wm_8) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* write region */ + void (*bs_wr_1) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wr_2) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wr_4) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wr_8) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* set multiple */ + void (*bs_sm_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); + void (*bs_sm_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); + void (*bs_sm_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); + void (*bs_sm_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); + + /* set region */ + void (*bs_sr_1) (void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); + void (*bs_sr_2) (void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); + void (*bs_sr_4) (void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); + void (*bs_sr_8) (void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); + + /* copy */ + void (*bs_c_1) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_2) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_4) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + void (*bs_c_8) (void *, bus_space_handle_t, bus_size_t, + bus_space_handle_t, bus_size_t, bus_size_t); + + /* read stream (single) */ + u_int8_t (*bs_r_1_s) (void *, bus_space_handle_t, bus_size_t); + u_int16_t (*bs_r_2_s) (void *, bus_space_handle_t, bus_size_t); + u_int32_t (*bs_r_4_s) (void *, bus_space_handle_t, bus_size_t); + u_int64_t (*bs_r_8_s) (void *, bus_space_handle_t, bus_size_t); + + /* read multiple stream */ + void (*bs_rm_1_s) (void *, bus_space_handle_t, bus_size_t, + u_int8_t *, bus_size_t); + void (*bs_rm_2_s) (void *, bus_space_handle_t, bus_size_t, + u_int16_t *, bus_size_t); + void (*bs_rm_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rm_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* read region stream */ + void (*bs_rr_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); + void (*bs_rr_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); + void (*bs_rr_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rr_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* write stream (single) */ + void (*bs_w_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t); + void (*bs_w_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t); + void (*bs_w_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t); + void (*bs_w_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t); + + /* write multiple stream */ + void (*bs_wm_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wm_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wm_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wm_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* write region stream */ + void (*bs_wr_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wr_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wr_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wr_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); +}; + + +/* + * Utility macros; INTERNAL USE ONLY. + */ +#define __bs_c(a,b) __CONCAT(a,b) +#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size) + +#define __bs_rs(sz, t, h, o) \ + (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o) +#define __bs_ws(sz, t, h, o, v) \ + (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v) +#define __bs_nonsingle(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c) +#define __bs_set(type, sz, t, h, o, v, c) \ + (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c) +#define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \ + (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt) + +#define __bs_opname_s(op,size) __bs_c(__bs_c(__bs_c(__bs_c(bs_,op),_),size),_s) +#define __bs_rs_s(sz, t, h, o) \ + (*(t)->__bs_opname_s(r,sz))((t)->bs_cookie, h, o) +#define __bs_ws_s(sz, t, h, o, v) \ + (*(t)->__bs_opname_s(w,sz))((t)->bs_cookie, h, o, v) +#define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) + + +/* + * Mapping and unmapping operations. + */ +#define bus_space_map(t, a, s, c, hp) \ + (*(t)->bs_map)((t)->bs_cookie, (a), (s), (c), (hp)) +#define bus_space_unmap(t, h, s) \ + (*(t)->bs_unmap)((t)->bs_cookie, (h), (s)) +#define bus_space_subregion(t, h, o, s, hp) \ + (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) + + +/* + * Allocation and deallocation operations. + */ +#define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) \ + (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \ + (c), (ap), (hp)) +#define bus_space_free(t, h, s) \ + (*(t)->bs_free)((t)->bs_cookie, (h), (s)) + +/* + * Bus barrier operations. + */ +#define bus_space_barrier(t, h, o, l, f) \ + (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) + +#define BUS_SPACE_BARRIER_READ 0x01 +#define BUS_SPACE_BARRIER_WRITE 0x02 + +/* + * Bus read (single) operations. + */ +#define bus_space_read_1(t, h, o) __bs_rs(1,(t),(h),(o)) +#define bus_space_read_2(t, h, o) __bs_rs(2,(t),(h),(o)) +#define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o)) +#define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o)) + +#define bus_space_read_stream_1(t, h, o) __bs_rs_s(1,(t), (h), (o)) +#define bus_space_read_stream_2(t, h, o) __bs_rs_s(2,(t), (h), (o)) +#define bus_space_read_stream_4(t, h, o) __bs_rs_s(4,(t), (h), (o)) +#define bus_space_read_stream_8(t, h, o) __bs_rs_s(8,8,(t),(h),(o)) + +/* + * Bus read multiple operations. + */ +#define bus_space_read_multi_1(t, h, o, a, c) \ + __bs_nonsingle(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_2(t, h, o, a, c) \ + __bs_nonsingle(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_4(t, h, o, a, c) \ + __bs_nonsingle(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_8(t, h, o, a, c) \ + __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) + + +/* + * Bus read region operations. + */ +#define bus_space_read_region_1(t, h, o, a, c) \ + __bs_nonsingle(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_2(t, h, o, a, c) \ + __bs_nonsingle(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_4(t, h, o, a, c) \ + __bs_nonsingle(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_8(t, h, o, a, c) \ + __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) + +#define bus_space_read_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) + + +/* + * Bus write (single) operations. + */ +#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v)) +#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v)) +#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) +#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) + +#define bus_space_write_stream_1(t, h, o, v) __bs_ws_s(1,(t),(h),(o),(v)) +#define bus_space_write_stream_2(t, h, o, v) __bs_ws_s(2,(t),(h),(o),(v)) +#define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) +#define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) + + +/* + * Bus write multiple operations. + */ +#define bus_space_write_multi_1(t, h, o, a, c) \ + __bs_nonsingle(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_2(t, h, o, a, c) \ + __bs_nonsingle(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_4(t, h, o, a, c) \ + __bs_nonsingle(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_8(t, h, o, a, c) \ + __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) -#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF -#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE 0xFFFFFFFF /* Maximum supported size */ -#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF -#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF +#define bus_space_write_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) -#define BUS_SPACE_UNRESTRICTED (~0) /* - * Map a region of device bus space into CPU virtual address space. + * Bus write region operations. */ +#define bus_space_write_region_1(t, h, o, a, c) \ + __bs_nonsingle(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_2(t, h, o, a, c) \ + __bs_nonsingle(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_4(t, h, o, a, c) \ + __bs_nonsingle(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_8(t, h, o, a, c) \ + __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) -__inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int flags, bus_space_handle_t *bshp); - -static __inline int -bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, - bus_size_t size __unused, int flags __unused, - bus_space_handle_t *bshp) -{ +#define bus_space_write_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) - *bshp = addr; - return (0); -} /* - * Unmap a region of device bus space. + * Set multiple operations. */ +#define bus_space_set_multi_1(t, h, o, v, c) \ + __bs_set(sm,1,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_2(t, h, o, v, c) \ + __bs_set(sm,2,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_4(t, h, o, v, c) \ + __bs_set(sm,4,(t),(h),(o),(v),(c)) +#define bus_space_set_multi_8(t, h, o, v, c) \ + __bs_set(sm,8,(t),(h),(o),(v),(c)) -void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); /* - * Get a new handle for a subregion of an already-mapped area of bus space. + * Set region operations. */ +#define bus_space_set_region_1(t, h, o, v, c) \ + __bs_set(sr,1,(t),(h),(o),(v),(c)) +#define bus_space_set_region_2(t, h, o, v, c) \ + __bs_set(sr,2,(t),(h),(o),(v),(c)) +#define bus_space_set_region_4(t, h, o, v, c) \ + __bs_set(sr,4,(t),(h),(o),(v),(c)) +#define bus_space_set_region_8(t, h, o, v, c) \ + __bs_set(sr,8,(t),(h),(o),(v),(c)) -int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp); /* - * Allocate a region of memory that is accessible to devices in bus space. + * Copy operations. */ - -int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, - bus_addr_t rend, bus_size_t size, bus_size_t align, - bus_size_t boundary, int flags, bus_addr_t *addrp, - bus_space_handle_t *bshp); +#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \ + __bs_copy(1, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \ + __bs_copy(2, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \ + __bs_copy(4, t, h1, o1, h2, o2, c) +#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \ + __bs_copy(8, t, h1, o1, h2, o2, c) /* - * Free a region of bus space accessible memory. + * Macros to provide prototypes for all the functions used in the + * bus_space structure */ -void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, +#define bs_map_proto(f) \ +int __bs_c(f,_bs_map) (void *t, bus_addr_t addr, \ + bus_size_t size, int cacheable, bus_space_handle_t *bshp); + +#define bs_unmap_proto(f) \ +void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \ bus_size_t size); +#define bs_subregion_proto(f) \ +int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, bus_size_t size, \ + bus_space_handle_t *nbshp); + +#define bs_alloc_proto(f) \ +int __bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart, \ + bus_addr_t rend, bus_size_t size, bus_size_t align, \ + bus_size_t boundary, int cacheable, bus_addr_t *addrp, \ + bus_space_handle_t *bshp); -/* - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. - */ -static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, - bus_space_handle_t handle, - bus_size_t offset); - -static __inline u_int8_t -bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ - - if (tag == MIPS_BUS_SPACE_IO) - return (inb(handle + offset)); - return (readb(handle + offset)); -} - -static __inline u_int16_t -bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ - - if (tag == MIPS_BUS_SPACE_IO) - return (inw(handle + offset)); - return (readw(handle + offset)); -} - -static __inline u_int32_t -bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t offset) -{ - - if (tag == MIPS_BUS_SPACE_IO) - return (inl(handle + offset)); - return (readl(handle + offset)); -} - -#if 0 /* Cause a link error for bus_space_read_8 */ -#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. - */ -static __inline void bus_space_read_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - -static __inline void -bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - *addr++ = inb(bsh + offset); - else - while (count--) - *addr++ = readb(bsh + offset); -} - -static __inline void -bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - *addr++ = inw(baddr); - else - while (count--) - *addr++ = readw(baddr); -} - -static __inline void -bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - *addr++ = inl(baddr); - else - while (count--) - *addr++ = readl(baddr); -} - -#if 0 /* Cause a link error for bus_space_read_multi_8 */ -#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! -#endif - -/* - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle and starting at `offset' and copy into - * buffer provided. - */ -static __inline void bus_space_read_region_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, - size_t count); - -static __inline void bus_space_read_region_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, - size_t count); - -static __inline void bus_space_read_region_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, - size_t count); - - -static __inline void -bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) { - *addr++ = inb(baddr); - baddr += 1; - } - else - while (count--) { - *addr++ = readb(baddr); - baddr += 1; - } -} - -static __inline void -bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) { - *addr++ = inw(baddr); - baddr += 2; - } - else - while (count--) { - *addr++ = readw(baddr); - baddr += 2; - } -} - -static __inline void -bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) { - *addr++ = inl(baddr); - baddr += 4; - } - else - while (count--) { - *addr++ = readb(baddr); - baddr += 4; - } -} - -#if 0 /* Cause a link error for bus_space_read_region_8 */ -#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! -#endif - -/* - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. - */ - -static __inline void bus_space_write_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value); - -static __inline void bus_space_write_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value); - -static __inline void bus_space_write_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value); - -static __inline void -bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int8_t value) -{ - - if (tag == MIPS_BUS_SPACE_IO) - outb(bsh + offset, value); - else - writeb(bsh + offset, value); -} - -static __inline void -bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int16_t value) -{ - - if (tag == MIPS_BUS_SPACE_IO) - outw(bsh + offset, value); - else - writew(bsh + offset, value); -} - -static __inline void -bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value) -{ - - if (tag == MIPS_BUS_SPACE_IO) - outl(bsh + offset, value); - else - writel(bsh + offset, value); -} - -#if 0 /* Cause a link error for bus_space_write_8 */ -#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! -#endif - -/* - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. - */ - -static __inline void bus_space_write_multi_1(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int8_t *addr, - size_t count); -static __inline void bus_space_write_multi_2(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int16_t *addr, - size_t count); - -static __inline void bus_space_write_multi_4(bus_space_tag_t tag, - bus_space_handle_t bsh, - bus_size_t offset, - const u_int32_t *addr, - size_t count); - -static __inline void -bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int8_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - outb(baddr, *addr++); - else - while (count--) - writeb(baddr, *addr++); -} - -static __inline void -bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int16_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - outw(baddr, *addr++); - else - while (count--) - writew(baddr, *addr++); -} - -static __inline void -bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) -{ - bus_addr_t baddr = bsh + offset; - - if (tag == MIPS_BUS_SPACE_IO) - while (count--) - outl(baddr, *addr++); - else - while (count--) - writel(baddr, *addr++); -} +#define bs_free_proto(f) \ +void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \ + bus_size_t size); -#if 0 /* Cause a link error for bus_space_write_multi_8 */ -#define bus_space_write_multi_8(t, h, o, a, c) \ - !!! bus_space_write_multi_8 unimplemented !!! -#endif +#define bs_barrier_proto(f) \ +void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, bus_size_t len, int flags); + +#define bs_r_1_proto(f) \ +u_int8_t __bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_2_proto(f) \ +u_int16_t __bs_c(f,_bs_r_2) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_4_proto(f) \ +u_int32_t __bs_c(f,_bs_r_4) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_8_proto(f) \ +u_int64_t __bs_c(f,_bs_r_8) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_1_s_proto(f) \ +u_int8_t __bs_c(f,_bs_r_1_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_2_s_proto(f) \ +u_int16_t __bs_c(f,_bs_r_2_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_4_s_proto(f) \ +u_int32_t __bs_c(f,_bs_r_4_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_w_1_proto(f) \ +void __bs_c(f,_bs_w_1) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int8_t value); + +#define bs_w_2_proto(f) \ +void __bs_c(f,_bs_w_2) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int16_t value); + +#define bs_w_4_proto(f) \ +void __bs_c(f,_bs_w_4) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int32_t value); + +#define bs_w_8_proto(f) \ +void __bs_c(f,_bs_w_8) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int64_t value); + +#define bs_w_1_s_proto(f) \ +void __bs_c(f,_bs_w_1_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int8_t value); + +#define bs_w_2_s_proto(f) \ +void __bs_c(f,_bs_w_2_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int16_t value); + +#define bs_w_4_s_proto(f) \ +void __bs_c(f,_bs_w_4_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int32_t value); + +#define bs_rm_1_proto(f) \ +void __bs_c(f,_bs_rm_1) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int8_t *addr, bus_size_t count); + +#define bs_rm_2_proto(f) \ +void __bs_c(f,_bs_rm_2) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int16_t *addr, bus_size_t count); + +#define bs_rm_4_proto(f) \ +void __bs_c(f,_bs_rm_4) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int32_t *addr, bus_size_t count); + +#define bs_rm_8_proto(f) \ +void __bs_c(f,_bs_rm_8) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int64_t *addr, bus_size_t count); + +#define bs_wm_1_proto(f) \ +void __bs_c(f,_bs_wm_1) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, const u_int8_t *addr, bus_size_t count); + +#define bs_wm_2_proto(f) \ +void __bs_c(f,_bs_wm_2) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, const u_int16_t *addr, bus_size_t count); + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 02:41:36 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07D12106564A; Wed, 15 Apr 2009 02:41:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA4DA8FC16; Wed, 15 Apr 2009 02:41:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F2fZ1a028514; Wed, 15 Apr 2009 02:41:35 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F2fZME028513; Wed, 15 Apr 2009 02:41:35 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150241.n3F2fZME028513@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 02:41:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191085 - projects/mips/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 02:41:36 -0000 Author: gonzo Date: Wed Apr 15 02:41:35 2009 New Revision: 191085 URL: http://svn.freebsd.org/changeset/base/191085 Log: - mainbus.c seems not to be used, disconnect it from build Modified: projects/mips/sys/conf/files.mips Modified: projects/mips/sys/conf/files.mips ============================================================================== --- projects/mips/sys/conf/files.mips Wed Apr 15 02:28:26 2009 (r191084) +++ projects/mips/sys/conf/files.mips Wed Apr 15 02:41:35 2009 (r191085) @@ -38,7 +38,7 @@ mips/mips/cpu.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard mips/mips/gdb_machdep.c standard -mips/mips/mainbus.c standard +# mips/mips/mainbus.c standard mips/mips/pmap.c standard mips/mips/trap.c standard mips/mips/vm_machdep.c standard From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 03:04:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C28810656F3; Wed, 15 Apr 2009 03:04:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 586288FC13; Wed, 15 Apr 2009 03:04:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F34Xxg029251; Wed, 15 Apr 2009 03:04:33 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F34X41029250; Wed, 15 Apr 2009 03:04:33 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150304.n3F34X41029250@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 03:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191086 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 03:04:34 -0000 Author: gonzo Date: Wed Apr 15 03:04:33 2009 New Revision: 191086 URL: http://svn.freebsd.org/changeset/base/191086 Log: - Port AR71XX OHCI controller to new USB stack Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ohci.c Wed Apr 15 02:41:35 2009 (r191085) +++ projects/mips/sys/mips/atheros/ar71xx_ohci.c Wed Apr 15 03:04:33 2009 (r191086) @@ -28,25 +28,19 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include + +#include static int ar71xx_ohci_attach(device_t dev); static int ar71xx_ohci_detach(device_t dev); @@ -72,19 +66,20 @@ ar71xx_ohci_attach(device_t dev) int rid; rid = 0; - sc->sc_ohci.io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + sc->sc_ohci.sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (sc->sc_ohci.io_res == NULL) { + if (sc->sc_ohci.sc_io_res == NULL) { err = ENOMEM; goto error; } - sc->sc_ohci.iot = rman_get_bustag(sc->sc_ohci.io_res); - sc->sc_ohci.ioh = rman_get_bushandle(sc->sc_ohci.io_res); + sc->sc_ohci.sc_io_tag = rman_get_bustag(sc->sc_ohci.sc_io_res); + sc->sc_ohci.sc_io_hdl = rman_get_bushandle(sc->sc_ohci.sc_io_res); + sc->sc_ohci.sc_io_size = rman_get_size(sc->sc_ohci.sc_io_res); rid = 0; - sc->sc_ohci.irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + sc->sc_ohci.sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->sc_ohci.irq_res == NULL) { + if (sc->sc_ohci.sc_irq_res == NULL) { err = ENOMEM; goto error; } @@ -95,44 +90,20 @@ ar71xx_ohci_attach(device_t dev) } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - /* Allocate a parent dma tag for DMA maps */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, - NULL, NULL, &sc->sc_ohci.sc_bus.parent_dmatag); + err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, + INTR_TYPE_BIO | INTR_MPSAFE, NULL, + (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); if (err) { - device_printf(dev, "Could not allocate parent DMA tag (%d)\n", - err); err = ENXIO; goto error; } - /* Allocate a dma tag for transfer buffers */ - err = bus_dma_tag_create(sc->sc_ohci.sc_bus.parent_dmatag, 1, 0, - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, - busdma_lock_mutex, &Giant, &sc->sc_ohci.sc_bus.buffer_dmatag); - if (err) { - device_printf(dev, "Could not allocate transfer tag (%d)\n", - err); - err = ENXIO; - goto error; - } + strlcpy(sc->sc_ohci.sc_vendor, "Atheros", sizeof(sc->sc_ohci.sc_vendor)); - err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, NULL, - ohci_intr, sc, &sc->sc_ohci.ih); - if (err) { - err = ENXIO; - goto error; - } - strlcpy(sc->sc_ohci.sc_vendor, "Atheros", - sizeof(sc->sc_ohci.sc_vendor)); - - bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0); + bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl, OHCI_CONTROL, 0); err = ohci_init(&sc->sc_ohci); if (!err) { - sc->sc_ohci.sc_flags |= OHCI_SCFLG_DONEINIT; err = device_probe_and_attach(sc->sc_ohci.sc_bus.bdev); } @@ -149,34 +120,23 @@ ar71xx_ohci_detach(device_t dev) { struct ar71xx_ohci_softc *sc = device_get_softc(dev); - if (sc->sc_ohci.sc_flags & OHCI_SCFLG_DONEINIT) { - ohci_detach(&sc->sc_ohci, 0); - sc->sc_ohci.sc_flags &= ~OHCI_SCFLG_DONEINIT; + if (sc->sc_ohci.sc_intr_hdl) { + bus_teardown_intr(dev, sc->sc_ohci.sc_irq_res, sc->sc_ohci.sc_intr_hdl); + sc->sc_ohci.sc_intr_hdl = NULL; } - - if (sc->sc_ohci.ih) { - bus_teardown_intr(dev, sc->sc_ohci.irq_res, sc->sc_ohci.ih); - sc->sc_ohci.ih = NULL; - } - - if (sc->sc_ohci.sc_bus.parent_dmatag != NULL) - bus_dma_tag_destroy(sc->sc_ohci.sc_bus.parent_dmatag); - if (sc->sc_ohci.sc_bus.buffer_dmatag != NULL) - bus_dma_tag_destroy(sc->sc_ohci.sc_bus.buffer_dmatag); - if (sc->sc_ohci.sc_bus.bdev) { device_delete_child(dev, sc->sc_ohci.sc_bus.bdev); sc->sc_ohci.sc_bus.bdev = NULL; } - if (sc->sc_ohci.irq_res) { - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_ohci.irq_res); - sc->sc_ohci.irq_res = NULL; - } - if (sc->sc_ohci.io_res) { - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_ohci.io_res); - sc->sc_ohci.io_res = NULL; - sc->sc_ohci.iot = 0; - sc->sc_ohci.ioh = 0; + if (sc->sc_ohci.sc_irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_ohci.sc_irq_res); + sc->sc_ohci.sc_irq_res = NULL; + } + if (sc->sc_ohci.sc_io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_ohci.sc_io_res); + sc->sc_ohci.sc_io_res = NULL; + sc->sc_ohci.sc_io_tag = 0; + sc->sc_ohci.sc_io_hdl = 0; } return (0); } From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 05:37:17 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA2531065673; Wed, 15 Apr 2009 05:37:17 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AD6038FC24; Wed, 15 Apr 2009 05:37:17 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F5bHWI033827; Wed, 15 Apr 2009 05:37:17 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F5bHdq033826; Wed, 15 Apr 2009 05:37:17 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150537.n3F5bHdq033826@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 05:37:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191101 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 05:37:18 -0000 Author: gonzo Date: Wed Apr 15 05:37:17 2009 New Revision: 191101 URL: http://svn.freebsd.org/changeset/base/191101 Log: Fix USB2 quick'n'dirty porting, now system successfully detects OHCI Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ohci.c Wed Apr 15 04:28:22 2009 (r191100) +++ projects/mips/sys/mips/atheros/ar71xx_ohci.c Wed Apr 15 05:37:17 2009 (r191101) @@ -65,6 +65,19 @@ ar71xx_ohci_attach(device_t dev) int err; int rid; + /* initialise some bus fields */ + sc->sc_ohci.sc_bus.parent = dev; + sc->sc_ohci.sc_bus.devices = sc->sc_ohci.sc_devices; + sc->sc_ohci.sc_bus.devices_max = OHCI_MAX_DEVICES; + + /* get all DMA memory */ + if (usb2_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, + USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) { + return (ENOMEM); + } + + sc->sc_ohci.sc_dev = dev; + rid = 0; sc->sc_ohci.sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -83,7 +96,7 @@ ar71xx_ohci_attach(device_t dev) err = ENOMEM; goto error; } - sc->sc_ohci.sc_bus.bdev = device_add_child(dev, "usb", -1); + sc->sc_ohci.sc_bus.bdev = device_add_child(dev, "usbus", -1); if (sc->sc_ohci.sc_bus.bdev == NULL) { err = ENOMEM; goto error; @@ -103,9 +116,12 @@ ar71xx_ohci_attach(device_t dev) bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl, OHCI_CONTROL, 0); err = ohci_init(&sc->sc_ohci); - if (!err) { + if (!err) err = device_probe_and_attach(sc->sc_ohci.sc_bus.bdev); - } + + if (err) + goto error; + return (0); error: if (err) { @@ -119,16 +135,39 @@ static int ar71xx_ohci_detach(device_t dev) { struct ar71xx_ohci_softc *sc = device_get_softc(dev); + device_t bdev; + + if (sc->sc_ohci.sc_bus.bdev) { + bdev = sc->sc_ohci.sc_bus.bdev; + device_detach(bdev); + device_delete_child(dev, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_all_children(dev); + + /* + * Put the controller into reset, then disable clocks and do + * the MI tear down. We have to disable the clocks/hardware + * after we do the rest of the teardown. We also disable the + * clocks in the opposite order we acquire them, but that + * doesn't seem to be absolutely necessary. We free up the + * clocks after we disable them, so the system could, in + * theory, reuse them. + */ + bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl, + OHCI_CONTROL, 0); if (sc->sc_ohci.sc_intr_hdl) { bus_teardown_intr(dev, sc->sc_ohci.sc_irq_res, sc->sc_ohci.sc_intr_hdl); sc->sc_ohci.sc_intr_hdl = NULL; } - if (sc->sc_ohci.sc_bus.bdev) { - device_delete_child(dev, sc->sc_ohci.sc_bus.bdev); - sc->sc_ohci.sc_bus.bdev = NULL; - } - if (sc->sc_ohci.sc_irq_res) { + + if (sc->sc_ohci.sc_irq_res && sc->sc_ohci.sc_intr_hdl) { + /* + * only call ohci_detach() after ohci_init() + */ + ohci_detach(&sc->sc_ohci); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_ohci.sc_irq_res); sc->sc_ohci.sc_irq_res = NULL; } @@ -138,6 +177,8 @@ ar71xx_ohci_detach(device_t dev) sc->sc_ohci.sc_io_tag = 0; sc->sc_ohci.sc_io_hdl = 0; } + usb2_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc); + return (0); } From owner-svn-src-projects@FreeBSD.ORG Thu Apr 16 00:13:25 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65533106566B; Thu, 16 Apr 2009 00:13:25 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F9408FC13; Thu, 16 Apr 2009 00:13:25 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3G0DP3u059405; Thu, 16 Apr 2009 00:13:25 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3G0DOZR059391; Thu, 16 Apr 2009 00:13:24 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200904160013.n3G0DOZR059391@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 16 Apr 2009 00:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191131 - in projects/tcp_cc_7.x: . bin bin/chio bin/cp bin/dd bin/ln bin/pax bin/sh cddl/contrib/opensolaris contrib contrib/bind9 contrib/csup contrib/gcc contrib/gdb contrib/gdtoa co... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2009 00:13:25 -0000 Author: lstewart Date: Thu Apr 16 00:13:23 2009 New Revision: 191131 URL: http://svn.freebsd.org/changeset/base/191131 Log: Merge r190860:191130 from stable/7 Added: projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_82599.c - copied unchanged from r191130, stable/7/sys/dev/ixgbe/ixgbe_82599.c Modified: projects/tcp_cc_7.x/ (props changed) projects/tcp_cc_7.x/COPYRIGHT (props changed) projects/tcp_cc_7.x/Makefile (props changed) projects/tcp_cc_7.x/Makefile.inc1 (props changed) projects/tcp_cc_7.x/UPDATING (props changed) projects/tcp_cc_7.x/bin/ (props changed) projects/tcp_cc_7.x/bin/chio/ (props changed) projects/tcp_cc_7.x/bin/cp/ (props changed) projects/tcp_cc_7.x/bin/dd/ (props changed) projects/tcp_cc_7.x/bin/ln/ (props changed) projects/tcp_cc_7.x/bin/pax/ (props changed) projects/tcp_cc_7.x/bin/sh/ (props changed) projects/tcp_cc_7.x/cddl/contrib/opensolaris/ (props changed) projects/tcp_cc_7.x/contrib/ (props changed) projects/tcp_cc_7.x/contrib/bind9/ (props changed) projects/tcp_cc_7.x/contrib/csup/ (props changed) projects/tcp_cc_7.x/contrib/gcc/ (props changed) projects/tcp_cc_7.x/contrib/gdb/ (props changed) projects/tcp_cc_7.x/contrib/gdtoa/ (props changed) projects/tcp_cc_7.x/contrib/libpcap/ (props changed) projects/tcp_cc_7.x/contrib/ntp/ (props changed) projects/tcp_cc_7.x/contrib/sendmail/ (props changed) projects/tcp_cc_7.x/contrib/smbfs/ (props changed) projects/tcp_cc_7.x/contrib/tcsh/ (props changed) projects/tcp_cc_7.x/contrib/telnet/ (props changed) projects/tcp_cc_7.x/contrib/top/ (props changed) projects/tcp_cc_7.x/contrib/traceroute/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/COPYING (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ChangeLog (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/FREEBSD-Xlist (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/FREEBSD-upgrade (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/Makefile (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/README (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/aes.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/aes.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/aes_wrap.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/aes_wrap.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/asn1.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/asn1.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/asn1_test.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/base64.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/base64.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/bignum.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/bignum.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/build_config.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config_file.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config_none.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config_ssid.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config_types.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/config_winreg.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto_cryptoapi.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto_gnutls.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto_internal.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto_libtomcrypt.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/crypto_none.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_dbus.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_dbus.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_named_pipe.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_udp.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ctrl_iface_unix.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/dbus-wpa_supplicant.conf (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/dbus-wpa_supplicant.service (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/dbus_dict_helpers.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/dbus_dict_helpers.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/defconfig (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/defs.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/des.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/doc/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/driver.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/driver_hostap.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/driver_ndis.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/driver_ndis.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/driver_wired.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/drivers.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_aka.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_defs.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_fast.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_gpsk.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_gpsk_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_gpsk_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_gtc.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_i.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_leap.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_md5.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_methods.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_methods.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_mschapv2.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_otp.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_pax.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_pax_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_pax_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_peap.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_psk.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_psk_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_psk_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sake.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sake_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sake_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sim.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sim_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_sim_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_testing.txt (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_tls.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_tls_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_tls_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_tlv.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_tlv.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_ttls.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_ttls.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eap_vendor_test.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eapol_sm.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eapol_sm.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eapol_test.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eloop.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eloop.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eloop_none.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/eloop_win.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/events.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/examples/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/hostapd.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/includes.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/l2_packet.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/libtommath.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/main.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/md4.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/md5.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/md5.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/mlme.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/mlme.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ms_funcs.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/ms_funcs.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/nmake.mak (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/openssl-tls-extensions.patch (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/os.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/os_internal.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/os_none.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/os_unix.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/pcsc_funcs.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/pcsc_funcs.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/pmksa_cache.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/pmksa_cache.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/preauth.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/preauth.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/preauth_test.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/radius.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/radius.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/radius_client.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/radius_client.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/rc4.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/rc4.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/rsa.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/rsa.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/sha1.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/sha1.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/sha256.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/sha256.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/state_machine.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls_gnutls.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls_internal.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls_none.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls_openssl.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tls_schannel.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tlsv1_client.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tlsv1_client.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tlsv1_common.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/tlsv1_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/todo.txt (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/version.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_cli.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_common.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_ctrl.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_ctrl.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_gui/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_gui-qt4/ (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_i.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_passphrase.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_supplicant.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_supplicant.conf (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_supplicant.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/wpa_supplicant_i.h (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/x509v3.c (props changed) projects/tcp_cc_7.x/contrib/wpa_supplicant/x509v3.h (props changed) projects/tcp_cc_7.x/crypto/openssh/ (props changed) projects/tcp_cc_7.x/etc/ (props changed) projects/tcp_cc_7.x/etc/rc.d/ (props changed) projects/tcp_cc_7.x/games/fortune/ (props changed) projects/tcp_cc_7.x/games/fortune/fortune/ (props changed) projects/tcp_cc_7.x/gnu/ (props changed) projects/tcp_cc_7.x/gnu/usr.bin/cc/ (props changed) projects/tcp_cc_7.x/gnu/usr.bin/cvs/ (props changed) projects/tcp_cc_7.x/gnu/usr.bin/gdb/kgdb/ (props changed) projects/tcp_cc_7.x/gnu/usr.bin/grep/ (props changed) projects/tcp_cc_7.x/gnu/usr.bin/groff/tmac/mdoc.local (contents, props changed) projects/tcp_cc_7.x/gnu/usr.bin/sort/ (props changed) projects/tcp_cc_7.x/include/ (props changed) projects/tcp_cc_7.x/kerberos5/ (props changed) projects/tcp_cc_7.x/lib/ (props changed) projects/tcp_cc_7.x/lib/bind/ (props changed) projects/tcp_cc_7.x/lib/csu/ (props changed) projects/tcp_cc_7.x/lib/libarchive/ (props changed) projects/tcp_cc_7.x/lib/libbluetooth/ (props changed) projects/tcp_cc_7.x/lib/libc/ (props changed) projects/tcp_cc_7.x/lib/libc/db/README projects/tcp_cc_7.x/lib/libc/db/btree/bt_open.c projects/tcp_cc_7.x/lib/libc/db/btree/bt_split.c projects/tcp_cc_7.x/lib/libc/db/hash/hash_buf.c projects/tcp_cc_7.x/lib/libc/db/mpool/mpool.c projects/tcp_cc_7.x/lib/libc/net/getaddrinfo.c projects/tcp_cc_7.x/lib/libc/string/ffsll.c (props changed) projects/tcp_cc_7.x/lib/libc/string/flsll.c (props changed) projects/tcp_cc_7.x/lib/libc_r/ (props changed) projects/tcp_cc_7.x/lib/libcam/ (props changed) projects/tcp_cc_7.x/lib/libdisk/ (props changed) projects/tcp_cc_7.x/lib/libelf/ (props changed) projects/tcp_cc_7.x/lib/libfetch/ (props changed) projects/tcp_cc_7.x/lib/libftpio/ (props changed) projects/tcp_cc_7.x/lib/libgeom/ (props changed) projects/tcp_cc_7.x/lib/libgssapi/ (props changed) projects/tcp_cc_7.x/lib/libkse/ (props changed) projects/tcp_cc_7.x/lib/libkvm/ (props changed) projects/tcp_cc_7.x/lib/libmagic/ (props changed) projects/tcp_cc_7.x/lib/libstand/ (props changed) projects/tcp_cc_7.x/lib/libthr/ (props changed) projects/tcp_cc_7.x/lib/libthread_db/ (props changed) projects/tcp_cc_7.x/lib/libutil/ (props changed) projects/tcp_cc_7.x/lib/msun/ (props changed) projects/tcp_cc_7.x/libexec/ (props changed) projects/tcp_cc_7.x/libexec/rpc.rstatd/ (props changed) projects/tcp_cc_7.x/libexec/rtld-elf/ (props changed) projects/tcp_cc_7.x/release/ (props changed) projects/tcp_cc_7.x/release/Makefile projects/tcp_cc_7.x/release/scripts/src-install.sh (props changed) projects/tcp_cc_7.x/rescue/ (props changed) projects/tcp_cc_7.x/sbin/ (props changed) projects/tcp_cc_7.x/sbin/atacontrol/ (props changed) projects/tcp_cc_7.x/sbin/ddb/ (props changed) projects/tcp_cc_7.x/sbin/devd/ (props changed) projects/tcp_cc_7.x/sbin/devfs/ (props changed) projects/tcp_cc_7.x/sbin/dhclient/ (props changed) projects/tcp_cc_7.x/sbin/dumpfs/ (props changed) projects/tcp_cc_7.x/sbin/fdisk/ (props changed) projects/tcp_cc_7.x/sbin/fdisk_pc98/ (props changed) projects/tcp_cc_7.x/sbin/fsck/ (props changed) projects/tcp_cc_7.x/sbin/fsck_ffs/ (props changed) projects/tcp_cc_7.x/sbin/geom/ (props changed) projects/tcp_cc_7.x/sbin/geom/class/label/ (props changed) projects/tcp_cc_7.x/sbin/geom/class/part/ (props changed) projects/tcp_cc_7.x/sbin/geom/misc/ (props changed) projects/tcp_cc_7.x/sbin/ifconfig/ (props changed) projects/tcp_cc_7.x/sbin/init/ (props changed) projects/tcp_cc_7.x/sbin/ipfw/ (props changed) projects/tcp_cc_7.x/sbin/md5/ (props changed) projects/tcp_cc_7.x/sbin/mdconfig/ (props changed) projects/tcp_cc_7.x/sbin/mksnap_ffs/ (props changed) projects/tcp_cc_7.x/sbin/mount/ (props changed) projects/tcp_cc_7.x/sbin/mount_msdosfs/ (props changed) projects/tcp_cc_7.x/sbin/natd/ (props changed) projects/tcp_cc_7.x/sbin/ping6/ (props changed) projects/tcp_cc_7.x/sbin/route/ (props changed) projects/tcp_cc_7.x/sbin/sconfig/ (props changed) projects/tcp_cc_7.x/sbin/shutdown/ (props changed) projects/tcp_cc_7.x/secure/lib/libssh/ (props changed) projects/tcp_cc_7.x/secure/libexec/sftp-server/ (props changed) projects/tcp_cc_7.x/secure/usr.bin/ssh/ (props changed) projects/tcp_cc_7.x/secure/usr.sbin/sshd/ (props changed) projects/tcp_cc_7.x/share/ (props changed) projects/tcp_cc_7.x/share/colldef/ (props changed) projects/tcp_cc_7.x/share/doc/bind9/ (props changed) projects/tcp_cc_7.x/share/examples/ (props changed) projects/tcp_cc_7.x/share/man/man3/ (props changed) projects/tcp_cc_7.x/share/man/man4/ (props changed) projects/tcp_cc_7.x/share/man/man4/bce.4 projects/tcp_cc_7.x/share/man/man4/igb.4 (props changed) projects/tcp_cc_7.x/share/man/man5/ (props changed) projects/tcp_cc_7.x/share/man/man7/ (props changed) projects/tcp_cc_7.x/share/man/man8/ (props changed) projects/tcp_cc_7.x/share/man/man9/ (props changed) projects/tcp_cc_7.x/share/misc/ (props changed) projects/tcp_cc_7.x/share/mk/ (props changed) projects/tcp_cc_7.x/share/sendmail/ (props changed) projects/tcp_cc_7.x/share/syscons/ (props changed) projects/tcp_cc_7.x/share/syscons/keymaps/ (props changed) projects/tcp_cc_7.x/share/termcap/ (props changed) projects/tcp_cc_7.x/share/timedef/ (props changed) projects/tcp_cc_7.x/share/zoneinfo/ (props changed) projects/tcp_cc_7.x/share/zoneinfo/africa projects/tcp_cc_7.x/share/zoneinfo/asia projects/tcp_cc_7.x/share/zoneinfo/southamerica projects/tcp_cc_7.x/sys/ (props changed) projects/tcp_cc_7.x/sys/amd64/amd64/mp_machdep.c projects/tcp_cc_7.x/sys/amd64/conf/GENERIC projects/tcp_cc_7.x/sys/amd64/linux32/linux.h projects/tcp_cc_7.x/sys/amd64/linux32/linux32_sysvec.c projects/tcp_cc_7.x/sys/boot/i386/btx/btxldr/btxldr.S projects/tcp_cc_7.x/sys/compat/linux/linux_misc.c projects/tcp_cc_7.x/sys/compat/linux/linux_misc.h projects/tcp_cc_7.x/sys/conf/files projects/tcp_cc_7.x/sys/contrib/pf/ (props changed) projects/tcp_cc_7.x/sys/dev/amr/amr.c projects/tcp_cc_7.x/sys/dev/ath/ath_hal/ (props changed) projects/tcp_cc_7.x/sys/dev/cxgb/ (props changed) projects/tcp_cc_7.x/sys/dev/cxgb/cxgb_main.c projects/tcp_cc_7.x/sys/dev/dcons/dcons_os.c projects/tcp_cc_7.x/sys/dev/e1000/if_igb.c projects/tcp_cc_7.x/sys/dev/hptmv/access601.h projects/tcp_cc_7.x/sys/dev/hptmv/amd64-elf.raid.o.uu projects/tcp_cc_7.x/sys/dev/hptmv/array.h projects/tcp_cc_7.x/sys/dev/hptmv/command.h projects/tcp_cc_7.x/sys/dev/hptmv/entry.c projects/tcp_cc_7.x/sys/dev/hptmv/global.h projects/tcp_cc_7.x/sys/dev/hptmv/gui_lib.c projects/tcp_cc_7.x/sys/dev/hptmv/hptintf.h projects/tcp_cc_7.x/sys/dev/hptmv/hptproc.c projects/tcp_cc_7.x/sys/dev/hptmv/i386-elf.raid.o.uu projects/tcp_cc_7.x/sys/dev/hptmv/ioctl.c projects/tcp_cc_7.x/sys/dev/hptmv/mvOs.h projects/tcp_cc_7.x/sys/dev/hptmv/mvSata.h projects/tcp_cc_7.x/sys/dev/hptmv/mvStorageDev.h projects/tcp_cc_7.x/sys/dev/hptmv/osbsd.h projects/tcp_cc_7.x/sys/dev/hptmv/raid5n.h projects/tcp_cc_7.x/sys/dev/hptmv/readme.txt projects/tcp_cc_7.x/sys/dev/hptmv/vdevice.h projects/tcp_cc_7.x/sys/dev/ixgbe/LICENSE projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe.c projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe.h projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_82598.c projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_api.c projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_api.h projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_common.c projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_common.h projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_osdep.h projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_phy.c projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_phy.h projects/tcp_cc_7.x/sys/dev/ixgbe/ixgbe_type.h projects/tcp_cc_7.x/sys/i386/i386/mp_machdep.c projects/tcp_cc_7.x/sys/i386/linux/linux.h projects/tcp_cc_7.x/sys/i386/linux/linux_sysvec.c projects/tcp_cc_7.x/sys/kern/kern_umtx.c projects/tcp_cc_7.x/sys/kern/sys_generic.c projects/tcp_cc_7.x/sys/kern/vfs_cache.c projects/tcp_cc_7.x/sys/kern/vfs_mount.c projects/tcp_cc_7.x/sys/kern/vfs_subr.c projects/tcp_cc_7.x/sys/modules/ixgbe/Makefile projects/tcp_cc_7.x/sys/net/if.c projects/tcp_cc_7.x/sys/netinet/tcp_usrreq.c projects/tcp_cc_7.x/sys/nfsclient/nfs_vfsops.c projects/tcp_cc_7.x/sys/powerpc/powerpc/trap_subr.S projects/tcp_cc_7.x/sys/sys/mount.h projects/tcp_cc_7.x/sys/sys/param.h projects/tcp_cc_7.x/sys/sys/vnode.h projects/tcp_cc_7.x/tools/build/ (props changed) projects/tcp_cc_7.x/tools/regression/atm/ (props changed) projects/tcp_cc_7.x/tools/regression/file/flock/ (props changed) projects/tcp_cc_7.x/tools/regression/usr.bin/ (props changed) projects/tcp_cc_7.x/tools/regression/usr.bin/tr/ (props changed) projects/tcp_cc_7.x/tools/sched/ (props changed) projects/tcp_cc_7.x/tools/tools/crypto/ (props changed) projects/tcp_cc_7.x/tools/tools/editing/ (props changed) projects/tcp_cc_7.x/tools/tools/nanobsd/ (props changed) projects/tcp_cc_7.x/tools/tools/usb/ (props changed) projects/tcp_cc_7.x/usr.bin/ (props changed) projects/tcp_cc_7.x/usr.bin/basename/ (props changed) projects/tcp_cc_7.x/usr.bin/bluetooth/rfcomm_sppd/ (props changed) projects/tcp_cc_7.x/usr.bin/calendar/ (props changed) projects/tcp_cc_7.x/usr.bin/cksum/ (props changed) projects/tcp_cc_7.x/usr.bin/comm/ (props changed) projects/tcp_cc_7.x/usr.bin/cpuset/ (props changed) projects/tcp_cc_7.x/usr.bin/csup/ (props changed) projects/tcp_cc_7.x/usr.bin/dirname/ (props changed) projects/tcp_cc_7.x/usr.bin/du/ (props changed) projects/tcp_cc_7.x/usr.bin/fetch/ (props changed) projects/tcp_cc_7.x/usr.bin/file/ (props changed) projects/tcp_cc_7.x/usr.bin/gprof/ (props changed) projects/tcp_cc_7.x/usr.bin/gzip/ (props changed) projects/tcp_cc_7.x/usr.bin/ipcrm/ (props changed) projects/tcp_cc_7.x/usr.bin/ipcs/ (props changed) projects/tcp_cc_7.x/usr.bin/kdump/ (props changed) projects/tcp_cc_7.x/usr.bin/ktrace/ (props changed) projects/tcp_cc_7.x/usr.bin/ldd/ (props changed) projects/tcp_cc_7.x/usr.bin/locate/ (props changed) projects/tcp_cc_7.x/usr.bin/locate/locate/fastfind.c projects/tcp_cc_7.x/usr.bin/lockf/ (props changed) projects/tcp_cc_7.x/usr.bin/logger/ (props changed) projects/tcp_cc_7.x/usr.bin/make/ (props changed) projects/tcp_cc_7.x/usr.bin/ncal/ (props changed) projects/tcp_cc_7.x/usr.bin/netstat/ (props changed) projects/tcp_cc_7.x/usr.bin/nsupdate/ (props changed) projects/tcp_cc_7.x/usr.bin/procstat/ (props changed) projects/tcp_cc_7.x/usr.bin/sed/ (props changed) projects/tcp_cc_7.x/usr.bin/shar/ (props changed) projects/tcp_cc_7.x/usr.bin/sockstat/ (props changed) projects/tcp_cc_7.x/usr.bin/stat/ (props changed) projects/tcp_cc_7.x/usr.bin/su/ (props changed) projects/tcp_cc_7.x/usr.bin/systat/ (props changed) projects/tcp_cc_7.x/usr.bin/tar/ (props changed) projects/tcp_cc_7.x/usr.bin/top/ (props changed) projects/tcp_cc_7.x/usr.bin/truncate/ (props changed) projects/tcp_cc_7.x/usr.bin/truss/ (props changed) projects/tcp_cc_7.x/usr.bin/units/ (props changed) projects/tcp_cc_7.x/usr.bin/vmstat/ (props changed) projects/tcp_cc_7.x/usr.bin/wc/ (props changed) projects/tcp_cc_7.x/usr.bin/whereis/ (props changed) projects/tcp_cc_7.x/usr.bin/window/ (props changed) projects/tcp_cc_7.x/usr.bin/xargs/ (props changed) projects/tcp_cc_7.x/usr.sbin/ (props changed) projects/tcp_cc_7.x/usr.sbin/adduser/ (props changed) projects/tcp_cc_7.x/usr.sbin/arp/ (props changed) projects/tcp_cc_7.x/usr.sbin/bluetooth/ (props changed) projects/tcp_cc_7.x/usr.sbin/bluetooth/hcsecd/ (props changed) projects/tcp_cc_7.x/usr.sbin/bluetooth/hcseriald/ (props changed) projects/tcp_cc_7.x/usr.sbin/bluetooth/rfcomm_pppd/ (props changed) projects/tcp_cc_7.x/usr.sbin/bluetooth/sdpd/ (props changed) projects/tcp_cc_7.x/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed) projects/tcp_cc_7.x/usr.sbin/burncd/ (props changed) projects/tcp_cc_7.x/usr.sbin/cdcontrol/ (props changed) projects/tcp_cc_7.x/usr.sbin/config/ (props changed) projects/tcp_cc_7.x/usr.sbin/cpucontrol/ (props changed) projects/tcp_cc_7.x/usr.sbin/cron/ (props changed) projects/tcp_cc_7.x/usr.sbin/cron/cron/ (props changed) projects/tcp_cc_7.x/usr.sbin/crunch/ (props changed) projects/tcp_cc_7.x/usr.sbin/eeprom/ (props changed) projects/tcp_cc_7.x/usr.sbin/extattr/ (props changed) projects/tcp_cc_7.x/usr.sbin/freebsd-update/ (props changed) projects/tcp_cc_7.x/usr.sbin/fwcontrol/ (props changed) projects/tcp_cc_7.x/usr.sbin/gstat/ (props changed) projects/tcp_cc_7.x/usr.sbin/iostat/ (props changed) projects/tcp_cc_7.x/usr.sbin/jail/ (props changed) projects/tcp_cc_7.x/usr.sbin/jexec/ (props changed) projects/tcp_cc_7.x/usr.sbin/jls/ (props changed) projects/tcp_cc_7.x/usr.sbin/makefs/ (props changed) projects/tcp_cc_7.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/tcp_cc_7.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/tcp_cc_7.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/tcp_cc_7.x/usr.sbin/makefs/getid.c (props changed) projects/tcp_cc_7.x/usr.sbin/mergemaster/ (props changed) projects/tcp_cc_7.x/usr.sbin/mountd/ (props changed) projects/tcp_cc_7.x/usr.sbin/mtree/ (props changed) projects/tcp_cc_7.x/usr.sbin/ndiscvt/ (props changed) projects/tcp_cc_7.x/usr.sbin/newsyslog/newsyslog.conf.5 (props changed) projects/tcp_cc_7.x/usr.sbin/nscd/ (props changed) projects/tcp_cc_7.x/usr.sbin/ntp/ (props changed) projects/tcp_cc_7.x/usr.sbin/pciconf/ (props changed) projects/tcp_cc_7.x/usr.sbin/pkg_install/ (props changed) projects/tcp_cc_7.x/usr.sbin/pkg_install/add/main.c projects/tcp_cc_7.x/usr.sbin/pmcstat/ (props changed) projects/tcp_cc_7.x/usr.sbin/portsnap/ (props changed) projects/tcp_cc_7.x/usr.sbin/powerd/ (props changed) projects/tcp_cc_7.x/usr.sbin/ppp/ (props changed) projects/tcp_cc_7.x/usr.sbin/ppp/route.c projects/tcp_cc_7.x/usr.sbin/pw/ (props changed) projects/tcp_cc_7.x/usr.sbin/rpc.lockd/ (props changed) projects/tcp_cc_7.x/usr.sbin/rpc.statd/ (props changed) projects/tcp_cc_7.x/usr.sbin/rpc.yppasswdd/ (props changed) projects/tcp_cc_7.x/usr.sbin/sade/ (props changed) projects/tcp_cc_7.x/usr.sbin/setfib/ (props changed) projects/tcp_cc_7.x/usr.sbin/sysinstall/ (props changed) projects/tcp_cc_7.x/usr.sbin/syslogd/ (props changed) projects/tcp_cc_7.x/usr.sbin/traceroute/ (props changed) projects/tcp_cc_7.x/usr.sbin/tzsetup/ (props changed) projects/tcp_cc_7.x/usr.sbin/wpa/wpa_supplicant/ (props changed) Modified: projects/tcp_cc_7.x/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- projects/tcp_cc_7.x/gnu/usr.bin/groff/tmac/mdoc.local Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/gnu/usr.bin/groff/tmac/mdoc.local Thu Apr 16 00:13:23 2009 (r191131) @@ -64,12 +64,13 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.1 +.ds doc-default-operating-system FreeBSD\~7.2 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 .ds doc-operating-system-FreeBSD-8.0 8.0 . .ec Modified: projects/tcp_cc_7.x/lib/libc/db/README ============================================================================== --- projects/tcp_cc_7.x/lib/libc/db/README Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/db/README Thu Apr 16 00:13:23 2009 (r191131) @@ -1,4 +1,5 @@ # @(#)README 8.27 (Berkeley) 9/1/94 +# $FreeBSD$ This is version 1.85 of the Berkeley DB code. @@ -31,10 +32,3 @@ mpool The memory pool routines. recno The fixed/variable length record routines. test Test package. -============================================ -Debugging: - -If you're running a memory checker (e.g. Purify) on DB, make sure that -you recompile it with "-DPURIFY" in the CFLAGS, first. By default, -allocated pages are not initialized by the DB code, and they will show -up as reads of uninitialized memory in the buffer write routines. Modified: projects/tcp_cc_7.x/lib/libc/db/btree/bt_open.c ============================================================================== --- projects/tcp_cc_7.x/lib/libc/db/btree/bt_open.c Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/db/btree/bt_open.c Thu Apr 16 00:13:23 2009 (r191131) @@ -159,9 +159,8 @@ __bt_open(fname, flags, mode, openinfo, goto einval; /* Allocate and initialize DB and BTREE structures. */ - if ((t = (BTREE *)malloc(sizeof(BTREE))) == NULL) + if ((t = (BTREE *)calloc(1, sizeof(BTREE))) == NULL) goto err; - memset(t, 0, sizeof(BTREE)); t->bt_fd = -1; /* Don't close unopened fd on error. */ t->bt_lorder = b.lorder; t->bt_order = NOT; @@ -169,9 +168,8 @@ __bt_open(fname, flags, mode, openinfo, t->bt_pfx = b.prefix; t->bt_rfd = -1; - if ((t->bt_dbp = dbp = (DB *)malloc(sizeof(DB))) == NULL) + if ((t->bt_dbp = dbp = (DB *)calloc(1, sizeof(DB))) == NULL) goto err; - memset(t->bt_dbp, 0, sizeof(DB)); if (t->bt_lorder != machine_lorder) F_SET(t, B_NEEDSWAP); Modified: projects/tcp_cc_7.x/lib/libc/db/btree/bt_split.c ============================================================================== --- projects/tcp_cc_7.x/lib/libc/db/btree/bt_split.c Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/db/btree/bt_split.c Thu Apr 16 00:13:23 2009 (r191131) @@ -381,13 +381,10 @@ bt_page(t, h, lp, rp, skip, ilen) } /* Put the new left page for the split into place. */ - if ((l = (PAGE *)malloc(t->bt_psize)) == NULL) { + if ((l = (PAGE *)calloc(1, t->bt_psize)) == NULL) { mpool_put(t->bt_mp, r, 0); return (NULL); } -#ifdef PURIFY - memset(l, 0xff, t->bt_psize); -#endif l->pgno = h->pgno; l->nextpg = r->pgno; l->prevpg = h->prevpg; Modified: projects/tcp_cc_7.x/lib/libc/db/hash/hash_buf.c ============================================================================== --- projects/tcp_cc_7.x/lib/libc/db/hash/hash_buf.c Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/db/hash/hash_buf.c Thu Apr 16 00:13:23 2009 (r191131) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DEBUG #include @@ -174,18 +175,12 @@ newbuf(hashp, addr, prev_bp) */ if (hashp->nbufs || (bp->flags & BUF_PIN)) { /* Allocate a new one */ - if ((bp = (BUFHEAD *)malloc(sizeof(BUFHEAD))) == NULL) + if ((bp = (BUFHEAD *)calloc(1, sizeof(BUFHEAD))) == NULL) return (NULL); -#ifdef PURIFY - memset(bp, 0xff, sizeof(BUFHEAD)); -#endif - if ((bp->page = (char *)malloc(hashp->BSIZE)) == NULL) { + if ((bp->page = (char *)calloc(1, hashp->BSIZE)) == NULL) { free(bp); return (NULL); } -#ifdef PURIFY - memset(bp->page, 0xff, hashp->BSIZE); -#endif if (hashp->nbufs) hashp->nbufs--; } else { @@ -328,8 +323,10 @@ __buf_free(hashp, do_free, to_disk) } /* Check if we are freeing stuff */ if (do_free) { - if (bp->page) + if (bp->page) { + (void)memset(bp->page, 0, hashp->BSIZE); free(bp->page); + } BUF_REMOVE(bp); free(bp); bp = LRU; Modified: projects/tcp_cc_7.x/lib/libc/db/mpool/mpool.c ============================================================================== --- projects/tcp_cc_7.x/lib/libc/db/mpool/mpool.c Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/db/mpool/mpool.c Thu Apr 16 00:13:23 2009 (r191131) @@ -343,14 +343,11 @@ mpool_bkt(mp) return (bp); } -new: if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL) +new: if ((bp = (BKT *)calloc(1, sizeof(BKT) + mp->pagesize)) == NULL) return (NULL); #ifdef STATISTICS ++mp->pagealloc; #endif -#if defined(DEBUG) || defined(PURIFY) - memset(bp, 0xff, sizeof(BKT) + mp->pagesize); -#endif bp->page = (char *)bp + sizeof(BKT); ++mp->curcache; return (bp); Modified: projects/tcp_cc_7.x/lib/libc/net/getaddrinfo.c ============================================================================== --- projects/tcp_cc_7.x/lib/libc/net/getaddrinfo.c Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/lib/libc/net/getaddrinfo.c Thu Apr 16 00:13:23 2009 (r191131) @@ -102,7 +102,6 @@ __FBSDID("$FreeBSD$"); # define FAITH #endif -#define SUCCESS 0 #define ANY 0 #define YES 1 #define NO 0 @@ -165,19 +164,20 @@ struct explore { static const struct explore explore[] = { #if 0 - { PF_LOCAL, 0, ANY, ANY, NULL, 0x01 }, + { PF_LOCAL, ANY, ANY, NULL, 0x01 }, #endif #ifdef INET6 { PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, { PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, + { PF_INET6, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 }, + { PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 }, { PF_INET6, SOCK_RAW, ANY, NULL, 0x05 }, #endif { PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, { PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, + { PF_INET, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 }, + { PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 }, { PF_INET, SOCK_RAW, ANY, NULL, 0x05 }, - { PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 }, { -1, 0, 0, NULL, 0 }, }; @@ -227,6 +227,8 @@ typedef union { } querybuf; static int str2number(const char *, int *); +static int explore_copy(const struct addrinfo *, const struct addrinfo *, + struct addrinfo **); static int explore_null(const struct addrinfo *, const char *, struct addrinfo **); static int explore_numeric(const struct addrinfo *, const char *, @@ -237,6 +239,7 @@ static int get_canonname(const struct ad struct addrinfo *, const char *); static struct addrinfo *get_ai(const struct addrinfo *, const struct afd *, const char *); +static struct addrinfo *copy_ai(const struct addrinfo *); static int get_portmatch(const struct addrinfo *, const char *); static int get_port(struct addrinfo *, const char *, int); static const struct afd *find_afd(int); @@ -365,12 +368,23 @@ getaddrinfo(const char *hostname, const struct addrinfo sentinel; struct addrinfo *cur; int error = 0; - struct addrinfo ai; - struct addrinfo ai0; + struct addrinfo ai, ai0, *afai; struct addrinfo *pai; + const struct afd *afd; const struct explore *ex; + struct addrinfo *afailist[sizeof(afdl)/sizeof(afdl[0])]; + struct addrinfo *afai_unspec; + int found; int numeric = 0; + /* ensure we return NULL on errors */ + *res = NULL; + + memset(&ai, 0, sizeof(ai)); + + memset(afailist, 0, sizeof(afailist)); + afai_unspec = NULL; + memset(&sentinel, 0, sizeof(sentinel)); cur = &sentinel; pai = &ai; @@ -410,17 +424,22 @@ getaddrinfo(const char *hostname, const */ if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) { for (ex = explore; ex->e_af >= 0; ex++) { - if (pai->ai_family != ex->e_af) + if (!MATCH_FAMILY(pai->ai_family, ex->e_af, + WILD_AF(ex))) continue; - if (ex->e_socktype == ANY) + if (!MATCH(pai->ai_socktype, ex->e_socktype, + WILD_SOCKTYPE(ex))) continue; - if (ex->e_protocol == ANY) + if (!MATCH(pai->ai_protocol, ex->e_protocol, + WILD_PROTOCOL(ex))) continue; - if (pai->ai_socktype == ex->e_socktype && - pai->ai_protocol != ex->e_protocol) { - ERR(EAI_BADHINTS); - } + + /* matched */ + break; } + + if (ex->e_af < 0) + ERR(EAI_BADHINTS); } } @@ -473,49 +492,48 @@ getaddrinfo(const char *hostname, const ai0 = *pai; - /* NULL hostname, or numeric hostname */ - for (ex = explore; ex->e_af >= 0; ex++) { + /* + * NULL hostname, or numeric hostname. + * If numeric representation of AF1 can be interpreted as FQDN + * representation of AF2, we need to think again about the code below. + */ + found = 0; + for (afd = afdl; afd->a_af; afd++) { *pai = ai0; - /* PF_UNSPEC entries are prepared for DNS queries only */ - if (ex->e_af == PF_UNSPEC) - continue; - - if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex))) - continue; - if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex))) - continue; - if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex))) + if (!MATCH_FAMILY(pai->ai_family, afd->a_af, 1)) continue; if (pai->ai_family == PF_UNSPEC) - pai->ai_family = ex->e_af; - if (pai->ai_socktype == ANY && ex->e_socktype != ANY) - pai->ai_socktype = ex->e_socktype; - if (pai->ai_protocol == ANY && ex->e_protocol != ANY) - pai->ai_protocol = ex->e_protocol; + pai->ai_family = afd->a_af; - if (hostname == NULL) - error = explore_null(pai, servname, &cur->ai_next); - else + if (hostname == NULL) { + error = explore_null(pai, servname, + &afailist[afd - afdl]); + + /* + * Errors from explore_null should be unexpected and + * be caught to avoid returning an incomplete result. + */ + if (error != 0) + goto bad; + } else { error = explore_numeric_scope(pai, hostname, servname, - &cur->ai_next); + &afailist[afd - afdl]); - if (error) - goto free; + /* + * explore_numeric_scope returns an error for address + * families that do not match that of hostname. + * Thus we should not catch the error at this moment. + */ + } - while (cur && cur->ai_next) - cur = cur->ai_next; + if (!error && afailist[afd - afdl]) + found++; } - - /* - * XXX - * If numreic representation of AF1 can be interpreted as FQDN - * representation of AF2, we need to think again about the code below. - */ - if (sentinel.ai_next) { + if (found) { numeric = 1; - goto good; + goto globcopy; } if (hostname == NULL) @@ -528,42 +546,55 @@ getaddrinfo(const char *hostname, const /* * hostname as alphabetical name. - * we would like to prefer AF_INET6 than AF_INET, so we'll make a - * outer loop by AFs. */ + *pai = ai0; + error = explore_fqdn(pai, hostname, servname, &afai_unspec); + +globcopy: for (ex = explore; ex->e_af >= 0; ex++) { *pai = ai0; - /* require exact match for family field */ - if (pai->ai_family != ex->e_af) + if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex))) continue; - if (!MATCH(pai->ai_socktype, ex->e_socktype, - WILD_SOCKTYPE(ex))) { + WILD_SOCKTYPE(ex))) continue; - } if (!MATCH(pai->ai_protocol, ex->e_protocol, - WILD_PROTOCOL(ex))) { + WILD_PROTOCOL(ex))) continue; - } + if (pai->ai_family == PF_UNSPEC) + pai->ai_family = ex->e_af; if (pai->ai_socktype == ANY && ex->e_socktype != ANY) pai->ai_socktype = ex->e_socktype; if (pai->ai_protocol == ANY && ex->e_protocol != ANY) pai->ai_protocol = ex->e_protocol; - error = explore_fqdn(pai, hostname, servname, - &cur->ai_next); + /* + * if the servname does not match socktype/protocol, ignore it. + */ + if (get_portmatch(pai, servname) != 0) + continue; + + if (afai_unspec) + afai = afai_unspec; + else { + if ((afd = find_afd(pai->ai_family)) == NULL) + continue; + /* XXX assumes that afd points inside afdl[] */ + afai = afailist[afd - afdl]; + } + if (!afai) + continue; + + error = explore_copy(pai, afai, &cur->ai_next); + if (error != 0) + goto bad; while (cur && cur->ai_next) cur = cur->ai_next; } - /* XXX inhibit errors if we have the result */ - if (sentinel.ai_next) - error = 0; - -good: /* * ensure we return either: * - error == 0, non-NULL *res @@ -599,16 +630,22 @@ good: } } *res = sentinel.ai_next; - return SUCCESS; } else error = EAI_FAIL; } -free: + bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); - *res = NULL; - return error; + if (afai_unspec) + freeaddrinfo(afai_unspec); + for (afd = afdl; afd->a_af; afd++) { + if (afailist[afd - afdl]) + freeaddrinfo(afailist[afd - afdl]); + } + if (!*res) + if (sentinel.ai_next) + freeaddrinfo(sentinel.ai_next); + + return (error); } static int @@ -1060,6 +1097,41 @@ gai_addr2scopetype(struct sockaddr *sa) } } +static int +explore_copy(const struct addrinfo *pai, const struct addrinfo *src0, + struct addrinfo **res) +{ + int error; + struct addrinfo sentinel, *cur; + const struct addrinfo *src; + + error = 0; + sentinel.ai_next = NULL; + cur = &sentinel; + + for (src = src0; src != NULL; src = src->ai_next) { + if (src->ai_family != pai->ai_family) + continue; + + cur->ai_next = copy_ai(src); + if (!cur->ai_next) { + error = EAI_MEMORY; + goto fail; + } + + cur->ai_next->ai_socktype = pai->ai_socktype; + cur->ai_next->ai_protocol = pai->ai_protocol; + cur = cur->ai_next; + } + + *res = sentinel.ai_next; + return 0; + +fail: + freeaddrinfo(sentinel.ai_next); + return error; +} + /* * hostname == NULL. * passive socket -> anyaddr (0.0.0.0 or ::) @@ -1088,12 +1160,6 @@ explore_null(const struct addrinfo *pai, } else _close(s); - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - afd = find_afd(pai->ai_family); if (afd == NULL) return 0; @@ -1130,12 +1196,6 @@ explore_numeric(const struct addrinfo *p *res = NULL; ai = NULL; - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - afd = find_afd(pai->ai_family); if (afd == NULL) return 0; @@ -1202,12 +1262,6 @@ explore_numeric_scope(const struct addri char *cp, *hostname2 = NULL, *scope, *addr; struct sockaddr_in6 *sin6; - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - afd = find_afd(pai->ai_family); if (afd == NULL) return 0; @@ -1240,6 +1294,8 @@ explore_numeric_scope(const struct addri sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr; if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) { free(hostname2); + freeaddrinfo(*res); + *res = NULL; return(EAI_NONAME); /* XXX: is return OK? */ } sin6->sin6_scope_id = scopeid; @@ -1248,6 +1304,10 @@ explore_numeric_scope(const struct addri free(hostname2); + if (error && *res) { + freeaddrinfo(*res); + *res = NULL; + } return error; #endif } @@ -1331,6 +1391,38 @@ get_ai(const struct addrinfo *pai, const return ai; } +/* XXX need to malloc() the same way we do from other functions! */ +static struct addrinfo * +copy_ai(const struct addrinfo *pai) +{ + struct addrinfo *ai; + size_t l; + + l = sizeof(*ai) + pai->ai_addrlen; + if ((ai = (struct addrinfo *)malloc(l)) == NULL) + return NULL; + memset(ai, 0, l); + memcpy(ai, pai, sizeof(*ai)); + ai->ai_addr = (struct sockaddr *)(void *)(ai + 1); + memcpy(ai->ai_addr, pai->ai_addr, pai->ai_addrlen); + + if (pai->ai_canonname) { + l = strlen(pai->ai_canonname) + 1; + if ((ai->ai_canonname = malloc(l)) == NULL) { + free(ai); + return NULL; + } + strlcpy(ai->ai_canonname, pai->ai_canonname, l); + } else { + /* just to make sure */ + ai->ai_canonname = NULL; + } + + ai->ai_next = NULL; + + return ai; +} + static int get_portmatch(const struct addrinfo *ai, const char *servname) { @@ -1365,10 +1457,21 @@ get_port(struct addrinfo *ai, const char return EAI_SERVICE; case SOCK_DGRAM: case SOCK_STREAM: + case SOCK_SEQPACKET: allownumeric = 1; break; case ANY: - allownumeric = 0; + switch (ai->ai_family) { + case AF_INET: +#ifdef AF_INET6 + case AF_INET6: +#endif + allownumeric = 1; + break; + default: + allownumeric = 0; + break; + } break; default: return EAI_SOCKTYPE; @@ -1384,13 +1487,17 @@ get_port(struct addrinfo *ai, const char } else { if (ai->ai_flags & AI_NUMERICSERV) return EAI_NONAME; - switch (ai->ai_socktype) { - case SOCK_DGRAM: + + switch (ai->ai_protocol) { + case IPPROTO_UDP: proto = "udp"; break; - case SOCK_STREAM: + case IPPROTO_TCP: proto = "tcp"; break; + case IPPROTO_SCTP: + proto = "sctp"; + break; default: proto = NULL; break; Modified: projects/tcp_cc_7.x/release/Makefile ============================================================================== --- projects/tcp_cc_7.x/release/Makefile Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/release/Makefile Thu Apr 16 00:13:23 2009 (r191131) @@ -18,11 +18,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=7.1-STABLE +#BUILDNAME=7.2-STABLE # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 7.1 +BASE = 7.2 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release Modified: projects/tcp_cc_7.x/share/man/man4/bce.4 ============================================================================== --- projects/tcp_cc_7.x/share/man/man4/bce.4 Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/share/man/man4/bce.4 Thu Apr 16 00:13:23 2009 (r191131) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 15, 2009 +.Dd April 7, 2009 .Dt BCE 4 .Os .Sh NAME @@ -109,8 +109,18 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseSX +Sets 1000Mbps operation. +Only +.Cm full-duplex +mode is supported at this speed. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. +Only +.Cm full-duplex +mode is supported. +.It Cm 2500BaseSX +Set 2500Mbps operation. Only .Cm full-duplex mode is supported. Modified: projects/tcp_cc_7.x/share/zoneinfo/africa ============================================================================== --- projects/tcp_cc_7.x/share/zoneinfo/africa Wed Apr 15 22:38:22 2009 (r191130) +++ projects/tcp_cc_7.x/share/zoneinfo/africa Thu Apr 16 00:13:23 2009 (r191131) @@ -1,4 +1,4 @@ -# @(#)africa 8.17 +# @(#)africa 8.18 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -564,6 +564,40 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
 # 
+
+# From Steffen Thorsen (2009-03-17):
+# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
+# to many sources, such as
+# 
+# http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
+# 
+# 
+# http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
+# 
+# (French)
+#
+# Our summary:
+# 
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+# 
+
+# From Alexander Krivenyshev (2009-03-17):
+# Here is a link to official document from Royaume du Maroc Premier Ministre,
+# Ministere de la Modernisation des Secteurs Publics
+#
+# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+# concerning the amendment of the legal time, the Ministry of Modernization of
+# Public Sectors announced that the official time in the Kingdom will be
+# advanced 60 minutes from Sunday 31 May 2009 at midnight.
+#
+# 
+# http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
+# 
+#
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
+# 
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -583,6 +617,8 @@ Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:
 Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
 Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
+Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
+Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -787,6 +823,43 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Ending         : the last Sunday of October at 03:00 ...
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50
 
+# From Steffen Thorsen (2009-03-16):
+# According to several news sources, Tunisia will not observe DST this year.
+# (Arabic)
+# 
+# http://www.elbashayer.com/?page=viewn&nid=42546
+# 
+# 
+# http://www.babnet.net/kiwidetail-15295.asp
+# 
+#
+# We have also confirmed this with the US embassy in Tunisia.
+# We have a wrap-up about this on the following page:
+# 
+# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+# 
+
+# From Alexander Krivenyshev (2009-03-17):
+# Here is a link to Tunis Afrique Presse News Agency
+#
+# Standard time to be kept the whole year long (tap.info.tn):
+#
+# (in English)
+# 
+# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
+# 
+#
+# (in Arabic)
+# 
+# http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
+# 
+
+# From Arthur David Olson (2009--3-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
+# that the fasting month of ramadan coincides with the period concerned by summer time.
+# Therefore, the standard time will be kept unchanged the whole year long."
+# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	Tunisia	1939	only	-	Nov	18	23:00s	0	-
@@ -811,8 +884,10 @@ Rule	Tunisia	1989	only	-	Mar	26	 0:00s	1
 Rule	Tunisia	1990	only	-	May	 1	 0:00s	1:00	S
 Rule	Tunisia	2005	only	-	May	 1	 0:00s	1:00	S
 Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
-Rule	Tunisia	2006	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Tunisia	2006	max	-	Oct	lastSun	 2:00s	0	-
+Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
+Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.

Modified: projects/tcp_cc_7.x/share/zoneinfo/asia
==============================================================================
--- projects/tcp_cc_7.x/share/zoneinfo/asia	Wed Apr 15 22:38:22 2009	(r191130)
+++ projects/tcp_cc_7.x/share/zoneinfo/asia	Thu Apr 16 00:13:23 2009	(r191131)
@@ -1,4 +1,4 @@
-# @(#)asia	8.25
+# @(#)asia	8.29
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1049,6 +1049,40 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 3
 # http://www.petranews.gov.jo/nepras/2006/Sep/05/4000.htm
 # "Jordan will switch to winter time on Friday, October 27".
 #
+
+# From Phil Pizzey (2009-04-02):
+# ...I think I may have spotted an error in the timezone data for
+# Jordan.
+# The current (2009d) asia file shows Jordan going to daylight
+# saving
+# time on the last Thursday in March.
+#
+# Rule  Jordan      2000  max	-  Mar   lastThu     0:00s 1:00  S
+#
+# However timeanddate.com, which I usually find reliable, shows Jordan
+# going to daylight saving time on the last Friday in March since 2002.
+# Please see
+# 
+# http://www.timeanddate.com/worldclock/timezone.html?n=11
+# 
+
+# From Steffen Thorsen (2009-04-02):
+# This single one might be good enough, (2009-03-24, Arabic):
+# 
+# http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279
+# 
+#
+# Google's translation:
+#
+# > The Council of Ministers decided in 2002 to adopt the principle of timely
+# > submission of the summer at 60 minutes as of midnight on the last Thursday
+# > of the month of March of each year.
+#
+# So - this means the midnight between Thursday and Friday since 2002.
+
+# From Arthur David Olson (2009-04-06):
+# We still have Jordan switching to DST on Thursdays in 2000 and 2001.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
 Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
@@ -1071,8 +1105,9 @@ Rule	Jordan	1993	1998	-	Apr	Fri>=1	0:00	
 Rule	Jordan	1994	only	-	Sep	Fri>=15	0:00	0	-
 Rule	Jordan	1995	1998	-	Sep	Fri>=15	0:00s	0	-
 Rule	Jordan	1999	only	-	Jul	 1	0:00s	1:00	S
-Rule	Jordan	1999	2002	-	Sep	lastThu	0:00s	0	-
-Rule	Jordan	2000	max	-	Mar	lastThu	0:00s	1:00	S
+Rule	Jordan	1999	2002	-	Sep	lastFri	0:00s	0	-
+Rule	Jordan	2000	2001	-	Mar	lastThu	0:00s	1:00	S
+Rule	Jordan	2002	max	-	Mar	lastFri	0:00s	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
 Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
@@ -1695,6 +1730,22 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html
 # 
 
+# From Alexander Krivenyshev (2009-03-26):
+# According to the Palestine News Network (arabic.pnn.ps), Palestinian
+# government decided to start Daylight Time on Thursday night March
+# 26 and continue until the night of 27 September 2009.
+#
+# (in Arabic)
+# 
+# http://arabic.pnn.ps/index.php?option=com_content&task=view&id=50850
+# 
+#
+# or
+# (English translation)
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_westbank01.html
+# 
+
 # The rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -1708,10 +1759,12 @@ Rule Palestine	1999	2005	-	Apr	Fri>=15	0
 Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
 Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
 Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
-Rule Palestine	2006	max	-	Apr	 1	0:00	1:00	S
+Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
 Rule Palestine	2006	only	-	Sep	22	0:00	0	-
 Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-Rule Palestine	2008	max	-	Aug	lastThu	2:00	0	-
+Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
+Rule Palestine	2009	max	-	Mar	lastFri	0:00	1:00	S
+Rule Palestine	2009	max	-	Sep	lastMon	2:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
@@ -1969,8 +2022,29 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	
 # http://sana.sy/ara/2/2008/10/07/195459.htm
 # 
 
-Rule	Syria	2008	max	-	Apr	Fri>=1	0:00	1:00	S
+# From Steffen Thorsen (2009-03-19):
+# Syria will start DST on 2009-03-27 00:00 this year according to many sources,
+# two examples:
+#
+# 
+# http://www.sana.sy/eng/21/2009/03/17/217563.htm
+# 
+# (English, Syrian Arab News # Agency)
+# 
+# http://thawra.alwehda.gov.sy/_View_news2.asp?FileName=94459258720090318012209
+# 
+# (Arabic, gov-site)
+#
+# We have not found any sources saying anything about when DST ends this year.
+#
+# Our summary
+# 
+# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
+# 
+
+Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
 Rule	Syria	2008	max	-	Nov	1	0:00	0	-
+Rule	Syria	2009	max	-	Mar	lastFri	0:00	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq

Modified: projects/tcp_cc_7.x/share/zoneinfo/southamerica
==============================================================================
--- projects/tcp_cc_7.x/share/zoneinfo/southamerica	Wed Apr 15 22:38:22 2009	(r191130)
+++ projects/tcp_cc_7.x/share/zoneinfo/southamerica	Thu Apr 16 00:13:23 2009	(r191131)
@@ -1,4 +1,4 @@
-# @(#)southamerica	8.33
+# @(#)southamerica	8.34
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -351,6 +351,50 @@ Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:0
 # keep America/Cordoba a single region rather than splitting it into the
 # other 5 subregions.
 
+# From Mariano Absatz (2009-03-13):
+# Yesterday (with our usual 2-day notice) the Province of San Luis
+# decided that next Sunday instead of "staying" @utc-03:00 they will go
+# to utc-04:00 until the second Saturday in October...
+#
+# The press release is at
+# 
+# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
+# 
+# (I couldn't find the decree, but
+# 
+# www.sanluis.gov.ar
+# 
+# is the official page for the Province Government).
+#
+# There's also a note in only one of the major national papers (La Nación) at
+# 
+# http://www.lanacion.com.ar/nota.asp?nota_id=1107912
+# 
+# 
+# The press release says:
+#  (...) anunció que el próximo domingo a las 00:00 los puntanos deberán
+# atrasar una hora sus relojes.
+#
+# A partir de entonces, San Luis establecerá el huso horario propio de
+# la Provincia. De esta manera, durante el periodo del calendario anual
+# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer
+# domingo de marzo y las 24:00 del segundo sábado de octubre.
+# Quick&dirty translation
+# (...) announced that next Sunday, at 00:00, Puntanos (the San Luis
+# inhabitants) will have to turn back one hour their clocks
+#
+# Since then, San Luis will establish its own Province timezone. Thus,
+# during 2009, this timezone change will run from 00:00 the third Sunday
+# in March until 24:00 of the second Saturday in October.
+
+# From Arthur David Olson (2009-03-16):
+# The unofficial claim at
+# 
+# http://www.timeanddate.com/news/time/san-luis-new-time-zone.html
+# 
+# is that "The province will most likely follow the next daylight saving schedule,
+# which is planned for the second Sunday in October."
+
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
@@ -498,7 +542,8 @@ Zone America/Argentina/San_Luis -4:25:24
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
 			-3:00	Arg	AR%sT	2008 Jan 21
-			-3:00	-	ART
+			-3:00	-	ART	2009 Mar 15
+			-4:00	Arg	WAR%sT
 #
 # Santa Cruz (SC)
 Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31

Modified: projects/tcp_cc_7.x/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/tcp_cc_7.x/sys/amd64/amd64/mp_machdep.c	Wed Apr 15 22:38:22 2009	(r191130)
+++ projects/tcp_cc_7.x/sys/amd64/amd64/mp_machdep.c	Thu Apr 16 00:13:23 2009	(r191131)
@@ -153,6 +153,7 @@ struct cpu_info {
 	int	cpu_present:1;
 	int	cpu_bsp:1;
 	int	cpu_disabled:1;
+	int	cpu_hyperthread:1;
 } static cpu_info[MAX_APIC_ID + 1];
 int cpu_apic_ids[MAXCPU];
 
@@ -355,11 +356,6 @@ cpu_mp_start(void)
 		    ("BSP's APIC ID doesn't match boot_cpu_id"));
 	cpu_apic_ids[0] = boot_cpu_id;
 
-	assign_cpu_ids();
-
-	/* Start each Application Processor */
-	start_all_aps();
-
 	/* Setup the initial logical CPUs info. */
 	logical_cpus = logical_cpus_mask = 0;
 	if (cpu_feature & CPUID_HTT)
@@ -407,6 +403,11 @@ cpu_mp_start(void)
 			hyperthreading_cpus = logical_cpus;
 	}
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 03:22:44 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8563F106566C;
	Thu, 16 Apr 2009 03:22:44 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 733DF8FC14;
	Thu, 16 Apr 2009 03:22:44 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3G3Mi7P065513;
	Thu, 16 Apr 2009 03:22:44 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3G3MiH7065512;
	Thu, 16 Apr 2009 03:22:44 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904160322.n3G3MiH7065512@svn.freebsd.org>
From: Lawrence Stewart 
Date: Thu, 16 Apr 2009 03:22:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191132 - in projects/tcp_cc_7.x/sys: . contrib/pf
	dev/ath/ath_hal dev/cxgb netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 03:22:44 -0000

Author: lstewart
Date: Thu Apr 16 03:22:44 2009
New Revision: 191132
URL: http://svn.freebsd.org/changeset/base/191132

Log:
  Merge r190862 from projects/tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/netinet/cc_htcp.c

Modified: projects/tcp_cc_7.x/sys/netinet/cc_htcp.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc_htcp.c	Thu Apr 16 00:13:23 2009	(r191131)
+++ projects/tcp_cc_7.x/sys/netinet/cc_htcp.c	Thu Apr 16 03:22:44 2009	(r191132)
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2008 Swinburne University of Technology, Melbourne, Australia
+ * Copyright (c) 2007-2009
+ * 	Swinburne University of Technology, Melbourne, Australia
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
@@ -33,7 +34,7 @@
 /*
  * HTCP
  *
- * An implementation of HTCP congestion algorithm for FreeBSD 7.0
+ * An implementation of HTCP congestion algorithm for FreeBSD.
  * The algorithm is based on the one described in "H-TCP: A framework
  * for congestion control in high-speed and long-distance networks" by
  * Leith, Shorten and Lee.

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 04:05:40 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 215A71065673;
	Thu, 16 Apr 2009 04:05:40 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D9DB8FC13;
	Thu, 16 Apr 2009 04:05:40 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3G45dE0066779;
	Thu, 16 Apr 2009 04:05:39 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3G45dim066776;
	Thu, 16 Apr 2009 04:05:39 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904160405.n3G45dim066776@svn.freebsd.org>
From: Lawrence Stewart 
Date: Thu, 16 Apr 2009 04:05:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191133 - in projects/tcp_cc_7.x/sys: . conf contrib/pf
	dev/ath/ath_hal dev/cxgb netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 04:05:40 -0000

Author: lstewart
Date: Thu Apr 16 04:05:39 2009
New Revision: 191133
URL: http://svn.freebsd.org/changeset/base/191133

Log:
  Merge r190999 from projects/tcp_cc_8.x

Added:
  projects/tcp_cc_7.x/sys/netinet/cc_newreno.c
     - copied, changed from r190999, projects/tcp_cc_8.x/sys/netinet/cc_newreno.c
Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/conf/files
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/netinet/cc.c

Modified: projects/tcp_cc_7.x/sys/conf/files
==============================================================================
--- projects/tcp_cc_7.x/sys/conf/files	Thu Apr 16 03:22:44 2009	(r191132)
+++ projects/tcp_cc_7.x/sys/conf/files	Thu Apr 16 04:05:39 2009	(r191133)
@@ -1966,6 +1966,7 @@ netinet/ip_options.c		optional inet
 netinet/ip_output.c		optional inet
 netinet/raw_ip.c		optional inet
 netinet/cc.c			optional inet
+netinet/cc_newreno.c		optional inet
 netinet/sctp_asconf.c		optional inet sctp
 netinet/sctp_auth.c		optional inet sctp
 netinet/sctp_bsd_addr.c		optional inet sctp

Modified: projects/tcp_cc_7.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc.c	Thu Apr 16 03:22:44 2009	(r191132)
+++ projects/tcp_cc_7.x/sys/netinet/cc.c	Thu Apr 16 04:05:39 2009	(r191133)
@@ -1,13 +1,12 @@
 /*-
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
- *	The Regents of the University of California.
- * Copyright (c) 2008 Swinburne University of Technology, Melbourne, Australia
+ * Copyright (c) 2007-2009
+ *	Swinburne University of Technology, Melbourne, Australia
  * All rights reserved.
  *
- * The majority of this software was developed at the Centre for
- * Advanced Internet Architectures, Swinburne University, by Lawrence Stewart
- * and James Healy, made possible in part by a grant from the Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
+ * This software was developed at the Centre for Advanced Internet
+ * Architectures, Swinburne University, by Lawrence Stewart and James Healy,
+ * made possible in part by a grant from the Cisco University Research Program
+ * Fund at Community Foundation Silicon Valley.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -49,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 
 /* list of available cc algorithms on the current system */
@@ -57,19 +55,6 @@ struct cc_head cc_list = STAILQ_HEAD_INI
 
 struct rwlock cc_list_lock;
 
-/* create a struct to point to our newreno functions */
-struct cc_algo newreno_cc_algo = {
-	.name = "newreno",
-	.init = newreno_init,
-	.deinit = NULL,
-	.cwnd_init = newreno_cwnd_init,
-	.ack_received = newreno_ack_received,
-	.pre_fr = newreno_pre_fr,
-	.post_fr = newreno_post_fr,
-	.after_idle = newreno_after_idle,
-	.after_timeout = newreno_after_timeout
-};
-
 /* the system wide default cc algorithm */
 char cc_algorithm[TCP_CA_NAME_MAX];
 
@@ -236,210 +221,6 @@ cc_register_algorithm(struct cc_algo *ad
 	return 1;
 }
 
-/*
- * NEW RENO
- */
-
-int
-newreno_init(struct tcpcb *tp)
-{
-	return 0;
-}
-
-/*
- * update ssthresh to approx 1/2 of cwnd
- */
-void
-newreno_ssthresh_update(struct tcpcb *tp)
-{
-	u_int win;
-
-	/* reset ssthresh */
-	win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;
-
-	if (win < 2)
-		win = 2;
-
-	tp->snd_ssthresh = win * tp->t_maxseg;
-}
-
-/*
- * initial cwnd at the start of a connection
- * if there is a hostcache entry for the foreign host, base cwnd on that
- * if rfc3390 is enabled, set cwnd to approx 4 MSS as recommended
- * otherwise use the sysctl variables configured by the administrator
- */
-void
-newreno_cwnd_init(struct tcpcb *tp)
-{
-	struct hc_metrics_lite metrics;
-	struct inpcb *inp = tp->t_inpcb;
-	struct socket *so = inp->inp_socket;
-
-	/*
-	 * Set the slow-start flight size depending on whether this
-	 * is a local network or not.
-	 *
-	 * Extend this so we cache the cwnd too and retrieve it here.
-	 * Make cwnd even bigger than RFC3390 suggests but only if we
-	 * have previous experience with the remote host. Be careful
-	 * not make cwnd bigger than remote receive window or our own
-	 * send socket buffer. Maybe put some additional upper bound
-	 * on the retrieved cwnd. Should do incremental updates to
-	 * hostcache when cwnd collapses so next connection doesn't
-	 * overloads the path again.
-	 *
-	 * RFC3390 says only do this if SYN or SYN/ACK didn't got lost.
-	 * We currently check only in syncache_socket for that.
-	 */
-
-	tcp_hc_get(&inp->inp_inc, &metrics);
-
-#define TCP_METRICS_CWND
-#ifdef TCP_METRICS_CWND
-	if (metrics.rmx_cwnd)
-		tp->snd_cwnd = max(tp->t_maxseg,
-				min(metrics.rmx_cwnd / 2,
-				 min(tp->snd_wnd, so->so_snd.sb_hiwat)));
-	else
-#endif
-	if (tcp_do_rfc3390)
-		tp->snd_cwnd = min(4 * tp->t_maxseg, max(2 * tp->t_maxseg, 4380));
-#ifdef INET6
-	else if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) ||
-		 (!isipv6 && in_localaddr(inp->inp_faddr)))
-#else
-	else if (in_localaddr(inp->inp_faddr))
-#endif
-		tp->snd_cwnd = tp->t_maxseg * ss_fltsz_local;
-	else
-		tp->snd_cwnd = tp->t_maxseg * ss_fltsz;
-}
-
-/*
- * increase cwnd on receipt of a successful ACK
- * if cwnd <= ssthresh, increases by 1 MSS per ACK
- * if cwnd > ssthresh, increase by ~1 MSS per RTT
- */
-void
-newreno_ack_received(struct tcpcb *tp, struct tcphdr *th)
-{
-	u_int cw = tp->snd_cwnd;
-	u_int incr = tp->t_maxseg;
-
-	/*
-	 * If cwnd <= ssthresh, open exponentially (maxseg per packet).
-	 * Otherwise, open linearly (approx. maxseg per RTT
-	 * i.e. maxseg^2 / cwnd per ACK received).
-	 * If cwnd > maxseg^2, fix the cwnd increment at 1 byte
-	 * to avoid capping cwnd (as suggested in RFC2581).
-	 */
-	if (cw > tp->snd_ssthresh)
-		incr = max((incr * incr / cw), 1);
-
-	tp->snd_cwnd = min(cw+incr, TCP_MAXWIN<snd_scale);
-}
-
-/*
- * update the value of ssthresh before entering FR
- */
-void
-newreno_pre_fr(struct tcpcb *tp, struct tcphdr *th)
-{
-	newreno_ssthresh_update(tp);
-}
-
-/*
- * decrease the cwnd in response to packet loss or a transmit timeout.
- * th can be null, in which case cwnd will be set according to reno instead
- * of new reno.
- */
-void
-newreno_post_fr(struct tcpcb *tp, struct tcphdr *th)
-{
-	/*
-	* Out of fast recovery.
-	* Window inflation should have left us
-	* with approximately snd_ssthresh
-	* outstanding data.
-	* But in case we would be inclined to
-	* send a burst, better to do it via
-	* the slow start mechanism.
-	*/
-	if (th && SEQ_GT(th->th_ack + tp->snd_ssthresh, tp->snd_max))
-		tp->snd_cwnd = tp->snd_max - th->th_ack + tp->t_maxseg;
-	else
-		tp->snd_cwnd = tp->snd_ssthresh;
-}
-
-/*
- * if a connection has been idle for a while and more data is ready to be sent,
- * reset cwnd
- */
-void
-newreno_after_idle(struct tcpcb *tp)
-{
-	/*
-	* We have been idle for "a while" and no acks are
-	* expected to clock out any data we send --
-	* slow start to get ack "clock" running again.
-	*
-	* Set the slow-start flight size depending on whether
-	* this is a local network or not.
-	*
-	* Set the slow-start flight size depending on whether
-	* this is a local network or not.
-	*/
-	int ss = ss_fltsz;
-
-#ifdef INET6
-	if (isipv6) {
-		if (in6_localaddr(&tp->t_inpcb->in6p_faddr))
-			ss = ss_fltsz_local;
-	} else
-#endif /* INET6 */
-
-	if (in_localaddr(tp->t_inpcb->inp_faddr))
-		ss = ss_fltsz_local;
-
-	tp->snd_cwnd = tp->t_maxseg * ss;
-}
-
-/*
- * reset the cwnd after a transmission timeout.
- */
-void
-newreno_after_timeout(struct tcpcb *tp)
-{
-	newreno_ssthresh_update(tp);
-
-	/*
-	 * Close the congestion window down to one segment
-	 * (we'll open it by one segment for each ack we get).
-	 * Since we probably have a window's worth of unacked
-	 * data accumulated, this "slow start" keeps us from
-	 * dumping all that data as back-to-back packets (which
-	 * might overwhelm an intermediate gateway).
-	 *
-	 * There are two phases to the opening: Initially we
-	 * open by one mss on each ack.  This makes the window
-	 * size increase exponentially with time.  If the
-	 * window is larger than the path can handle, this
-	 * exponential growth results in dropped packet(s)
-	 * almost immediately.  To get more time between
-	 * drops but still "push" the network to take advantage
-	 * of improving conditions, we switch from exponential
-	 * to linear window opening at some threshhold size.
-	 * For a threshhold, we use half the current window
-	 * size, truncated to a multiple of the mss.
-	 *
-	 * (the minimum cwnd that will give us exponential
-	 * growth is 2 mss.  We don't allow the threshhold
-	 * to go below this.)
-	 */
-	tp->snd_cwnd = tp->t_maxseg;
-}
-
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, cc, CTLFLAG_RW, NULL,
 	"congestion control related settings");
 
@@ -450,3 +231,4 @@ SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, 
 SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, available, CTLTYPE_STRING|CTLFLAG_RD,
 	NULL, 0, cc_list_available, "A",
 	"list available congestion control algorithms");
+

Copied and modified: projects/tcp_cc_7.x/sys/netinet/cc_newreno.c (from r190999, projects/tcp_cc_8.x/sys/netinet/cc_newreno.c)
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc_newreno.c	Mon Apr 13 13:41:44 2009	(r190999, copy source)
+++ projects/tcp_cc_7.x/sys/netinet/cc_newreno.c	Thu Apr 16 04:05:39 2009	(r191133)
@@ -31,16 +31,17 @@
 __FBSDID("$FreeBSD$");
 
 #include 
+#include 
 #include 
 #include 
 #include 
-
-#include 
-#include 
+#include 
 
 #include 
+#include 
+#include 
 #include 
-#include 
+#include 
 
 /* newreno cc function pointers */
 struct cc_algo newreno_cc_algo = {
@@ -118,7 +119,7 @@ newreno_cwnd_init(struct tcpcb *tp)
 				 min(tp->snd_wnd, so->so_snd.sb_hiwat)));
 	else
 #endif
-	if (V_tcp_do_rfc3390)
+	if (tcp_do_rfc3390)
 		tp->snd_cwnd = min(4 * tp->t_maxseg, max(2 * tp->t_maxseg, 4380));
 #ifdef INET6
 	else if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) ||
@@ -126,9 +127,9 @@ newreno_cwnd_init(struct tcpcb *tp)
 #else
 	else if (in_localaddr(inp->inp_faddr))
 #endif
-		tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local;
+		tp->snd_cwnd = tp->t_maxseg * ss_fltsz_local;
 	else
-		tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz;
+		tp->snd_cwnd = tp->t_maxseg * ss_fltsz;
 }
 
 /*
@@ -205,17 +206,17 @@ newreno_after_idle(struct tcpcb *tp)
 	* Set the slow-start flight size depending on whether
 	* this is a local network or not.
 	*/
-	int ss = V_ss_fltsz;
+	int ss = ss_fltsz;
 
 #ifdef INET6
 	if (isipv6) {
 		if (in6_localaddr(&tp->t_inpcb->in6p_faddr))
-			ss = V_ss_fltsz_local;
+			ss = ss_fltsz_local;
 	} else
 #endif /* INET6 */
 
 	if (in_localaddr(tp->t_inpcb->inp_faddr))
-		ss = V_ss_fltsz_local;
+		ss = ss_fltsz_local;
 
 	tp->snd_cwnd = tp->t_maxseg * ss;
 }

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:20:25 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22034106564A;
	Thu, 16 Apr 2009 21:20:25 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F9E28FC1F;
	Thu, 16 Apr 2009 21:20:25 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GLKOGc092065;
	Thu, 16 Apr 2009 21:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLKOfl092064;
	Thu, 16 Apr 2009 21:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162120.n3GLKOfl092064@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 21:20:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191149 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 21:20:25 -0000

Author: rpaulo
Date: Thu Apr 16 21:20:24 2009
New Revision: 191149
URL: http://svn.freebsd.org/changeset/base/191149

Log:
  Add more defines related to mesh configuration elem. id.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.h

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Thu Apr 16 20:30:28 2009	(r191148)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Thu Apr 16 21:20:24 2009	(r191149)
@@ -786,10 +786,21 @@ struct ieee80211_meshconf_ie {
 	uint32_t	conf_apspi;	/* Active Path Sel. Proto. ID */
 	uint32_t	conf_apsmi;	/* APS Metric Identifier */
 	uint32_t	conf_ccmi;	/* Congestion Control Mode ID  */
-	uint8_t		conf_meshinfo;
-	uint8_t		conf_meshcap;
+	uint8_t		conf_finfo;	/* Formation Information */
+	uint8_t		conf_cap;
 } __packed;
 
+#define	IEEE80211_MESHCONF_APSPI_HWMP_OUI	0x000fac
+#define	IEEE80211_MESHCONF_APSPI_HWMP_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_APSMI_AIRTIME_OUI	0x000fac
+#define	IEEE80211_MESHCONF_APSMI_AIRTIME_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_CCMI_DEFAULT_OUI	0x000fac
+#define	IEEE80211_MESHCONF_CCMI_DEFAULT_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_CCMI_NULL_OUI	0x000fac
+#define	IEEE80211_MESHCONF_CCMI_NULL_VALUE	255
+#define	IEEE80211_MESHCONF_FORM_MP		(1 << 1) /* connected to portal */
+#define	IEEE80211_MESHCONF_FORM_NEIGH		(1 << 4) /* no of neighbours */
+
 /* Mesh Identifier */
 struct ieee80211_meshid_ie {
 	uint8_t		id_ie;		/* IEEE80211_ELEMID_MESHID */
@@ -797,7 +808,7 @@ struct ieee80211_meshid_ie {
 } __packed;
 
 #define	IEEE80211_MESHID_MAX_SIZE \
-	(sizeof(struct ieee80211_meshid_ie) + 32)
+	(sizeof(struct ieee80211_meshid_ie) + IEEE80211_NWID_LEN)
 
 /* Link Metric Report */
 struct ieee80211_meshlink_ie {

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:50:18 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12E5110656C3;
	Thu, 16 Apr 2009 21:50:18 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9E4C8FC3C;
	Thu, 16 Apr 2009 21:50:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GLoHxZ092706;
	Thu, 16 Apr 2009 21:50:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLoH6b092699;
	Thu, 16 Apr 2009 21:50:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162150.n3GLoH6b092699@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 21:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191150 - in projects/mesh11s: sbin/ifconfig
	sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 21:50:18 -0000

Author: rpaulo
Date: Thu Apr 16 21:50:17 2009
New Revision: 191150
URL: http://svn.freebsd.org/changeset/base/191150

Log:
  Implement MBSS (Mesh) scanning in net80211 and ifconfig.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c
  projects/mesh11s/sys/net80211/ieee80211_input.c
  projects/mesh11s/sys/net80211/ieee80211_ioctl.c
  projects/mesh11s/sys/net80211/ieee80211_ioctl.h
  projects/mesh11s/sys/net80211/ieee80211_scan.h
  projects/mesh11s/sys/net80211/ieee80211_scan_sta.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Apr 16 21:50:17 2009	(r191150)
@@ -77,6 +77,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -2482,6 +2484,40 @@ printathie(const char *tag, const u_int8
 	}
 }
 
+
+static void
+printmeshconf(const char *tag, const uint8_t *ie, size_t ielen, int maxlen)
+{
+#define MATCHOUI(bitfield, oui, value, string)				\
+do {									\
+	if (((htonl(bitfield)) >> 8) == oui && 				\
+	    ((htonl(bitfield)) & 0xff) == value)			\
+		printf("%s", string);					\
+} while (0)
+
+	printf("%s", tag);
+	if (verbose) {
+		const struct ieee80211_meshconf_ie *mconf =
+			(const struct ieee80211_meshconf_ie *)ie;
+		printf("conf_ver);
+		MATCHOUI(mconf->conf_apspi, IEEE80211_MESHCONF_APSPI_HWMP_OUI,
+			IEEE80211_MESHCONF_APSPI_HWMP_VALUE, "HWMP");
+		printf(" APSMI:");
+		MATCHOUI(mconf->conf_apsmi,
+		    IEEE80211_MESHCONF_APSMI_AIRTIME_OUI,
+		    IEEE80211_MESHCONF_APSMI_AIRTIME_VALUE, "AIRTIME");
+		printf(" CCMI:");
+		MATCHOUI(mconf->conf_ccmi, IEEE80211_MESHCONF_CCMI_DEFAULT_OUI,
+		    IEEE80211_MESHCONF_CCMI_DEFAULT_VALUE, "DEFAULT");
+		MATCHOUI(mconf->conf_ccmi, IEEE80211_MESHCONF_CCMI_NULL_OUI,
+		    IEEE80211_MESHCONF_CCMI_NULL_VALUE, "NULL");
+		printf(" FORM:0x%x CAPS:0x%x", mconf->conf_finfo,
+		    mconf->conf_cap);
+		printf(">");
+	}
+#undef MATCHOUI
+}
+
 static const char *
 wpa_cipher(const u_int8_t *sel)
 {
@@ -2952,6 +2988,15 @@ printies(const u_int8_t *vp, int ielen, 
 			if (verbose)
 				printhtinfo(" HTINFO", vp, 2+vp[1], maxcols);
 			break;
+		case IEEE80211_ELEMID_MESHID:
+			if (verbose)
+				printssid(" MESHID", vp, 2+vp[1], maxcols);
+			break;
+		case IEEE80211_ELEMID_MESHCONF:
+			if (verbose)
+				printmeshconf(" MESHCONF", vp, 2+vp[1],
+				    maxcols);
+			break;
 		default:
 			if (verbose)
 				printie(iename(vp[0]), vp, 2+vp[1], maxcols);
@@ -2980,7 +3025,7 @@ list_scan(int s)
 	uint8_t buf[24*1024];
 	char ssid[IEEE80211_NWID_LEN+1];
 	const uint8_t *cp;
-	int len, ssidmax;
+	int len, ssidmax, idlen;
 
 	if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0)
 		errx(1, "unable to get scan results");
@@ -2989,9 +3034,9 @@ list_scan(int s)
 
 	getchaninfo(s);
 
-	ssidmax = verbose ? IEEE80211_NWID_LEN : 14;
+	ssidmax = verbose ? IEEE80211_NWID_LEN - 1 : 14;
 	printf("%-*.*s  %-17.17s  %4s %4s  %-7s  %3s %4s\n"
-		, ssidmax, ssidmax, "SSID"
+		, ssidmax, ssidmax, "SSID/MESH ID"
 		, "BSSID"
 		, "CHAN"
 		, "RATE"
@@ -3002,13 +3047,20 @@ list_scan(int s)
 	cp = buf;
 	do {
 		const struct ieee80211req_scan_result *sr;
-		const uint8_t *vp;
+		const uint8_t *vp, *idp;
 
 		sr = (const struct ieee80211req_scan_result *) cp;
 		vp = cp + sr->isr_ie_off;
+		if (sr->isr_meshid_len) {
+			idp = vp + sr->isr_ssid_len;
+			idlen = sr->isr_meshid_len;
+		} else {
+			idp = vp;
+			idlen = sr->isr_ssid_len;
+		}
 		printf("%-*.*s  %s  %3d  %3dM %3d:%-3d  %3d %-4.4s"
 			, ssidmax
-			  , copy_essid(ssid, ssidmax, vp, sr->isr_ssid_len)
+			  , copy_essid(ssid, ssidmax, idp, idlen)
 			  , ssid
 			, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
 			, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)
@@ -3017,7 +3069,8 @@ list_scan(int s)
 			, sr->isr_intval
 			, getcaps(sr->isr_capinfo)
 		);
-		printies(vp + sr->isr_ssid_len, sr->isr_ie_len, 24);
+		printies(vp + sr->isr_ssid_len + sr->isr_meshid_len,
+		    sr->isr_ie_len, 24);
 		printf("\n");
 		cp += sr->isr_len, len -= sr->isr_len;
 	} while (len >= sizeof(struct ieee80211req_scan_result));

Modified: projects/mesh11s/sys/net80211/ieee80211_input.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Apr 16 21:50:17 2009	(r191150)
@@ -479,6 +479,9 @@ ieee80211_parse_beacon(struct ieee80211_
 	 *	[tlv] HT capabilities
 	 *	[tlv] HT information
 	 *	[tlv] Atheros capabilities
+	 *	[tlv] Mesh ID
+	 *	[tlv] Mesh Configuration
+	 *	[tlv] Mesh TIM
 	 */
 	IEEE80211_VERIFY_LENGTH(efrm - frm, 12,
 	    return (scan->status = IEEE80211_BPARSE_BADIELEN));
@@ -551,6 +554,15 @@ ieee80211_parse_beacon(struct ieee80211_
 		case IEEE80211_ELEMID_HTINFO:
 			scan->htinfo = frm;
 			break;
+		case IEEE80211_ELEMID_MESHID:
+			scan->meshid = frm;
+			break;
+		case IEEE80211_ELEMID_MESHCONF:
+			scan->meshconf = frm;
+			break;
+		case IEEE80211_ELEMID_MESHTIM:
+			/* XXXRP TBD */
+			break;
 		case IEEE80211_ELEMID_VENDOR:
 			if (iswpaoui(frm))
 				scan->wpa = frm;

Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ioctl.c	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sys/net80211/ieee80211_ioctl.c	Thu Apr 16 21:50:17 2009	(r191150)
@@ -242,7 +242,8 @@ scan_space(const struct ieee80211_scan_e
 	 * packet is <3Kbytes so we are sure this doesn't overflow
 	 * 16-bits; if this is a concern we can drop the ie's.
 	 */
-	len = sizeof(struct ieee80211req_scan_result) + se->se_ssid[1] + *ielen;
+	len = sizeof(struct ieee80211req_scan_result) + se->se_ssid[1] +
+	    se->se_meshid[1] + *ielen;
 	return roundup(len, sizeof(uint32_t));
 }
 
@@ -287,14 +288,19 @@ get_scan_result(void *arg, const struct 
 	memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr);
 	sr->isr_nrates = nr + nxr;
 
+	/* copy SSID */
 	sr->isr_ssid_len = se->se_ssid[1];
 	cp = ((uint8_t *)sr) + sr->isr_ie_off;
 	memcpy(cp, se->se_ssid+2, sr->isr_ssid_len);
 
-	if (ielen) {
-		cp += sr->isr_ssid_len;
+	/* copy mesh id */
+	cp += sr->isr_ssid_len;
+	sr->isr_meshid_len = se->se_meshid[1];
+	memcpy(cp, se->se_meshid+2, sr->isr_meshid_len);
+	cp += sr->isr_meshid_len;
+
+	if (ielen)
 		memcpy(cp, se->se_ies.data, ielen);
-	}
 
 	req->space -= len;
 	req->sr = (struct ieee80211req_scan_result *)(((uint8_t *)sr) + len);

Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ioctl.h	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sys/net80211/ieee80211_ioctl.h	Thu Apr 16 21:50:17 2009	(r191150)
@@ -716,7 +716,9 @@ struct ieee80211req_scan_result {
 	uint8_t		isr_nrates;
 	uint8_t		isr_rates[IEEE80211_RATE_MAXSIZE];
 	uint8_t		isr_ssid_len;		/* SSID length */
-	/* variable length SSID followed by IE data */
+	uint8_t		isr_meshid_len;		/* MESH ID length */
+	/* variable length SSID, followed by variable length MESH ID,
+	  followed by IE data */
 };
 
 /*

Modified: projects/mesh11s/sys/net80211/ieee80211_scan.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_scan.h	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sys/net80211/ieee80211_scan.h	Thu Apr 16 21:50:17 2009	(r191150)
@@ -210,6 +210,9 @@ struct ieee80211_scanparams {
 	uint8_t		*htinfo;
 	uint8_t		*ath;
 	uint8_t		*tdma;
+	uint8_t		*meshid;
+	uint8_t		*meshconf;
+	uint8_t		*meshtim;
 };
 
 /*
@@ -239,6 +242,7 @@ struct ieee80211_scan_entry {
 	int8_t		se_rssi;	/* avg'd recv ssi */
 	int8_t		se_noise;	/* noise floor */
 	uint8_t		se_cc[2];	/* captured country code */
+	uint8_t		se_meshid[2+IEEE80211_NWID_LEN];
 	struct ieee80211_ies se_ies;	/* captured ie's */
 	u_int		se_age;		/* age of entry (0 on create) */
 };

Modified: projects/mesh11s/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_scan_sta.c	Thu Apr 16 21:20:24 2009	(r191149)
+++ projects/mesh11s/sys/net80211/ieee80211_scan_sta.c	Thu Apr 16 21:50:17 2009	(r191150)
@@ -282,6 +282,8 @@ found:
 	memcpy(ise->se_tstamp.data, sp->tstamp, sizeof(ise->se_tstamp));
 	ise->se_intval = sp->bintval;
 	ise->se_capinfo = sp->capinfo;
+	if (sp->meshid != NULL && sp->meshid[1] != 0)
+		memcpy(ise->se_meshid, sp->meshid, 2+sp->meshid[1]);
 	/*
 	 * Beware of overriding se_chan for frames seen
 	 * off-channel; this can cause us to attempt an

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:56:34 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3DE7106566B;
	Thu, 16 Apr 2009 21:56:34 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D25E08FC24;
	Thu, 16 Apr 2009 21:56:34 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GLuYjp092886;
	Thu, 16 Apr 2009 21:56:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLuYid092885;
	Thu, 16 Apr 2009 21:56:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162156.n3GLuYid092885@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 21:56:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191151 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 21:56:35 -0000

Author: rpaulo
Date: Thu Apr 16 21:56:34 2009
New Revision: 191151
URL: http://svn.freebsd.org/changeset/base/191151

Log:
  Add MBSS.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/_ieee80211.h

Modified: projects/mesh11s/sys/net80211/_ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/_ieee80211.h	Thu Apr 16 21:50:17 2009	(r191150)
+++ projects/mesh11s/sys/net80211/_ieee80211.h	Thu Apr 16 21:56:34 2009	(r191151)
@@ -83,8 +83,9 @@ enum ieee80211_opmode {
 	IEEE80211_M_AHDEMO	= 3,	/* Old lucent compatible adhoc demo */
 	IEEE80211_M_HOSTAP	= 4,	/* Software Access Point */
 	IEEE80211_M_MONITOR	= 5,	/* Monitor mode */
+	IEEE80211_M_MBSS	= 6,	/* Mesh Point link */
 };
-#define	IEEE80211_OPMODE_MAX	(IEEE80211_M_MONITOR+1)
+#define	IEEE80211_OPMODE_MAX	(IEEE80211_M_MBSS+1)
 
 /*
  * 802.11g/802.11n protection mode.

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:57:53 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6757A106566C;
	Thu, 16 Apr 2009 21:57:53 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B8348FC0C;
	Thu, 16 Apr 2009 21:57:53 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GLvq9T092953;
	Thu, 16 Apr 2009 21:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLvqwF092951;
	Thu, 16 Apr 2009 21:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162157.n3GLvqwF092951@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 21:57:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191152 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 21:57:53 -0000

Author: rpaulo
Date: Thu Apr 16 21:57:52 2009
New Revision: 191152
URL: http://svn.freebsd.org/changeset/base/191152

Log:
  Add some initial code.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 21:56:34 2009	(r191151)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 21:57:52 2009	(r191152)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 /*
- * IEEE 802.11s Mesh support.
+ * IEEE 802.11s Mesh Point (MBSS) support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
@@ -55,6 +55,49 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
+#include 
 #include 
 
+static void	mesh_vattach(struct ieee80211vap *);
+static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
+static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int,
+		    uint32_t);
+
+void
+ieee80211_mesh_attach(struct ieee80211com *ic)
+{
+	ic->ic_vattach[IEEE80211_M_MBSS] = mesh_vattach;
+}
+
+void
+ieee80211_mesh_detach(struct ieee80211com *ic)
+{
+}
+
+static void
+mesh_vattach(struct ieee80211vap *vap)
+{
+	vap->iv_newstate = mesh_newstate;
+	vap->iv_input = mesh_input;
+	vap->iv_opdetach = mesh_vdetach;
+}
+
+static int
+mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
+{
+	struct ieee80211com *ic = vap->iv_ic;
+	enum ieee80211_state ostate;
+
+	IEEE80211_LOCK_ASSERT(ic);
+
+        ostate = vap->iv_state;
+        IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
+            __func__, ieee80211_state_name[ostate],
+            ieee80211_state_name[nstate], arg);
+        vap->iv_state = nstate;                 /* state transition */
+        if (ostate != IEEE80211_S_SCAN)
+                ieee80211_cancel_scan(vap);     /* background scan */
+        switch (nstate) {
+	}
+}
+

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Apr 16 21:56:34 2009	(r191151)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Apr 16 21:57:52 2009	(r191152)
@@ -27,4 +27,7 @@
 #ifndef _NET80211_IEEE80211_MESH_H_
 #define _NET80211_IEEE80211_MESH_H_
 
+void	ieee80211_mesh_attach(struct ieee80211com *);
+void	ieee80211_mesh_detach(struct ieee80211com *);
+
 #endif /* !_NET80211_IEEE80211_MESH_H_ */

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:59:46 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 561821065673;
	Thu, 16 Apr 2009 21:59:46 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4538B8FC15;
	Thu, 16 Apr 2009 21:59:46 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GLxkf7093025;
	Thu, 16 Apr 2009 21:59:46 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLxkFg093024;
	Thu, 16 Apr 2009 21:59:46 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162159.n3GLxkFg093024@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 21:59:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191153 - projects/mesh11s/sys/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 21:59:46 -0000

Author: rpaulo
Date: Thu Apr 16 21:59:45 2009
New Revision: 191153
URL: http://svn.freebsd.org/changeset/base/191153

Log:
  Add ieee80211_mesh.c
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/conf/files

Modified: projects/mesh11s/sys/conf/files
==============================================================================
--- projects/mesh11s/sys/conf/files	Thu Apr 16 21:57:52 2009	(r191152)
+++ projects/mesh11s/sys/conf/files	Thu Apr 16 21:59:45 2009	(r191153)
@@ -2206,6 +2206,7 @@ net80211/ieee80211_hostap.c	optional wla
 net80211/ieee80211_ht.c		optional wlan
 net80211/ieee80211_input.c	optional wlan
 net80211/ieee80211_ioctl.c	optional wlan
+net80211/ieee80211_mesh.c	optional wlan
 net80211/ieee80211_monitor.c	optional wlan
 net80211/ieee80211_node.c	optional wlan
 net80211/ieee80211_output.c	optional wlan

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 22:20:24 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55B641065678;
	Thu, 16 Apr 2009 22:20:24 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 441FA8FC16;
	Thu, 16 Apr 2009 22:20:24 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GMKOdl093539;
	Thu, 16 Apr 2009 22:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GMKOTv093538;
	Thu, 16 Apr 2009 22:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162220.n3GMKOTv093538@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 22:20:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191155 - projects/mesh11s/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 22:20:24 -0000

Author: rpaulo
Date: Thu Apr 16 22:20:23 2009
New Revision: 191155
URL: http://svn.freebsd.org/changeset/base/191155

Log:
  Add MBSS (net80211).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net/if_media.h

Modified: projects/mesh11s/sys/net/if_media.h
==============================================================================
--- projects/mesh11s/sys/net/if_media.h	Thu Apr 16 22:04:07 2009	(r191154)
+++ projects/mesh11s/sys/net/if_media.h	Thu Apr 16 22:20:23 2009	(r191155)
@@ -216,6 +216,7 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_IEEE80211_WDS	0x00000800	/* Operate in WDS mode */
 #define	IFM_IEEE80211_TURBO	0x00001000	/* Operate in turbo mode */
 #define	IFM_IEEE80211_MONITOR	0x00002000	/* Operate in monitor mode */
+#define	IFM_IEEE80211_MBSS	0x00004000	/* Operate in MBSS mode */
 
 /* operating mode for multi-mode devices */
 #define	IFM_IEEE80211_11A	0x00010000	/* 5Ghz, OFDM mode */
@@ -507,6 +508,7 @@ struct ifmedia_description {
 	{ IFM_IEEE80211_WDS, "wds" },					\
 	{ IFM_IEEE80211_TURBO, "turbo" },				\
 	{ IFM_IEEE80211_MONITOR, "monitor" },				\
+	{ IFM_IEEE80211_MBSS, "meshpoint" },				\
 	{ 0, NULL },							\
 }
 

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 22:22:31 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3149106564A;
	Thu, 16 Apr 2009 22:22:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A1D808FC1E;
	Thu, 16 Apr 2009 22:22:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GMMVCj093625;
	Thu, 16 Apr 2009 22:22:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GMMVoR093624;
	Thu, 16 Apr 2009 22:22:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162222.n3GMMVoR093624@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 22:22:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191156 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 22:22:32 -0000

Author: rpaulo
Date: Thu Apr 16 22:22:31 2009
New Revision: 191156
URL: http://svn.freebsd.org/changeset/base/191156

Log:
  Prettify comment.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/_ieee80211.h

Modified: projects/mesh11s/sys/net80211/_ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/_ieee80211.h	Thu Apr 16 22:20:23 2009	(r191155)
+++ projects/mesh11s/sys/net80211/_ieee80211.h	Thu Apr 16 22:22:31 2009	(r191156)
@@ -83,7 +83,7 @@ enum ieee80211_opmode {
 	IEEE80211_M_AHDEMO	= 3,	/* Old lucent compatible adhoc demo */
 	IEEE80211_M_HOSTAP	= 4,	/* Software Access Point */
 	IEEE80211_M_MONITOR	= 5,	/* Monitor mode */
-	IEEE80211_M_MBSS	= 6,	/* Mesh Point link */
+	IEEE80211_M_MBSS	= 6,	/* MBSS (Mesh Point) link */
 };
 #define	IEEE80211_OPMODE_MAX	(IEEE80211_M_MBSS+1)
 

From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 22:23:33 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 257231065677;
	Thu, 16 Apr 2009 22:23:33 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 125E78FC16;
	Thu, 16 Apr 2009 22:23:33 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GMNWRC093682;
	Thu, 16 Apr 2009 22:23:32 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GMNWBI093678;
	Thu, 16 Apr 2009 22:23:32 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162223.n3GMNWBI093678@svn.freebsd.org>
From: Rui Paulo 
Date: Thu, 16 Apr 2009 22:23:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191157 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 16 Apr 2009 22:23:34 -0000

Author: rpaulo
Date: Thu Apr 16 22:23:32 2009
New Revision: 191157
URL: http://svn.freebsd.org/changeset/base/191157

Log:
  Initial handling of MBSS capability/mode bits.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_output.c
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.c	Thu Apr 16 22:22:31 2009	(r191156)
+++ projects/mesh11s/sys/net80211/ieee80211.c	Thu Apr 16 22:23:32 2009	(r191157)
@@ -74,6 +74,7 @@ const int ieee80211_opcap[IEEE80211_OPMO
 	[IEEE80211_M_AHDEMO]	= IEEE80211_C_AHDEMO,
 	[IEEE80211_M_HOSTAP]	= IEEE80211_C_HOSTAP,
 	[IEEE80211_M_MONITOR]	= IEEE80211_C_MONITOR,
+	[IEEE80211_M_MBSS]	= IEEE80211_C_MBSS,
 };
 
 static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
@@ -912,6 +913,8 @@ addmedia(struct ifmedia *media, int caps
 		ADD(media, mword, mopt | IFM_IEEE80211_MONITOR);
 	if (caps & IEEE80211_C_WDS)
 		ADD(media, mword, mopt | IFM_IEEE80211_WDS);
+	if (caps & IEEE80211_C_MBSS)
+		ADD(media, mword, mopt | IFM_IEEE80211_MBSS);
 #undef ADD
 }
 
@@ -1216,6 +1219,9 @@ media_status(enum ieee80211_opmode opmod
 	case IEEE80211_M_WDS:
 		status |= IFM_IEEE80211_WDS;
 		break;
+	case IEEE80211_M_MBSS:
+		status |= IFM_IEEE80211_MBSS;
+		break;
 	}
 	if (IEEE80211_IS_CHAN_HTA(chan)) {
 		status |= IFM_IEEE80211_11NA;

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 22:22:31 2009	(r191156)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 22:23:32 2009	(r191157)
@@ -75,6 +75,11 @@ ieee80211_mesh_detach(struct ieee80211co
 }
 
 static void
+mesh_vdetach(struct ieee80211vap *vap)
+{
+}
+
+static void
 mesh_vattach(struct ieee80211vap *vap)
 {
 	vap->iv_newstate = mesh_newstate;
@@ -98,6 +103,25 @@ mesh_newstate(struct ieee80211vap *vap, 
         if (ostate != IEEE80211_S_SCAN)
                 ieee80211_cancel_scan(vap);     /* background scan */
         switch (nstate) {
+	case IEEE80211_S_INIT:
+	case IEEE80211_S_SCAN:
+	case IEEE80211_S_AUTH:
+	case IEEE80211_S_ASSOC:
+	case IEEE80211_S_CAC:
+	case IEEE80211_S_RUN:
+	case IEEE80211_S_CSA:
+	case IEEE80211_S_SLEEP:
+	default:
+		break;
 	}
+
+	return 0;
 }
 
+static int
+mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise,
+    uint32_t rstamp)
+{
+
+	return 0;
+}

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Apr 16 22:22:31 2009	(r191156)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Apr 16 22:23:32 2009	(r191157)
@@ -453,6 +453,9 @@ ieee80211_send_setup(
 			break;
 		case IEEE80211_M_MONITOR:	/* NB: to quiet compiler */
 			break;
+		case IEEE80211_M_MBSS:
+			/* XXXRP TBD */
+			break;
 		}
 	} else {
 		wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
@@ -1009,6 +1012,7 @@ ieee80211_encap(struct ieee80211vap *vap
 		break;
 	case IEEE80211_M_MONITOR:
 	case IEEE80211_M_WDS:		/* NB: is4addr should always be true */
+	case IEEE80211_M_MBSS:
 		goto bad;
 	}
 	if (m->m_flags & M_MORE_DATA)

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Thu Apr 16 22:22:31 2009	(r191156)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Thu Apr 16 22:23:32 2009	(r191157)
@@ -547,6 +547,7 @@ MALLOC_DECLARE(M_80211_VAP);
 #define	IEEE80211_C_SHPREAMBLE	0x00008000	/* CAPABILITY: short preamble */
 #define	IEEE80211_C_MONITOR	0x00010000	/* CAPABILITY: monitor mode */
 #define	IEEE80211_C_DFS		0x00020000	/* CAPABILITY: DFS/radar avail*/
+#define	IEEE80211_C_MBSS	0x00040000	/* CAPABILITY: MBSS available */
 /* 0x7c0000 available */
 #define	IEEE80211_C_WPA1	0x00800000	/* CAPABILITY: WPA1 avail */
 #define	IEEE80211_C_WPA2	0x01000000	/* CAPABILITY: WPA2 avail */
@@ -563,12 +564,12 @@ MALLOC_DECLARE(M_80211_VAP);
 #define	IEEE80211_C_OPMODE \
 	(IEEE80211_C_STA | IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | \
 	 IEEE80211_C_AHDEMO | IEEE80211_C_MONITOR | IEEE80211_C_WDS | \
-	 IEEE80211_C_TDMA)
+	 IEEE80211_C_TDMA | IEEE80211_C_MBSS)
 
 #define	IEEE80211_C_BITS \
 	"\20\1STA\002803ENCAP\7FF\10TURBOP\11IBSS\12PMGT" \
 	"\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \
-	"\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
+	"\21MONITOR\22DFS\23MBSS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
 	"\37TXFRAG\40TDMA"
 
 /*

From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 17 02:46:32 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 197F5106566B;
	Fri, 17 Apr 2009 02:46:32 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 08CF08FC0C;
	Fri, 17 Apr 2009 02:46:32 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H2kVgU004016;
	Fri, 17 Apr 2009 02:46:31 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H2kViQ004015;
	Fri, 17 Apr 2009 02:46:31 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904170246.n3H2kViQ004015@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 17 Apr 2009 02:46:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191185 - projects/tcp_cc_8.x/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 17 Apr 2009 02:46:32 -0000

Author: lstewart
Date: Fri Apr 17 02:46:31 2009
New Revision: 191185
URL: http://svn.freebsd.org/changeset/base/191185

Log:
  Catch up with r190457 by checking inp_flags instead of inp_vflag for
  pcbs in TIMEWAIT.

Modified:
  projects/tcp_cc_8.x/sys/netinet/cc.c

Modified: projects/tcp_cc_8.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc.c	Fri Apr 17 01:07:37 2009	(r191184)
+++ projects/tcp_cc_8.x/sys/netinet/cc.c	Fri Apr 17 02:46:31 2009	(r191185)
@@ -187,7 +187,7 @@ cc_deregister_algorithm(struct cc_algo *
 		INP_INFO_RLOCK(&V_tcbinfo);
 		LIST_FOREACH(inp, &V_tcb, inp_list) {
 			/* skip tcptw structs */
-			if (inp->inp_vflag & INP_TIMEWAIT)
+			if (inp->inp_flags & INP_TIMEWAIT)
 				continue;
 			INP_WLOCK(inp);
 			if ((tp = intotcpcb(inp)) != NULL) {

From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 17 02:52:23 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2E66106566C;
	Fri, 17 Apr 2009 02:52:23 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF3238FC14;
	Fri, 17 Apr 2009 02:52:23 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H2qNEj004297;
	Fri, 17 Apr 2009 02:52:23 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H2qNDd004296;
	Fri, 17 Apr 2009 02:52:23 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200904170252.n3H2qNDd004296@svn.freebsd.org>
From: Lawrence Stewart 
Date: Fri, 17 Apr 2009 02:52:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191186 - in projects/tcp_cc_7.x/sys: . contrib/pf
	dev/ath/ath_hal dev/cxgb netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 17 Apr 2009 02:52:24 -0000

Author: lstewart
Date: Fri Apr 17 02:52:23 2009
New Revision: 191186
URL: http://svn.freebsd.org/changeset/base/191186

Log:
  Merge r191185 from projects/tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/netinet/cc.c

Modified: projects/tcp_cc_7.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:46:31 2009	(r191185)
+++ projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:52:23 2009	(r191186)
@@ -185,7 +185,7 @@ cc_deregister_algorithm(struct cc_algo *
 		INP_INFO_RLOCK(&tcbinfo);
 		LIST_FOREACH(inp, &tcb, inp_list) {
 			/* skip tcptw structs */
-			if (inp->inp_vflag & INP_TIMEWAIT)
+			if (inp->inp_flags & INP_TIMEWAIT)
 				continue;
 			INP_WLOCK(inp);
 			if ((tp = intotcpcb(inp)) != NULL) {

From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 17 18:29:31 2009
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38C3210657E1;
	Fri, 17 Apr 2009 18:29:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 267F48FC17;
	Fri, 17 Apr 2009 18:29:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HITVxS030973;
	Fri, 17 Apr 2009 18:29:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3HITVkr030971;
	Fri, 17 Apr 2009 18:29:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904171829.n3HITVkr030971@svn.freebsd.org>
From: Rui Paulo 
Date: Fri, 17 Apr 2009 18:29:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191219 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
	tree" 
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 17 Apr 2009 18:29:32 -0000

Author: rpaulo
Date: Fri Apr 17 18:29:30 2009
New Revision: 191219
URL: http://svn.freebsd.org/changeset/base/191219

Log:
  Allow the creation of mesh points.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Fri Apr 17 18:11:11 2009	(r191218)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Fri Apr 17 18:29:30 2009	(r191219)
@@ -4774,7 +4774,9 @@ DECL_CMD_FUNC(set80211clone_wlanmode, ar
 	else if (iseq(arg, "tdma")) {
 		params.icp_opmode = IEEE80211_M_AHDEMO;
 		params.icp_flags |= IEEE80211_CLONE_TDMA;
-	} else
+	} else if (iseq(arg, "meshpoint") || iseq(arg, "mp"))
+		params.icp_opmode = IEEE80211_M_MBSS;
+	else
 		errx(1, "Don't know to create %s for %s", arg, name);
 #undef iseq
 }