From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 22:02:15 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 D8E2D106567B; Sun, 19 Apr 2009 22:02:15 +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 C5B1D8FC1C; Sun, 19 Apr 2009 22:02:15 +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 n3JM2Fh9021576; Sun, 19 Apr 2009 22:02:15 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JM2FuN021561; Sun, 19 Apr 2009 22:02:15 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192202.n3JM2FuN021561@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 22:02:15 +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: r191282 - in projects/mips/sys/mips: adm5120 alchemy idt include malta 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: Sun, 19 Apr 2009 22:02:16 -0000 Author: gonzo Date: Sun Apr 19 22:02:14 2009 New Revision: 191282 URL: http://svn.freebsd.org/changeset/base/191282 Log: - Make mips_bus_space_generic be of type bus_space_tag_t instead of struct bus_space and update all relevant places. Modified: 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/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 projects/mips/sys/mips/mips/bus_space_generic.c projects/mips/sys/mips/sentry5/obio.c projects/mips/sys/mips/sentry5/uart_bus_sbusart.c projects/mips/sys/mips/sentry5/uart_cpu_sbusart.c Modified: projects/mips/sys/mips/adm5120/obio.c ============================================================================== --- projects/mips/sys/mips/adm5120/obio.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/adm5120/obio.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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_generic); + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/adm5120/uart_cpu_adm5120.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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 = &mips_bus_space_generic; + 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_bus_space_generic; + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/alchemy/obio.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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_generic); + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/alchemy/uart_cpu_alchemy.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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 = &mips_bus_space_generic; + 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_bus_space_generic; + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/idt/uart_bus_rc32434.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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 = &mips_bus_space_generic; + 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 = &mips_bus_space_generic; + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/idt/uart_cpu_rc32434.c Sun Apr 19 22:02:14 2009 (r191282) @@ -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 = &mips_bus_space_generic; + 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 = &mips_bus_space_generic; + 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 Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/include/bus.h Sun Apr 19 22:02:14 2009 (r191282) @@ -717,7 +717,7 @@ void __bs_c(f,_bs_c_8) (void *t, bus_spa * declare generic bus space, it suits all needs in */ DECLARE_BUS_SPACE_PROTOTYPES(generic); -extern struct bus_space mips_bus_space_generic; +extern bus_space_tag_t mips_bus_space_generic; #include #endif /* _MACHINE_BUS_H_ */ Modified: projects/mips/sys/mips/malta/gt_pci.c ============================================================================== --- projects/mips/sys/mips/malta/gt_pci.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/malta/gt_pci.c Sun Apr 19 22:02:14 2009 (r191282) @@ -206,7 +206,7 @@ gt_pci_attach(device_t dev) busno = 0; sc->sc_dev = dev; sc->sc_busno = busno; - sc->sc_st = &mips_bus_space_generic; + sc->sc_st = mips_bus_space_generic; /* Use KSEG1 to access IO ports for it is uncached */ sc->sc_io = MIPS_PHYS_TO_KSEG1(MALTA_PCI0_IO_BASE); Modified: projects/mips/sys/mips/malta/obio.c ============================================================================== --- projects/mips/sys/mips/malta/obio.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/malta/obio.c Sun Apr 19 22:02:14 2009 (r191282) @@ -84,7 +84,7 @@ obio_attach(device_t dev) { struct obio_softc *sc = device_get_softc(dev); - sc->oba_st = &mips_bus_space_generic; + sc->oba_st = mips_bus_space_generic; sc->oba_addr = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); sc->oba_size = MALTA_PCIMEM3_SIZE; sc->oba_rman.rm_type = RMAN_ARRAY; Modified: projects/mips/sys/mips/malta/uart_bus_maltausart.c ============================================================================== --- projects/mips/sys/mips/malta/uart_bus_maltausart.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/malta/uart_bus_maltausart.c Sun Apr 19 22:02:14 2009 (r191282) @@ -88,9 +88,9 @@ uart_malta_probe(device_t dev) sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - sc->sc_sysdev->bas.bst = &mips_bus_space_generic; + sc->sc_sysdev->bas.bst = mips_bus_space_generic; sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); - sc->sc_bas.bst = &mips_bus_space_generic; + sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); return(uart_bus_probe(dev, 0, 0, 0, 0)); } Modified: projects/mips/sys/mips/malta/uart_cpu_maltausart.c ============================================================================== --- projects/mips/sys/mips/malta/uart_cpu_maltausart.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/malta/uart_cpu_maltausart.c Sun Apr 19 22:02:14 2009 (r191282) @@ -67,7 +67,7 @@ uart_cpu_getdev(int devtype, struct uart { di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = &mips_bus_space_generic; + di->bas.bst = mips_bus_space_generic; di->bas.bsh = MIPS_PHYS_TO_KSEG1(MALTA_UART0ADR); di->bas.regshft = 0; di->bas.rclk = 0; @@ -77,6 +77,6 @@ uart_cpu_getdev(int devtype, struct uart di->parity = UART_PARITY_NONE; uart_bus_space_io = NULL; - uart_bus_space_mem = &mips_bus_space_generic; + uart_bus_space_mem = mips_bus_space_generic; return (0); } Modified: projects/mips/sys/mips/mips/bus_space_generic.c ============================================================================== --- projects/mips/sys/mips/mips/bus_space_generic.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/mips/bus_space_generic.c Sun Apr 19 22:02:14 2009 (r191282) @@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$"); #include #include -struct bus_space mips_bus_space_generic = { +static struct bus_space generic_space = { /* cookie */ (void *) 0, @@ -196,7 +196,8 @@ struct bus_space mips_bus_space_generic NULL, }; - +/* generic bus_space tag */ +bus_space_tag_t mips_bus_space_generic = &generic_space; int generic_bs_map(void *t __unused, bus_addr_t addr, Modified: projects/mips/sys/mips/sentry5/obio.c ============================================================================== --- projects/mips/sys/mips/sentry5/obio.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/sentry5/obio.c Sun Apr 19 22:02:14 2009 (r191282) @@ -119,7 +119,6 @@ obio_alloc_resource(device_t bus, device { struct resource *rv; struct rman *rm; - bus_space_tag_t bt = 0; bus_space_handle_t bh = 0; struct obio_softc *sc = device_get_softc(bus); @@ -131,7 +130,6 @@ obio_alloc_resource(device_t bus, device return (NULL); case SYS_RES_IOPORT: rm = &sc->oba_rman; - bt = sc->oba_st; bh = sc->oba_addr; start = bh; break; @@ -146,7 +144,7 @@ obio_alloc_resource(device_t bus, device if (type == SYS_RES_IRQ) return (rv); rman_set_rid(rv, *rid); - rman_set_bustag(rv, bt); + rman_set_bustag(rv, mips_bus_space_generic); rman_set_bushandle(rv, bh); if (0) { Modified: projects/mips/sys/mips/sentry5/uart_bus_sbusart.c ============================================================================== --- projects/mips/sys/mips/sentry5/uart_bus_sbusart.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/sentry5/uart_bus_sbusart.c Sun Apr 19 22:02:14 2009 (r191282) @@ -85,9 +85,9 @@ uart_malta_probe(device_t dev) sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - sc->sc_sysdev->bas.bst = 0; + sc->sc_sysdev->bas.bst = mips_bus_space_generic; sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(SENTRY5_UART1ADR); - sc->sc_bas.bst = 0; + sc->sc_bas.bst = mips_bus_space_generic; sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(SENTRY5_UART1ADR); return(uart_bus_probe(dev, 0, 0, 0, 0)); } Modified: projects/mips/sys/mips/sentry5/uart_cpu_sbusart.c ============================================================================== --- projects/mips/sys/mips/sentry5/uart_cpu_sbusart.c Sun Apr 19 22:01:38 2009 (r191281) +++ projects/mips/sys/mips/sentry5/uart_cpu_sbusart.c Sun Apr 19 22:02:14 2009 (r191282) @@ -76,7 +76,7 @@ uart_cpu_getdev(int devtype, struct uart di->parity = UART_PARITY_NONE; uart_bus_space_io = MIPS_PHYS_TO_KSEG1(SENTRY5_UART1ADR); - uart_bus_space_mem = MIPS_PHYS_TO_KSEG1(SENTRY5_UART1ADR); + uart_bus_space_mem = mips_bus_space_generic; di->bas.bsh = MIPS_PHYS_TO_KSEG1(SENTRY5_UART1ADR); return (0); } From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 22:56:35 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 D8D8E1065670; Sun, 19 Apr 2009 22:56:35 +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 C5DD98FC08; Sun, 19 Apr 2009 22:56: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 n3JMuZgO022974; Sun, 19 Apr 2009 22:56:35 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JMuZ8X022969; Sun, 19 Apr 2009 22:56:35 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192256.n3JMuZ8X022969@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 22:56: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: r191289 - in projects/mips/sys/mips: atheros 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: Sun, 19 Apr 2009 22:56:36 -0000 Author: gonzo Date: Sun Apr 19 22:56:35 2009 New Revision: 191289 URL: http://svn.freebsd.org/changeset/base/191289 Log: - Handle byte-order issue for non-word accesses to memory mapped registers with ar71xx_bus_space_reversed. Note, that byte order of values is handled by drivers. bus_spaces fixes only position of register in word. - Replace .hints hack for AR71XX UART with ar71xx_bus_space_reversed. Added: projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.c projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.h Modified: projects/mips/sys/mips/atheros/files.ar71xx projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c projects/mips/sys/mips/conf/AR71XX.hints Added: projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.c Sun Apr 19 22:56:35 2009 (r191289) @@ -0,0 +1,181 @@ +/*- + * Copyright (c) 2009, Oleksandr Tymoshenko + * 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 unmodified, 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 + +static bs_r_1_proto(reversed); +static bs_r_2_proto(reversed); +static bs_w_1_proto(reversed); +static bs_w_2_proto(reversed); + +/* + * Bus space that handles offsets in word for 1/2 bytes read/write access. + * Byte order of values is handled by device drivers itself. + */ +static struct bus_space bus_space_reversed = { + /* cookie */ + (void *) 0, + + /* mapping/unmapping */ + generic_bs_map, + generic_bs_unmap, + generic_bs_subregion, + + /* allocation/deallocation */ + NULL, + NULL, + + /* barrier */ + generic_bs_barrier, + + /* read (single) */ + reversed_bs_r_1, + reversed_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple */ + generic_bs_rm_1, + generic_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region */ + generic_bs_rr_1, + generic_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) */ + reversed_bs_w_1, + reversed_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple */ + generic_bs_wm_1, + generic_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region */ + NULL, + generic_bs_wr_2, + generic_bs_wr_4, + NULL, + + /* set multiple */ + NULL, + NULL, + NULL, + NULL, + + /* set region */ + NULL, + generic_bs_sr_2, + generic_bs_sr_4, + NULL, + + /* copy */ + NULL, + generic_bs_c_2, + NULL, + NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_bs_wr_2, + generic_bs_wr_4, + NULL, +}; + +bus_space_tag_t ar71xx_bus_space_reversed = &bus_space_reversed; + +static uint8_t +reversed_bs_r_1(void *t, bus_space_handle_t h, bus_size_t o) +{ + + return readb(h + (o &~ 3) + (3 - (o & 3))); +} + +static void +reversed_bs_w_1(void *t, bus_space_handle_t h, bus_size_t o, u_int8_t v) +{ + + writeb(h + (o &~ 3) + (3 - (o & 3)), v); +} + +static uint16_t +reversed_bs_r_2(void *t, bus_space_handle_t h, bus_size_t o) +{ + + return readw(h + (o &~ 3) + (2 - (o & 3))); +} + +static void +reversed_bs_w_2(void *t, bus_space_handle_t h, bus_size_t o, uint16_t v) +{ + + writew(h + (o &~ 3) + (2 - (o & 3)), v); +} Added: projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/atheros/ar71xx_bus_space_reversed.h Sun Apr 19 22:56:35 2009 (r191289) @@ -0,0 +1,33 @@ +/*- + * Copyright (c) 2009, Oleksandr Tymoshenko + * 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 unmodified, 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. + */ + +#ifndef __AR71XX_BUS_SPACE_REVERSEDH__ +#define __AR71XX_BUS_SPACE_REVERSEDH__ + +extern bus_space_tag_t ar71xx_bus_space_reversed; + +#endif /* __AR71XX_BUS_SPACE_REVERSEDH__ */ Modified: projects/mips/sys/mips/atheros/files.ar71xx ============================================================================== --- projects/mips/sys/mips/atheros/files.ar71xx Sun Apr 19 22:34:35 2009 (r191288) +++ projects/mips/sys/mips/atheros/files.ar71xx Sun Apr 19 22:56:35 2009 (r191289) @@ -7,3 +7,4 @@ mips/atheros/ar71xx_pci.c optional pci mips/atheros/if_arge.c optional arge mips/atheros/uart_bus_ar71xx.c optional uart mips/atheros/uart_cpu_ar71xx.c optional uart +mips/atheros/ar71xx_bus_space_reversed.c standard Modified: projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c ============================================================================== --- projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c Sun Apr 19 22:34:35 2009 (r191288) +++ projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c Sun Apr 19 22:56:35 2009 (r191289) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; @@ -54,7 +55,7 @@ uart_cpu_getdev(int devtype, struct uart { di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = MIPS_BUS_SPACE_MEM; + di->bas.bst = &ar71xx_bus_space_reversed; di->bas.regshft = 2; /* TODO: calculate proper AHB freq using PLL registers */ di->bas.rclk = 85000000; @@ -64,8 +65,8 @@ uart_cpu_getdev(int devtype, struct uart di->parity = UART_PARITY_NONE; /* TODO: check if uart_bus_space_io mandatory to set */ - uart_bus_space_io = MIPS_BUS_SPACE_IO; - uart_bus_space_mem = MIPS_BUS_SPACE_MEM; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ar71xx_bus_space_reversed; /* * FIXME: * 3 is to compensate big endian, uart operates @@ -73,6 +74,6 @@ uart_cpu_getdev(int devtype, struct uart * highest byte instead of lowest one. Actual fix will involve * MIPS bus_space fixing. */ - di->bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3; + di->bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR); return (0); } Modified: projects/mips/sys/mips/conf/AR71XX.hints ============================================================================== --- projects/mips/sys/mips/conf/AR71XX.hints Sun Apr 19 22:34:35 2009 (r191288) +++ projects/mips/sys/mips/conf/AR71XX.hints Sun Apr 19 22:56:35 2009 (r191289) @@ -7,7 +7,7 @@ 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.maddr=0x18020000 hint.uart.0.msize=0x18 hint.uart.0.irq=3 From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 22:58:37 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 4706B10656B4; Sun, 19 Apr 2009 22:58:37 +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 3403F8FC0C; Sun, 19 Apr 2009 22:58:37 +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 n3JMwbKx023048; Sun, 19 Apr 2009 22:58:37 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JMwbEF023046; Sun, 19 Apr 2009 22:58:37 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192258.n3JMwbEF023046@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 22:58:37 +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: r191290 - 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: Sun, 19 Apr 2009 22:58:37 -0000 Author: gonzo Date: Sun Apr 19 22:58:36 2009 New Revision: 191290 URL: http://svn.freebsd.org/changeset/base/191290 Log: - Add EHCI controller driver for AR71XX-based boards. Added: projects/mips/sys/mips/atheros/ar71xx_ehci.c Modified: projects/mips/sys/mips/atheros/files.ar71xx Added: projects/mips/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/atheros/ar71xx_ehci.c Sun Apr 19 22:58:36 2009 (r191290) @@ -0,0 +1,291 @@ +/*- + * Copyright (c) 2008 Sam Leffler. 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. + */ + +/* + * AR71XX attachment driver for the USB Enhanced Host Controller. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "opt_bus.h" + +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include + +#define EHCI_HC_DEVSTR "AR71XX Integrated USB 2.0 controller" + +struct ar71xx_ehci_softc { + ehci_softc_t base; /* storage for EHCI code */ +}; + +static device_attach_t ar71xx_ehci_attach; +static device_detach_t ar71xx_ehci_detach; +static device_shutdown_t ar71xx_ehci_shutdown; +static device_suspend_t ar71xx_ehci_suspend; +static device_resume_t ar71xx_ehci_resume; + +bs_r_1_proto(reversed); +bs_w_1_proto(reversed); + +static int +ar71xx_ehci_suspend(device_t self) +{ + ehci_softc_t *sc = device_get_softc(self); + int err; + + err = bus_generic_suspend(self); + if (err) + return (err); + ehci_suspend(sc); + return (0); +} + +static int +ar71xx_ehci_resume(device_t self) +{ + ehci_softc_t *sc = device_get_softc(self); + + ehci_resume(sc); + + bus_generic_resume(self); + + return (0); +} + +static int +ar71xx_ehci_shutdown(device_t self) +{ + ehci_softc_t *sc = device_get_softc(self); + int err; + + err = bus_generic_shutdown(self); + if (err) + return (err); + ehci_shutdown(sc); + + return (0); +} + +static int +ar71xx_ehci_probe(device_t self) +{ + + device_set_desc(self, EHCI_HC_DEVSTR); + printf("EHCI probed\n"); + + return (BUS_PROBE_DEFAULT); +} + +static int +ar71xx_ehci_attach(device_t self) +{ + struct ar71xx_ehci_softc *isc = device_get_softc(self); + ehci_softc_t *sc = &isc->base; + int err; + int rid; + + printf("EHCI attach\n"); + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = EHCI_MAX_DEVICES; + + /* get all DMA memory */ + if (usb2_bus_mem_alloc_all(&sc->sc_bus, + USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) { + return (ENOMEM); + } + + sc->sc_bus.usbrev = USB_REV_2_0; + + /* NB: hints fix the memory location and irq */ + + rid = 0; + sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (!sc->sc_io_res) { + device_printf(self, "Could not map memory\n"); + goto error; + } + + /* + * Craft special resource for bus space ops that handle + * byte-alignment of non-word addresses. + */ + sc->sc_io_tag = &ar71xx_bus_space_reversed; + sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); + sc->sc_io_size = rman_get_size(sc->sc_io_res); + + rid = 0; + sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->sc_irq_res == NULL) { + device_printf(self, "Could not allocate irq\n"); + goto error; + } + sc->sc_bus.bdev = device_add_child(self, "usbus", -1); + if (!sc->sc_bus.bdev) { + device_printf(self, "Could not add USB device\n"); + goto error; + } + device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); + device_set_desc(sc->sc_bus.bdev, EHCI_HC_DEVSTR); + + sprintf(sc->sc_vendor, "Atheros"); + + + err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); + if (err) { + device_printf(self, "Could not setup irq, %d\n", err); + sc->sc_intr_hdl = NULL; + goto error; + } + + /* + * Arrange to force Host mode, select big-endian byte alignment, + * and arrange to not terminate reset operations (the adapter + * will ignore it if we do but might as well save a reg write). + * Also, the controller has an embedded Transaction Translator + * which means port speed must be read from the Port Status + * register following a port enable. + */ + sc->sc_flags |= EHCI_SCFLG_TT + | EHCI_SCFLG_SETMODE + | EHCI_SCFLG_BIGEDESC + | EHCI_SCFLG_BIGEMMIO + | EHCI_SCFLG_NORESTERM + ; + (void) ehci_reset(sc); + + err = ehci_init(sc); + if (!err) { + err = device_probe_and_attach(sc->sc_bus.bdev); + } + if (err) { + device_printf(self, "USB init failed err=%d\n", err); + goto error; + } + return (0); + +error: + ar71xx_ehci_detach(self); + return (ENXIO); +} + +static int +ar71xx_ehci_detach(device_t self) +{ + struct ar71xx_ehci_softc *isc = device_get_softc(self); + ehci_softc_t *sc = &isc->base; + device_t bdev; + int err; + + if (sc->sc_bus.bdev) { + bdev = sc->sc_bus.bdev; + device_detach(bdev); + device_delete_child(self, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_all_children(self); + + /* + * disable interrupts that might have been switched on in ehci_init + */ + if (sc->sc_io_res) { + EWRITE4(sc, EHCI_USBINTR, 0); + } + + if (sc->sc_irq_res && sc->sc_intr_hdl) { + /* + * only call ehci_detach() after ehci_init() + */ + ehci_detach(sc); + + err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); + + if (err) + /* XXX or should we panic? */ + device_printf(self, "Could not tear down irq, %d\n", + err); + sc->sc_intr_hdl = NULL; + } + + if (sc->sc_irq_res) { + bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); + sc->sc_irq_res = NULL; + } + if (sc->sc_io_res) { + bus_release_resource(self, SYS_RES_MEMORY, 0, + sc->sc_io_res); + sc->sc_io_res = NULL; + } + usb2_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); + + return (0); +} + +static device_method_t ehci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ar71xx_ehci_probe), + DEVMETHOD(device_attach, ar71xx_ehci_attach), + DEVMETHOD(device_detach, ar71xx_ehci_detach), + DEVMETHOD(device_suspend, ar71xx_ehci_suspend), + DEVMETHOD(device_resume, ar71xx_ehci_resume), + DEVMETHOD(device_shutdown, ar71xx_ehci_shutdown), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + + {0, 0} +}; + +static driver_t ehci_driver = { + "ehci", + ehci_methods, + sizeof(struct ar71xx_ehci_softc), +}; + +static devclass_t ehci_devclass; + +DRIVER_MODULE(ehci, nexus, ehci_driver, ehci_devclass, 0, 0); +MODULE_DEPEND(ehci, usb, 1, 1, 1); Modified: projects/mips/sys/mips/atheros/files.ar71xx ============================================================================== --- projects/mips/sys/mips/atheros/files.ar71xx Sun Apr 19 22:56:35 2009 (r191289) +++ projects/mips/sys/mips/atheros/files.ar71xx Sun Apr 19 22:58:36 2009 (r191290) @@ -2,6 +2,7 @@ mips/atheros/apb.c standard mips/atheros/ar71xx_machdep.c standard +mips/atheros/ar71xx_ehci.c optional ehci mips/atheros/ar71xx_ohci.c optional ohci mips/atheros/ar71xx_pci.c optional pci mips/atheros/if_arge.c optional arge From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 23:06:16 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 22307106567A; Sun, 19 Apr 2009 23:06:16 +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 EA47E8FC19; Sun, 19 Apr 2009 23:06:15 +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 n3JN6F0Z023386; Sun, 19 Apr 2009 23:06:15 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JN6FbC023384; Sun, 19 Apr 2009 23:06:15 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192306.n3JN6FbC023384@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 23:06:15 +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: r191293 - 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: Sun, 19 Apr 2009 23:06:16 -0000 Author: gonzo Date: Sun Apr 19 23:06:15 2009 New Revision: 191293 URL: http://svn.freebsd.org/changeset/base/191293 Log: - Remove garbage debug output - ar71xx_bus_space_reversed is bus_space_tag_t, use it this way Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ehci.c Sun Apr 19 23:03:57 2009 (r191292) +++ projects/mips/sys/mips/atheros/ar71xx_ehci.c Sun Apr 19 23:06:15 2009 (r191293) @@ -111,7 +111,6 @@ ar71xx_ehci_probe(device_t self) { device_set_desc(self, EHCI_HC_DEVSTR); - printf("EHCI probed\n"); return (BUS_PROBE_DEFAULT); } @@ -124,7 +123,6 @@ ar71xx_ehci_attach(device_t self) int err; int rid; - printf("EHCI attach\n"); /* initialise some bus fields */ sc->sc_bus.parent = self; sc->sc_bus.devices = sc->sc_devices; @@ -151,7 +149,7 @@ ar71xx_ehci_attach(device_t self) * Craft special resource for bus space ops that handle * byte-alignment of non-word addresses. */ - sc->sc_io_tag = &ar71xx_bus_space_reversed; + sc->sc_io_tag = ar71xx_bus_space_reversed; sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); sc->sc_io_size = rman_get_size(sc->sc_io_res); Modified: projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c ============================================================================== --- projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c Sun Apr 19 23:03:57 2009 (r191292) +++ projects/mips/sys/mips/atheros/uart_cpu_ar71xx.c Sun Apr 19 23:06:15 2009 (r191293) @@ -55,7 +55,7 @@ uart_cpu_getdev(int devtype, struct uart { di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = &ar71xx_bus_space_reversed; + di->bas.bst = ar71xx_bus_space_reversed; di->bas.regshft = 2; /* TODO: calculate proper AHB freq using PLL registers */ di->bas.rclk = 85000000; @@ -66,7 +66,7 @@ uart_cpu_getdev(int devtype, struct uart /* TODO: check if uart_bus_space_io mandatory to set */ uart_bus_space_io = NULL; - uart_bus_space_mem = &ar71xx_bus_space_reversed; + uart_bus_space_mem = ar71xx_bus_space_reversed; /* * FIXME: * 3 is to compensate big endian, uart operates From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 23:08: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 E2C821065697; Sun, 19 Apr 2009 23:08: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 D14678FC1A; Sun, 19 Apr 2009 23:08: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 n3JN8N21023462; Sun, 19 Apr 2009 23:08:23 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JN8NAc023461; Sun, 19 Apr 2009 23:08:23 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192308.n3JN8NAc023461@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 23:08: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: r191294 - projects/mips/sys/mips/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: Sun, 19 Apr 2009 23:08:24 -0000 Author: gonzo Date: Sun Apr 19 23:08:23 2009 New Revision: 191294 URL: http://svn.freebsd.org/changeset/base/191294 Log: - Expand memory window for apb to include OHCI memory region - Add hints for EHCI and OHCI controllers Modified: projects/mips/sys/mips/conf/AR71XX.hints Modified: projects/mips/sys/mips/conf/AR71XX.hints ============================================================================== --- projects/mips/sys/mips/conf/AR71XX.hints Sun Apr 19 23:06:15 2009 (r191293) +++ projects/mips/sys/mips/conf/AR71XX.hints Sun Apr 19 23:08:23 2009 (r191294) @@ -1,7 +1,7 @@ # $FreeBSD$ hint.apb.0.at="nexus0" hint.apb.0.maddr=0x18000000 -hint.apb.0.msize=0x01000000 +hint.apb.0.msize=0x06000000 hint.apb.0.irq=4 # uart0 @@ -11,6 +11,18 @@ hint.uart.0.maddr=0x18020000 hint.uart.0.msize=0x18 hint.uart.0.irq=3 +#ohci +hint.ohci.0.at="apb0" +hint.ohci.0.maddr=0x1c000000 +hint.ohci.0.msize=0x01000000 +hint.ohci.0.irq=6 + +#ehci +hint.ehci.0.at="nexus0" +hint.ehci.0.maddr=0x1b000000 +hint.ehci.0.msize=0x01000000 +hint.ehci.0.irq=1 + # pci hint.pcib.0.at="nexus0" hint.pcib.0.irq=0 From owner-svn-src-projects@FreeBSD.ORG Sun Apr 19 23:15:07 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 92A4A1065678; Sun, 19 Apr 2009 23:15:07 +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 376978FC20; Sun, 19 Apr 2009 23:15:05 +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 n3JNF5MB023672; Sun, 19 Apr 2009 23:15:05 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JNF5Qx023671; Sun, 19 Apr 2009 23:15:05 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904192315.n3JNF5Qx023671@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 19 Apr 2009 23:15:05 +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: r191295 - projects/mips/sys/mips/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: Sun, 19 Apr 2009 23:15:09 -0000 Author: gonzo Date: Sun Apr 19 23:15:04 2009 New Revision: 191295 URL: http://svn.freebsd.org/changeset/base/191295 Log: - Enable USB and EHCI - Include if_arge to build - Add NFS root options - Disable pci ATM and add stubs for wifi adapter config Modified: projects/mips/sys/mips/conf/AR71XX Modified: projects/mips/sys/mips/conf/AR71XX ============================================================================== --- projects/mips/sys/mips/conf/AR71XX Sun Apr 19 23:08:23 2009 (r191294) +++ projects/mips/sys/mips/conf/AR71XX Sun Apr 19 23:15:04 2009 (r191295) @@ -29,9 +29,36 @@ options _KPOSIX_PRIORITY_SCHEDULING #Po options INVARIANTS options INVARIANT_SUPPORT -device pci +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=arge0 +options BOOTP_COMPAT +options ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\" + +# device pci +# Wireless NIC cards +# device wlan # 802.11 support +# device wlan_wep # 802.11 WEP support +# device wlan_ccmp # 802.11 CCMP support +# device wlan_tkip # 802.11 TKIP support + +# device ath # Atheros pci/cardbus NIC's +# option AH_SUPPORT_AR5416 +# device ath_hal +# device ath_ar5212 # Atheros HAL (Hardware Access Layer) +# device ath_rate_sample + +device mii +device arge + device uart +device usb +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +device ehci + device loop device ether device md From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 17:39: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 E4F01106566B; Mon, 20 Apr 2009 17:39:44 +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 D4C908FC1E; Mon, 20 Apr 2009 17:39:44 +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 n3KHdiQ2053503; Mon, 20 Apr 2009 17:39:44 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KHdiQi053502; Mon, 20 Apr 2009 17:39:44 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904201739.n3KHdiQi053502@svn.freebsd.org> From: Rui Paulo Date: Mon, 20 Apr 2009 17:39: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: r191329 - 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: Mon, 20 Apr 2009 17:39:45 -0000 Author: rpaulo Date: Mon Apr 20 17:39:44 2009 New Revision: 191329 URL: http://svn.freebsd.org/changeset/base/191329 Log: Add mesh names and call mesh attach/detach routines. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_proto.c Modified: projects/mesh11s/sys/net80211/ieee80211_proto.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_proto.c Mon Apr 20 17:11:21 2009 (r191328) +++ projects/mesh11s/sys/net80211/ieee80211_proto.c Mon Apr 20 17:39:44 2009 (r191329) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -76,7 +77,8 @@ const char *ieee80211_opmode_name[IEEE80 "WDS", /* IEEE80211_M_WDS */ "AHDEMO", /* IEEE80211_M_AHDEMO */ "HOSTAP", /* IEEE80211_M_HOSTAP */ - "MONITOR" /* IEEE80211_M_MONITOR */ + "MONITOR", /* IEEE80211_M_MONITOR */ + "MBSS" /* IEEE80211_M_MBSS */ }; const char *ieee80211_state_name[IEEE80211_S_MAX] = { "INIT", /* IEEE80211_S_INIT */ @@ -143,6 +145,7 @@ ieee80211_proto_attach(struct ieee80211c ieee80211_sta_attach(ic); ieee80211_wds_attach(ic); ieee80211_hostap_attach(ic); + ieee80211_mesh_attach(ic); ieee80211_monitor_attach(ic); } @@ -150,6 +153,7 @@ void ieee80211_proto_detach(struct ieee80211com *ic) { ieee80211_monitor_detach(ic); + ieee80211_mesh_detach(ic); ieee80211_hostap_detach(ic); ieee80211_wds_detach(ic); ieee80211_adhoc_detach(ic); From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 18:53:10 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 BE1F71065670; Mon, 20 Apr 2009 18:53:10 +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 AD5F98FC16; Mon, 20 Apr 2009 18:53:10 +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 n3KIrAta055402; Mon, 20 Apr 2009 18:53:10 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KIrA9G055401; Mon, 20 Apr 2009 18:53:10 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904201853.n3KIrA9G055401@svn.freebsd.org> From: Rui Paulo Date: Mon, 20 Apr 2009 18:53: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: r191331 - 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: Mon, 20 Apr 2009 18:53:11 -0000 Author: rpaulo Date: Mon Apr 20 18:53:10 2009 New Revision: 191331 URL: http://svn.freebsd.org/changeset/base/191331 Log: Use FreeBSD Foundation copyright. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Apr 20 18:19:38 2009 (r191330) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Mon Apr 20 18:53:10 2009 (r191331) @@ -1,27 +1,31 @@ -/*- - * Copyright (c) 2009 Rui Paulo - * 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. - * +/*- + * Copyright (c) 2009 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Rui Paulo under sponsorship from the + * FreeBSD Foundation. + * + * 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$ */ #ifndef _NET80211_IEEE80211_MESH_H_ From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 18:58: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 5BBCE106566C; Mon, 20 Apr 2009 18:58: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 4AEFD8FC17; Mon, 20 Apr 2009 18:58: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 n3KIwjsD055562; Mon, 20 Apr 2009 18:58:45 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KIwjG1055561; Mon, 20 Apr 2009 18:58:45 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904201858.n3KIwjG1055561@svn.freebsd.org> From: Rui Paulo Date: Mon, 20 Apr 2009 18:58:45 +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: r191332 - 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: Mon, 20 Apr 2009 18:58:46 -0000 Author: rpaulo Date: Mon Apr 20 18:58:45 2009 New Revision: 191332 URL: http://svn.freebsd.org/changeset/base/191332 Log: Use FreeBSD Foundation copyright. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Apr 20 18:53:10 2009 (r191331) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Apr 20 18:58:45 2009 (r191332) @@ -1,28 +1,31 @@ -/*- - * Copyright (c) 2009 Rui Paulo - * 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. - */ - +/*- + * Copyright (c) 2009 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Rui Paulo under sponsorship from the + * FreeBSD Foundation. + * + * 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 #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 18:59: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 936A71065675; Mon, 20 Apr 2009 18:59:36 +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 832A58FC13; Mon, 20 Apr 2009 18:59:36 +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 n3KIxaxv055615; Mon, 20 Apr 2009 18:59:36 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KIxaZZ055614; Mon, 20 Apr 2009 18:59:36 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904201859.n3KIxaZZ055614@svn.freebsd.org> From: Rui Paulo Date: Mon, 20 Apr 2009 18:59:36 +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: r191333 - 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: Mon, 20 Apr 2009 18:59:37 -0000 Author: rpaulo Date: Mon Apr 20 18:59:36 2009 New Revision: 191333 URL: http://svn.freebsd.org/changeset/base/191333 Log: Add mesh_rcvd_mgmt(). Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Apr 20 18:58:45 2009 (r191332) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon Apr 20 18:59:36 2009 (r191333) @@ -65,6 +65,8 @@ static void mesh_vattach(struct ieee8021 static int mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int mesh_input(struct ieee80211_node *, struct mbuf *, int, int, uint32_t); +static void mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int, + int, int, uint32_t); void ieee80211_mesh_attach(struct ieee80211com *ic) @@ -88,8 +90,12 @@ mesh_vattach(struct ieee80211vap *vap) vap->iv_newstate = mesh_newstate; vap->iv_input = mesh_input; vap->iv_opdetach = mesh_vdetach; + vap->iv_recv_mgmt = mesh_recv_mgmt; } +/* + * IEEE80211_M_MBSS vap state machine handler. + */ static int mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { @@ -128,3 +134,33 @@ mesh_input(struct ieee80211_node *ni, st return 0; } + + +static void +mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, + int rssi, int noise, uint32_t rstamp) +{ + + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_frame *wh; + + wh = mtod(m0, struct ieee80211_frame *); + frm = (uint8_t *)&wh[1]; + efrm = mtod(m0, uint8_t *) + m0->m_len; + switch (subtype) { + case IEEE80211_FC0_SUBTYPE_PROBE_RESP: + case IEEE80211_FC0_SUBTYPE_BEACON: + { + struct ieee80211_scanparams scan; + + /* NB: accept off-channel frames */ + if (ieee80211_parse_beacon(ni, m0, &scan) &~ IEEE80211_BPARSE_OF + return; + break; + } + default: + break; + } + +} From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 19:53: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 D01541065672; Mon, 20 Apr 2009 19:53:26 +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 B4D9A8FC19; Mon, 20 Apr 2009 19:53:26 +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 n3KJrQaI056634; Mon, 20 Apr 2009 19:53:26 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KJrQni056631; Mon, 20 Apr 2009 19:53:26 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904201953.n3KJrQni056631@svn.freebsd.org> From: Rui Paulo Date: Mon, 20 Apr 2009 19:53: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: r191334 - 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: Mon, 20 Apr 2009 19:53:27 -0000 Author: rpaulo Date: Mon Apr 20 19:53:26 2009 New Revision: 191334 URL: http://svn.freebsd.org/changeset/base/191334 Log: Implement setter/getter ioctl for mesh id. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c projects/mesh11s/sys/net80211/ieee80211_ioctl.h projects/mesh11s/sys/net80211/ieee80211_var.h Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ioctl.c Mon Apr 20 18:59:36 2009 (r191333) +++ projects/mesh11s/sys/net80211/ieee80211_ioctl.c Mon Apr 20 19:53:26 2009 (r191334) @@ -1110,6 +1110,14 @@ ieee80211_ioctl_get80211(struct ieee8021 ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) != 0; break; + case IEEE80211_IOC_MESHID: + if (vap->iv_opmode != IEEE80211_M_MBSS) + return EINVAL; + + ireq->i_len = vap->iv_meshidlen; + memcpy(tmpssid, vap->iv_meshid, ireq->i_len); + error = copyout(tmpssid, ireq->i_data, ireq->i_len); + break; default: error = ieee80211_ioctl_getdefault(vap, ireq); break; @@ -3137,6 +3145,17 @@ ieee80211_ioctl_set80211(struct ieee8021 if (isvapht(vap)) error = ERESTART; break; + case IEEE80211_IOC_MESHID: + if (ireq->i_val != 0 || + ireq->i_len > IEEE80211_NWID_LEN) + return EINVAL; + error = copyin(ireq->i_data, tmpssid, ireq->i_len); + if (error) + break; + memset(vap->iv_meshid, 0, IEEE80211_NWID_LEN); + vap->iv_meshidlen = ireq->i_len; + memcpy(vap->iv_meshid, tmpssid, ireq->i_len); + break; default: error = ieee80211_ioctl_setdefault(vap, ireq); break; Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ioctl.h Mon Apr 20 18:59:36 2009 (r191333) +++ projects/mesh11s/sys/net80211/ieee80211_ioctl.h Mon Apr 20 19:53:26 2009 (r191334) @@ -628,6 +628,7 @@ struct ieee80211req { #define IEEE80211_IOC_STA_VLAN 109 /* per-station vlan tag */ #define IEEE80211_IOC_SMPS 110 /* MIMO power save */ #define IEEE80211_IOC_RIFS 111 /* RIFS config (on, off) */ +#define IEEE80211_IOC_MESHID 112 /* Mesh identifier */ #define IEEE80211_IOC_TDMA_SLOT 201 /* TDMA: assigned slot */ #define IEEE80211_IOC_TDMA_SLOTCNT 202 /* TDMA: slots in bss */ Modified: projects/mesh11s/sys/net80211/ieee80211_var.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_var.h Mon Apr 20 18:59:36 2009 (r191333) +++ projects/mesh11s/sys/net80211/ieee80211_var.h Mon Apr 20 19:53:26 2009 (r191334) @@ -371,6 +371,8 @@ struct ieee80211vap { uint8_t iv_dtim_count; /* DTIM count from last bcn */ /* set/unset aid pwrsav state */ int iv_csa_count; /* count for doing CSA */ + int iv_meshidlen; + uint8_t iv_meshid[IEEE80211_NWID_LEN]; struct ieee80211_node *iv_bss; /* information for this node */ struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX]; From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 11:42:30 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 4C13C10656A6; Tue, 21 Apr 2009 11:42:30 +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 939088FC33; Tue, 21 Apr 2009 11:42:29 +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 n3LBgTEs085220; Tue, 21 Apr 2009 11:42:29 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LBgTPm085216; Tue, 21 Apr 2009 11:42:29 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211142.n3LBgTPm085216@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 11:42:29 +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: r191354 - in projects/mesh11s/sys/dev: ath ral 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, 21 Apr 2009 11:42:31 -0000 Author: rpaulo Date: Tue Apr 21 11:42:28 2009 New Revision: 191354 URL: http://svn.freebsd.org/changeset/base/191354 Log: Enable MBSS mode (not yet implemented). Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/dev/ath/if_ath.c projects/mesh11s/sys/dev/ral/rt2560.c projects/mesh11s/sys/dev/ral/rt2661.c Modified: projects/mesh11s/sys/dev/ath/if_ath.c ============================================================================== --- projects/mesh11s/sys/dev/ath/if_ath.c Tue Apr 21 10:54:47 2009 (r191353) +++ projects/mesh11s/sys/dev/ath/if_ath.c Tue Apr 21 11:42:28 2009 (r191354) @@ -579,6 +579,7 @@ ath_attach(u_int16_t devid, struct ath_s | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ | IEEE80211_C_WDS /* 4-address traffic works */ + | IEEE80211_C_MBSS /* mesh point link mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ @@ -924,6 +925,9 @@ ath_vap_create(struct ieee80211com *ic, } ic_opmode = IEEE80211_M_HOSTAP; break; + case IEEE80211_M_MBSS: + /* XXXRP TBD */ + break; default: device_printf(sc->sc_dev, "unknown opmode %d\n", opmode); goto bad; Modified: projects/mesh11s/sys/dev/ral/rt2560.c ============================================================================== --- projects/mesh11s/sys/dev/ral/rt2560.c Tue Apr 21 10:54:47 2009 (r191353) +++ projects/mesh11s/sys/dev/ral/rt2560.c Tue Apr 21 11:42:28 2009 (r191354) @@ -284,6 +284,7 @@ rt2560_attach(device_t dev, int id) | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ | IEEE80211_C_WDS /* 4-address traffic works */ + | IEEE80211_C_MBSS /* mesh point link mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ @@ -396,6 +397,8 @@ rt2560_vap_create(struct ieee80211com *i case IEEE80211_M_AHDEMO: case IEEE80211_M_MONITOR: case IEEE80211_M_HOSTAP: + case IEEE80211_M_MBSS: + /* XXXRP: TBD */ if (!TAILQ_EMPTY(&ic->ic_vaps)) { if_printf(ifp, "only 1 vap supported\n"); return NULL; Modified: projects/mesh11s/sys/dev/ral/rt2661.c ============================================================================== --- projects/mesh11s/sys/dev/ral/rt2661.c Tue Apr 21 10:54:47 2009 (r191353) +++ projects/mesh11s/sys/dev/ral/rt2661.c Tue Apr 21 11:42:28 2009 (r191354) @@ -286,6 +286,7 @@ rt2661_attach(device_t dev, int id) | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ | IEEE80211_C_WDS /* 4-address traffic works */ + | IEEE80211_C_MBSS /* mesh point link mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ @@ -392,6 +393,8 @@ rt2661_vap_create(struct ieee80211com *i case IEEE80211_M_AHDEMO: case IEEE80211_M_MONITOR: case IEEE80211_M_HOSTAP: + case IEEE80211_M_MBSS: + /* XXXRP: TBD */ if (!TAILQ_EMPTY(&ic->ic_vaps)) { if_printf(ifp, "only 1 vap supported\n"); return NULL; From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 11:44:41 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 4863F106564A; Tue, 21 Apr 2009 11:44:41 +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 371808FC0A; Tue, 21 Apr 2009 11:44:41 +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 n3LBifuK085493; Tue, 21 Apr 2009 11:44:41 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LBifFv085492; Tue, 21 Apr 2009 11:44:41 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211144.n3LBifFv085492@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 11:44:41 +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: r191355 - 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: Tue, 21 Apr 2009 11:44:41 -0000 Author: rpaulo Date: Tue Apr 21 11:44:40 2009 New Revision: 191355 URL: http://svn.freebsd.org/changeset/base/191355 Log: Implement meshid command and print the mesh id if the vap is a mesh point. 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 Tue Apr 21 11:42:28 2009 (r191354) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Tue Apr 21 11:44:40 2009 (r191355) @@ -571,6 +571,20 @@ set80211ssid(const char *val, int d, int } static void +set80211meshid(const char *val, int d, int s, const struct afswtch *rafp) +{ + int len; + u_int8_t data[IEEE80211_NWID_LEN]; + + memset(data, 0, sizeof(data)); + len = sizeof(data); + if (get_string(val, NULL, data, &len) == NULL) + exit(1); + + set80211(s, IEEE80211_IOC_MESHID, 0, len, data); +} + +static void set80211stationname(const char *val, int d, int s, const struct afswtch *rafp) { int len; @@ -3954,13 +3968,13 @@ printrate(const char *tag, int v, int de } static int -getssid(int s, int ix, void *data, size_t len, int *plen) +getid(int s, int ix, void *data, size_t len, int *plen, int mesh) { struct ieee80211req ireq; (void) memset(&ireq, 0, sizeof(ireq)); (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_SSID; + ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESHID; ireq.i_val = ix; ireq.i_data = data; ireq.i_len = len; @@ -3981,7 +3995,7 @@ ieee80211_status(int s) const struct ieee80211_roamparam *rp; const struct ieee80211_txparam *tp; - if (getssid(s, -1, data, sizeof(data), &len) < 0) { + if (getid(s, -1, data, sizeof(data), &len, 0) < 0) { /* If we can't get the SSID, this isn't an 802.11 device. */ return; } @@ -3996,18 +4010,24 @@ ieee80211_status(int s) gothtconf = 0; gotregdomain = 0; - if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0) - num = 0; - printf("\tssid "); - if (num > 1) { - for (i = 0; i < num; i++) { - if (getssid(s, i, data, sizeof(data), &len) >= 0 && len > 0) { - printf(" %d:", i + 1); - print_string(data, len); - } - } - } else + if (opmode == IEEE80211_M_MBSS) { + printf("\tmeshid "); + getid(s, i, data, sizeof(data), &len, 1); print_string(data, len); + } else { + if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0) + num = 0; + printf("\tssid "); + if (num > 1) { + for (i = 0; i < num; i++) { + if (getid(s, i, data, sizeof(data), &len, 0) >= 0 && len > 0) { + printf(" %d:", i + 1); + print_string(data, len); + } + } + } else + print_string(data, len); + } c = getcurchan(s); if (c->ic_freq != IEEE80211_CHAN_ANY) { @@ -4812,6 +4832,7 @@ set80211clone_wdslegacy(const char *val, static struct cmd ieee80211_cmds[] = { DEF_CMD_ARG("ssid", set80211ssid), DEF_CMD_ARG("nwid", set80211ssid), + DEF_CMD_ARG("meshid", set80211meshid), DEF_CMD_ARG("stationname", set80211stationname), DEF_CMD_ARG("station", set80211stationname), /* BSD/OS */ DEF_CMD_ARG("channel", set80211channel), From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 14:23:19 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 5BD2F106566B; Tue, 21 Apr 2009 14:23:19 +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 4B2D18FC08; Tue, 21 Apr 2009 14:23:19 +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 n3LENIQm011938; Tue, 21 Apr 2009 14:23:18 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LENIul011937; Tue, 21 Apr 2009 14:23:18 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211423.n3LENIul011937@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 14:23:18 +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: r191357 - 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, 21 Apr 2009 14:23:19 -0000 Author: rpaulo Date: Tue Apr 21 14:23:18 2009 New Revision: 191357 URL: http://svn.freebsd.org/changeset/base/191357 Log: Make this build. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Apr 21 12:47:09 2009 (r191356) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Apr 21 14:23:18 2009 (r191357) @@ -140,10 +140,10 @@ static void mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, int rssi, int noise, uint32_t rstamp) { - - struct ieee80211vap *vap = ni->ni_vap; - struct ieee80211com *ic = ni->ni_ic; + /*struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic;*/ struct ieee80211_frame *wh; + uint8_t *frm, *efrm; wh = mtod(m0, struct ieee80211_frame *); frm = (uint8_t *)&wh[1]; @@ -154,8 +154,8 @@ mesh_recv_mgmt(struct ieee80211_node *ni { struct ieee80211_scanparams scan; - /* NB: accept off-channel frames */ - if (ieee80211_parse_beacon(ni, m0, &scan) &~ IEEE80211_BPARSE_OF + /* Parse beacons to discover mesh neighbours */ + if (ieee80211_parse_beacon(ni, m0, &scan) != 0) return; break; } From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 15:54: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 D997E1065673; Tue, 21 Apr 2009 15:54:17 +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 C99528FC1A; Tue, 21 Apr 2009 15:54: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 n3LFsHOb015006; Tue, 21 Apr 2009 15:54:17 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LFsHbF015005; Tue, 21 Apr 2009 15:54:17 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211554.n3LFsHbF015005@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 15:54: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: r191358 - 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, 21 Apr 2009 15:54:18 -0000 Author: rpaulo Date: Tue Apr 21 15:54:17 2009 New Revision: 191358 URL: http://svn.freebsd.org/changeset/base/191358 Log: Add a comment to make sure I don't forget to calculate RSSI more mesh neighbors. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_node.c Modified: projects/mesh11s/sys/net80211/ieee80211_node.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.c Tue Apr 21 14:23:18 2009 (r191357) +++ projects/mesh11s/sys/net80211/ieee80211_node.c Tue Apr 21 15:54:17 2009 (r191358) @@ -2540,6 +2540,9 @@ ieee80211_getrssi(struct ieee80211vap *v case IEEE80211_M_HOSTAP: /* average of all associated stations */ ieee80211_iterate_nodes(&ic->ic_sta, get_hostap_rssi, &info); break; + case IEEE80211_M_MBSS: /* average of all mesh neighbors */ + /* XXX ieee80211_iterate_nodes(&ic->ic_sta, get_mesh_rssi, &info);*/ + break; case IEEE80211_M_MONITOR: /* XXX */ case IEEE80211_M_STA: /* use stats from associated ap */ default: From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 15:56: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 1AC341065674; Tue, 21 Apr 2009 15:56: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 0A69E8FC18; Tue, 21 Apr 2009 15:56: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 n3LFuDuW015097; Tue, 21 Apr 2009 15:56:13 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LFuDaX015094; Tue, 21 Apr 2009 15:56:13 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211556.n3LFuDaX015094@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 15:56: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: r191359 - 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, 21 Apr 2009 15:56:14 -0000 Author: rpaulo Date: Tue Apr 21 15:56:13 2009 New Revision: 191359 URL: http://svn.freebsd.org/changeset/base/191359 Log: Move the ioctl processing code from ieee80211_ioctl.c to ieee80211_mesh.c because we are now using linker sets. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c projects/mesh11s/sys/net80211/ieee80211_ioctl.h projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ioctl.c Tue Apr 21 15:54:17 2009 (r191358) +++ projects/mesh11s/sys/net80211/ieee80211_ioctl.c Tue Apr 21 15:56:13 2009 (r191359) @@ -1110,14 +1110,6 @@ ieee80211_ioctl_get80211(struct ieee8021 ireq->i_val = (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) != 0; break; - case IEEE80211_IOC_MESHID: - if (vap->iv_opmode != IEEE80211_M_MBSS) - return EINVAL; - - ireq->i_len = vap->iv_meshidlen; - memcpy(tmpssid, vap->iv_meshid, ireq->i_len); - error = copyout(tmpssid, ireq->i_data, ireq->i_len); - break; default: error = ieee80211_ioctl_getdefault(vap, ireq); break; @@ -3145,17 +3137,6 @@ ieee80211_ioctl_set80211(struct ieee8021 if (isvapht(vap)) error = ERESTART; break; - case IEEE80211_IOC_MESHID: - if (ireq->i_val != 0 || - ireq->i_len > IEEE80211_NWID_LEN) - return EINVAL; - error = copyin(ireq->i_data, tmpssid, ireq->i_len); - if (error) - break; - memset(vap->iv_meshid, 0, IEEE80211_NWID_LEN); - vap->iv_meshidlen = ireq->i_len; - memcpy(vap->iv_meshid, tmpssid, ireq->i_len); - break; default: error = ieee80211_ioctl_setdefault(vap, ireq); break; Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ioctl.h Tue Apr 21 15:54:17 2009 (r191358) +++ projects/mesh11s/sys/net80211/ieee80211_ioctl.h Tue Apr 21 15:56:13 2009 (r191359) @@ -628,7 +628,8 @@ struct ieee80211req { #define IEEE80211_IOC_STA_VLAN 109 /* per-station vlan tag */ #define IEEE80211_IOC_SMPS 110 /* MIMO power save */ #define IEEE80211_IOC_RIFS 111 /* RIFS config (on, off) */ -#define IEEE80211_IOC_MESHID 112 /* Mesh identifier */ + +#define IEEE80211_IOC_MESH_ID 190 /* Mesh identifier */ #define IEEE80211_IOC_TDMA_SLOT 201 /* TDMA: assigned slot */ #define IEEE80211_IOC_TDMA_SLOTCNT 202 /* TDMA: slots in bss */ Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Apr 21 15:54:17 2009 (r191358) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Apr 21 15:56:13 2009 (r191359) @@ -111,9 +111,20 @@ mesh_newstate(struct ieee80211vap *vap, vap->iv_state = nstate; /* state transition */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(vap); /* background scan */ - switch (nstate) { + ni = vap->iv_bss; /* NB: no reference held */ + switch (nstate) { case IEEE80211_S_INIT: + if (ostate == IEEE80211_S_SCAN) + ieee80211_cancel_scan(vap); + if (ostate != IEEE80211_S_INIT) { + /* NB: optimize INIT -> INIT case */ + ieee80211_reset_bss(vap); + } + break; case IEEE80211_S_SCAN: + switch (ostate) { + case IEEE80211_S_INIT: + } case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: case IEEE80211_S_CAC: @@ -164,3 +175,53 @@ mesh_recv_mgmt(struct ieee80211_node *ni } } + + +static int +mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) +{ + int error; + uint8_t tmpmeshid[IEEE80211_NWID_LEN]; + + error = 0; + switch (ireq->i_type) { + case IEEE80211_IOC_MESH_ID: + if (vap->iv_opmode != IEEE80211_M_MBSS) + return EINVAL; + ireq->i_len = vap->iv_meshidlen; + memcpy(meshid, vap->iv_meshid, ireq->i_len); + error = copyout(tmpmeshid, ireq->i_data, ireq->i_len); + break; + default: + return ENOSYS; + } + + return error; +} +IEEE80211_IOCTL_GET(mesh, mesh_ioctl_get80211); + +static int +mesh_ioctl_set80211(struct ieee80211vap *vap, struct ieee80211req *ireq) +{ + int error; + uint8_t tmpmeshid[IEEE80211_NWID_LEN]; + + error = 0; + switch (ireq->i_type) { + case IEEE80211_IOC_MESH_ID: + if (ireq->i_val != 0 || ireq->i_len > IEEE80211_NWID_LEN) + return EINVAL; + error = copyin(ireq->i_data, tmpmeshid, ireq->i_len); + if (error) + break; + memset(vap->iv_meshid, 0, IEEE80211_NWID_LEN); + vap->iv_meshidlen = ireq->i_len; + memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len); + break; + default: + return ENOSYS; + } + + return error; +} +IEEE80211_IOCTL_SET(mesh, mesh_ioctl_set80211); From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 16:25: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 87C7710656C6; Tue, 21 Apr 2009 16:25: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 76AF48FC2B; Tue, 21 Apr 2009 16:25:18 +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 n3LGPI6r015677; Tue, 21 Apr 2009 16:25:18 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LGPIQW015676; Tue, 21 Apr 2009 16:25:18 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211625.n3LGPIQW015676@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 16:25:18 +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: r191360 - 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: Tue, 21 Apr 2009 16:25:20 -0000 Author: rpaulo Date: Tue Apr 21 16:25:18 2009 New Revision: 191360 URL: http://svn.freebsd.org/changeset/base/191360 Log: Follow the last mesh ioctl rename. 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 Tue Apr 21 15:56:13 2009 (r191359) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Tue Apr 21 16:25:18 2009 (r191360) @@ -581,7 +581,7 @@ set80211meshid(const char *val, int d, i if (get_string(val, NULL, data, &len) == NULL) exit(1); - set80211(s, IEEE80211_IOC_MESHID, 0, len, data); + set80211(s, IEEE80211_IOC_MESH_ID, 0, len, data); } static void @@ -3974,7 +3974,7 @@ getid(int s, int ix, void *data, size_t (void) memset(&ireq, 0, sizeof(ireq)); (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESHID; + ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESH_ID; ireq.i_val = ix; ireq.i_data = data; ireq.i_len = len; @@ -4012,7 +4012,7 @@ ieee80211_status(int s) if (opmode == IEEE80211_M_MBSS) { printf("\tmeshid "); - getid(s, i, data, sizeof(data), &len, 1); + getid(s, 0, data, sizeof(data), &len, 1); print_string(data, len); } else { if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0) From owner-svn-src-projects@FreeBSD.ORG Tue Apr 21 16:58:47 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 5B4FF106566C; Tue, 21 Apr 2009 16:58:47 +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 4B0268FC0A; Tue, 21 Apr 2009 16:58:47 +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 n3LGwlOY016412; Tue, 21 Apr 2009 16:58:47 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LGwknK016411; Tue, 21 Apr 2009 16:58:46 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904211658.n3LGwknK016411@svn.freebsd.org> From: Rui Paulo Date: Tue, 21 Apr 2009 16:58: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: r191361 - 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: Tue, 21 Apr 2009 16:58:47 -0000 Author: rpaulo Date: Tue Apr 21 16:58:46 2009 New Revision: 191361 URL: http://svn.freebsd.org/changeset/base/191361 Log: Add code to support MBSS in get80211mode(). 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 Tue Apr 21 16:25:18 2009 (r191360) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Tue Apr 21 16:58:46 2009 (r191361) @@ -3844,6 +3844,8 @@ get80211opmode(int s) return IEEE80211_M_HOSTAP; if (ifmr.ifm_current & IFM_IEEE80211_MONITOR) return IEEE80211_M_MONITOR; + if (ifmr.ifm_current & IFM_IEEE80211_MBSS) + return IEEE80211_M_MBSS; } return IEEE80211_M_STA; } From owner-svn-src-projects@FreeBSD.ORG Wed Apr 22 14: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 485E21065AAE; Wed, 22 Apr 2009 14:20:24 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 312598FC13; Wed, 22 Apr 2009 14:20:24 +0000 (UTC) (envelope-from rwatson@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 n3MEKNH7058706; Wed, 22 Apr 2009 14:20:23 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MEKNnt058696; Wed, 22 Apr 2009 14:20:23 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200904221420.n3MEKNnt058696@svn.freebsd.org> From: Robert Watson Date: Wed, 22 Apr 2009 14:20: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: r191383 - in projects/pnet/sys: . amd64/acpica amd64/amd64 amd64/conf amd64/ia32 amd64/include amd64/include/pc amd64/include/xen amd64/linux32 amd64/pci arm/arm arm/at91 arm/conf arm/i... 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, 22 Apr 2009 14:20:24 -0000 Author: rwatson Date: Wed Apr 22 14:20:21 2009 New Revision: 191383 URL: http://svn.freebsd.org/changeset/base/191383 Log: Merge head/sys r186685-191380 to projects/pnet/sys. Added: projects/pnet/sys/amd64/acpica/Makefile - copied unchanged from r191380, head/sys/amd64/acpica/Makefile projects/pnet/sys/amd64/acpica/acpi_switch.S - copied unchanged from r191380, head/sys/amd64/acpica/acpi_switch.S projects/pnet/sys/amd64/acpica/acpi_wakecode.S - copied unchanged from r191380, head/sys/amd64/acpica/acpi_wakecode.S projects/pnet/sys/amd64/acpica/genwakecode.sh - copied unchanged from r191380, head/sys/amd64/acpica/genwakecode.sh projects/pnet/sys/amd64/acpica/genwakedata.sh - copied unchanged from r191380, head/sys/amd64/acpica/genwakedata.sh projects/pnet/sys/amd64/conf/XENHVM - copied unchanged from r191380, head/sys/amd64/conf/XENHVM projects/pnet/sys/amd64/ia32/ia32_misc.c - copied unchanged from r191380, head/sys/amd64/ia32/ia32_misc.c projects/pnet/sys/amd64/include/xen/ (props changed) - copied from r191380, head/sys/amd64/include/xen/ projects/pnet/sys/arm/arm/cpufunc_asm_sheeva.S - copied unchanged from r191380, head/sys/arm/arm/cpufunc_asm_sheeva.S projects/pnet/sys/boot/ficl/mips/ - copied from r191380, head/sys/boot/ficl/mips/ projects/pnet/sys/bsm/audit_domain.h - copied unchanged from r191380, head/sys/bsm/audit_domain.h projects/pnet/sys/bsm/audit_fcntl.h - copied unchanged from r191380, head/sys/bsm/audit_fcntl.h projects/pnet/sys/bsm/audit_socket_type.h - copied unchanged from r191380, head/sys/bsm/audit_socket_type.h projects/pnet/sys/cddl/dev/dtnfsclient/ (props changed) - copied from r191380, head/sys/cddl/dev/dtnfsclient/ projects/pnet/sys/contrib/dev/uath/ - copied from r191380, head/sys/contrib/dev/uath/ projects/pnet/sys/dev/amdtemp/ - copied from r191380, head/sys/dev/amdtemp/ projects/pnet/sys/dev/ata/ata-raid-ddf.h - copied unchanged from r191380, head/sys/dev/ata/ata-raid-ddf.h projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9280.c - copied unchanged from r191380, head/sys/dev/ath/ath_hal/ar5416/ar9280.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9280.h - copied unchanged from r191380, head/sys/dev/ath/ath_hal/ar5416/ar9280.h projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c - copied unchanged from r191380, head/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini - copied unchanged from r191380, head/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini - copied unchanged from r191380, head/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini projects/pnet/sys/dev/cfi/cfi_bus_ixp4xx.c - copied unchanged from r191380, head/sys/dev/cfi/cfi_bus_ixp4xx.c projects/pnet/sys/dev/cfi/cfi_disk.c - copied unchanged from r191380, head/sys/dev/cfi/cfi_disk.c projects/pnet/sys/dev/cxgb/t3c_protocol_sram.h - copied unchanged from r191380, head/sys/dev/cxgb/t3c_protocol_sram.h projects/pnet/sys/dev/cxgb/t3c_tp_eeprom.h - copied unchanged from r191380, head/sys/dev/cxgb/t3c_tp_eeprom.h projects/pnet/sys/dev/drm/i915_reg.h - copied unchanged from r191380, head/sys/dev/drm/i915_reg.h projects/pnet/sys/dev/drm/r600_cp.c - copied unchanged from r191380, head/sys/dev/drm/r600_cp.c projects/pnet/sys/dev/drm/r600_microcode.h - copied unchanged from r191380, head/sys/dev/drm/r600_microcode.h projects/pnet/sys/dev/ipmi/ipmi_linux.c - copied unchanged from r191380, head/sys/dev/ipmi/ipmi_linux.c projects/pnet/sys/dev/ixgbe/ixgbe_82599.c - copied unchanged from r191380, head/sys/dev/ixgbe/ixgbe_82599.c projects/pnet/sys/dev/mii/axphy.c - copied unchanged from r191380, head/sys/dev/mii/axphy.c projects/pnet/sys/dev/mii/axphyreg.h - copied unchanged from r191380, head/sys/dev/mii/axphyreg.h projects/pnet/sys/dev/ofw/ofw_iicbus.c - copied unchanged from r191380, head/sys/dev/ofw/ofw_iicbus.c projects/pnet/sys/dev/sound/macio/ - copied from r191380, head/sys/dev/sound/macio/ projects/pnet/sys/dev/syscons/teken/teken_scs.h - copied unchanged from r191380, head/sys/dev/syscons/teken/teken_scs.h projects/pnet/sys/dev/xen/xenpci/ (props changed) - copied from r191380, head/sys/dev/xen/xenpci/ projects/pnet/sys/geom/geom_redboot.c - copied unchanged from r191380, head/sys/geom/geom_redboot.c projects/pnet/sys/geom/part/g_part_ebr.c - copied unchanged from r191380, head/sys/geom/part/g_part_ebr.c projects/pnet/sys/geom/vinum/geom_vinum_create.c - copied unchanged from r191380, head/sys/geom/vinum/geom_vinum_create.c projects/pnet/sys/geom/vinum/geom_vinum_events.c - copied unchanged from r191380, head/sys/geom/vinum/geom_vinum_events.c projects/pnet/sys/i386/cpufreq/hwpstate.c - copied unchanged from r191380, head/sys/i386/cpufreq/hwpstate.c projects/pnet/sys/ia64/ia32/ia32_misc.c - copied unchanged from r191380, head/sys/ia64/ia32/ia32_misc.c projects/pnet/sys/legacy/ - copied from r191380, head/sys/legacy/ projects/pnet/sys/libkern/memmove.c - copied unchanged from r191380, head/sys/libkern/memmove.c projects/pnet/sys/modules/amdtemp/ - copied from r191380, head/sys/modules/amdtemp/ projects/pnet/sys/modules/dtrace/dtnfsclient/ (props changed) - copied from r191380, head/sys/modules/dtrace/dtnfsclient/ projects/pnet/sys/modules/geom/geom_part/geom_part_ebr/ - copied from r191380, head/sys/modules/geom/geom_part/geom_part_ebr/ projects/pnet/sys/modules/ip6_mroute_mod/ (props changed) - copied from r191380, head/sys/modules/ip6_mroute_mod/ projects/pnet/sys/modules/ipmi/ipmi_linux/ (props changed) - copied from r191380, head/sys/modules/ipmi/ipmi_linux/ projects/pnet/sys/modules/nfssvc/ - copied from r191380, head/sys/modules/nfssvc/ projects/pnet/sys/modules/sound/driver/ai2s/ - copied from r191380, head/sys/modules/sound/driver/ai2s/ projects/pnet/sys/modules/sound/driver/davbus/ - copied from r191380, head/sys/modules/sound/driver/davbus/ projects/pnet/sys/net/flowtable.c - copied unchanged from r191380, head/sys/net/flowtable.c projects/pnet/sys/net/flowtable.h - copied unchanged from r191380, head/sys/net/flowtable.h projects/pnet/sys/net80211/ieee80211_superg.c - copied unchanged from r191380, head/sys/net80211/ieee80211_superg.c projects/pnet/sys/net80211/ieee80211_superg.h - copied unchanged from r191380, head/sys/net80211/ieee80211_superg.h projects/pnet/sys/net80211/ieee80211_tdma.c - copied unchanged from r191380, head/sys/net80211/ieee80211_tdma.c projects/pnet/sys/net80211/ieee80211_tdma.h - copied unchanged from r191380, head/sys/net80211/ieee80211_tdma.h projects/pnet/sys/netinet/libalias/alias_sctp.c - copied unchanged from r191380, head/sys/netinet/libalias/alias_sctp.c projects/pnet/sys/netinet/libalias/alias_sctp.h - copied unchanged from r191380, head/sys/netinet/libalias/alias_sctp.h projects/pnet/sys/nfs/nfs_nfssvc.c - copied unchanged from r191380, head/sys/nfs/nfs_nfssvc.c projects/pnet/sys/nfs/nfssvc.h - copied unchanged from r191380, head/sys/nfs/nfssvc.h projects/pnet/sys/nfsclient/nfs_kdtrace.c - copied unchanged from r191380, head/sys/nfsclient/nfs_kdtrace.c projects/pnet/sys/nfsclient/nfs_kdtrace.h - copied unchanged from r191380, head/sys/nfsclient/nfs_kdtrace.h projects/pnet/sys/powerpc/aim/mmu_oea64.c - copied unchanged from r191380, head/sys/powerpc/aim/mmu_oea64.c projects/pnet/sys/powerpc/include/altivec.h - copied unchanged from r191380, head/sys/powerpc/include/altivec.h projects/pnet/sys/powerpc/include/sysarch.h - copied unchanged from r191380, head/sys/powerpc/include/sysarch.h projects/pnet/sys/powerpc/ofw/ofw_real.c - copied unchanged from r191380, head/sys/powerpc/ofw/ofw_real.c projects/pnet/sys/powerpc/powermac/cpcht.c - copied unchanged from r191380, head/sys/powerpc/powermac/cpcht.c projects/pnet/sys/powerpc/powermac/cpchtvar.h - copied unchanged from r191380, head/sys/powerpc/powermac/cpchtvar.h projects/pnet/sys/powerpc/powermac/kiic.c - copied unchanged from r191380, head/sys/powerpc/powermac/kiic.c projects/pnet/sys/powerpc/powerpc/altivec.c - copied unchanged from r191380, head/sys/powerpc/powerpc/altivec.c projects/pnet/sys/powerpc/powerpc/dump_machdep.c - copied unchanged from r191380, head/sys/powerpc/powerpc/dump_machdep.c projects/pnet/sys/powerpc/powerpc/uio_machdep.c - copied unchanged from r191380, head/sys/powerpc/powerpc/uio_machdep.c projects/pnet/sys/security/audit/audit_bsm_domain.c - copied unchanged from r191380, head/sys/security/audit/audit_bsm_domain.c projects/pnet/sys/security/audit/audit_bsm_fcntl.c - copied unchanged from r191380, head/sys/security/audit/audit_bsm_fcntl.c projects/pnet/sys/security/audit/audit_bsm_socket_type.c - copied unchanged from r191380, head/sys/security/audit/audit_bsm_socket_type.c projects/pnet/sys/xen/features.h - copied unchanged from r191380, head/sys/xen/features.h projects/pnet/sys/xen/reboot.c - copied unchanged from r191380, head/sys/xen/reboot.c Replaced: projects/pnet/sys/dev/ata/ata-usb.c - copied unchanged from r191380, head/sys/dev/ata/ata-usb.c projects/pnet/sys/dev/sound/usb/uaudio.c - copied unchanged from r191380, head/sys/dev/sound/usb/uaudio.c projects/pnet/sys/dev/sound/usb/uaudio.h - copied unchanged from r191380, head/sys/dev/sound/usb/uaudio.h projects/pnet/sys/dev/sound/usb/uaudio_pcm.c - copied unchanged from r191380, head/sys/dev/sound/usb/uaudio_pcm.c projects/pnet/sys/dev/sound/usb/uaudioreg.h - copied unchanged from r191380, head/sys/dev/sound/usb/uaudioreg.h projects/pnet/sys/dev/usb/ - copied from r191380, head/sys/dev/usb/ projects/pnet/sys/dev/usb/usb.h - copied unchanged from r191380, head/sys/dev/usb/usb.h projects/pnet/sys/dev/usb/usb_if.m - copied unchanged from r191380, head/sys/dev/usb/usb_if.m projects/pnet/sys/dev/usb/usbdevs - copied unchanged from r191380, head/sys/dev/usb/usbdevs projects/pnet/sys/dev/usb/usbhid.h - copied unchanged from r191380, head/sys/dev/usb/usbhid.h projects/pnet/sys/modules/usb/ - copied from r191380, head/sys/modules/usb/ projects/pnet/sys/modules/usb/Makefile - copied unchanged from r191380, head/sys/modules/usb/Makefile Deleted: projects/pnet/sys/amd64/conf/USB2 projects/pnet/sys/arm/arm/cpufunc_asm_feroceon.S projects/pnet/sys/boot/common/load.c projects/pnet/sys/dev/ar/ projects/pnet/sys/dev/digi/con.CX-IBM.h projects/pnet/sys/dev/digi/con.CX.h projects/pnet/sys/dev/digi/con.EPCX.h projects/pnet/sys/dev/digi/con.MBank.h projects/pnet/sys/dev/k8temp/ projects/pnet/sys/dev/ray/ projects/pnet/sys/dev/sound/pci/au88x0.c projects/pnet/sys/dev/sound/pci/au88x0.h projects/pnet/sys/dev/sr/ projects/pnet/sys/dev/usb2/ projects/pnet/sys/i386/conf/USB2 projects/pnet/sys/modules/ar/ projects/pnet/sys/modules/aue/ projects/pnet/sys/modules/axe/ projects/pnet/sys/modules/cdce/ projects/pnet/sys/modules/cue/ projects/pnet/sys/modules/ehci/ projects/pnet/sys/modules/k8temp/ projects/pnet/sys/modules/kue/ projects/pnet/sys/modules/netgraph/sync_ar/ projects/pnet/sys/modules/netgraph/sync_sr/ projects/pnet/sys/modules/ohci/ projects/pnet/sys/modules/ray/ projects/pnet/sys/modules/rue/ projects/pnet/sys/modules/rum/ projects/pnet/sys/modules/slhci/ projects/pnet/sys/modules/sound/driver/au88x0/ projects/pnet/sys/modules/sr/ projects/pnet/sys/modules/u3g/ projects/pnet/sys/modules/uark/ projects/pnet/sys/modules/ubsa/ projects/pnet/sys/modules/ucom/ projects/pnet/sys/modules/udav/ projects/pnet/sys/modules/udbp/ projects/pnet/sys/modules/ufm/ projects/pnet/sys/modules/ufoma/ projects/pnet/sys/modules/uftdi/ projects/pnet/sys/modules/ugen/ projects/pnet/sys/modules/uhci/ projects/pnet/sys/modules/uhid/ projects/pnet/sys/modules/uipaq/ projects/pnet/sys/modules/ukbd/ projects/pnet/sys/modules/ulpt/ projects/pnet/sys/modules/umass/ projects/pnet/sys/modules/umct/ projects/pnet/sys/modules/umodem/ projects/pnet/sys/modules/ums/ projects/pnet/sys/modules/upgt/ projects/pnet/sys/modules/uplcom/ projects/pnet/sys/modules/ural/ projects/pnet/sys/modules/urio/ projects/pnet/sys/modules/usb2/ projects/pnet/sys/modules/uscanner/ projects/pnet/sys/modules/uslcom/ projects/pnet/sys/modules/uvisor/ projects/pnet/sys/modules/uvscom/ projects/pnet/sys/modules/zyd/ projects/pnet/sys/net/bsd_comp.c projects/pnet/sys/net/if_ppp.c projects/pnet/sys/net/if_ppp.h projects/pnet/sys/net/if_pppvar.h projects/pnet/sys/net/if_sl.c projects/pnet/sys/net/if_slvar.h projects/pnet/sys/net/ppp_comp.h projects/pnet/sys/net/ppp_deflate.c projects/pnet/sys/net/ppp_tty.c projects/pnet/sys/net/slip.h projects/pnet/sys/pccard/ projects/pnet/sys/powerpc/aim/uio_machdep.c projects/pnet/sys/powerpc/booke/support.S projects/pnet/sys/powerpc/booke/uio_machdep.c Modified: projects/pnet/sys/ (props changed) projects/pnet/sys/Makefile projects/pnet/sys/amd64/acpica/acpi_machdep.c projects/pnet/sys/amd64/acpica/acpi_wakeup.c projects/pnet/sys/amd64/acpica/madt.c projects/pnet/sys/amd64/amd64/amd64_mem.c projects/pnet/sys/amd64/amd64/apic_vector.S projects/pnet/sys/amd64/amd64/busdma_machdep.c projects/pnet/sys/amd64/amd64/cpu_switch.S projects/pnet/sys/amd64/amd64/db_interface.c projects/pnet/sys/amd64/amd64/db_trace.c projects/pnet/sys/amd64/amd64/elf_machdep.c projects/pnet/sys/amd64/amd64/exception.S projects/pnet/sys/amd64/amd64/fpu.c projects/pnet/sys/amd64/amd64/genassym.c projects/pnet/sys/amd64/amd64/identcpu.c projects/pnet/sys/amd64/amd64/initcpu.c projects/pnet/sys/amd64/amd64/io_apic.c projects/pnet/sys/amd64/amd64/local_apic.c projects/pnet/sys/amd64/amd64/machdep.c projects/pnet/sys/amd64/amd64/mp_machdep.c projects/pnet/sys/amd64/amd64/msi.c projects/pnet/sys/amd64/amd64/pmap.c projects/pnet/sys/amd64/amd64/sys_machdep.c projects/pnet/sys/amd64/amd64/trap.c projects/pnet/sys/amd64/amd64/vm_machdep.c projects/pnet/sys/amd64/conf/DEFAULTS projects/pnet/sys/amd64/conf/GENERIC projects/pnet/sys/amd64/conf/NOTES projects/pnet/sys/amd64/ia32/ia32_exception.S projects/pnet/sys/amd64/ia32/ia32_reg.c projects/pnet/sys/amd64/ia32/ia32_signal.c projects/pnet/sys/amd64/ia32/ia32_sigtramp.S projects/pnet/sys/amd64/include/apicvar.h projects/pnet/sys/amd64/include/asmacros.h projects/pnet/sys/amd64/include/cpufunc.h projects/pnet/sys/amd64/include/cputypes.h projects/pnet/sys/amd64/include/elf.h projects/pnet/sys/amd64/include/endian.h projects/pnet/sys/amd64/include/fpu.h projects/pnet/sys/amd64/include/frame.h projects/pnet/sys/amd64/include/intr_machdep.h projects/pnet/sys/amd64/include/legacyvar.h projects/pnet/sys/amd64/include/md_var.h projects/pnet/sys/amd64/include/metadata.h projects/pnet/sys/amd64/include/param.h projects/pnet/sys/amd64/include/pc/bios.h projects/pnet/sys/amd64/include/pcb.h projects/pnet/sys/amd64/include/pcpu.h projects/pnet/sys/amd64/include/pmap.h projects/pnet/sys/amd64/include/proc.h projects/pnet/sys/amd64/include/reg.h projects/pnet/sys/amd64/include/segments.h projects/pnet/sys/amd64/include/signal.h projects/pnet/sys/amd64/include/smp.h projects/pnet/sys/amd64/include/specialreg.h projects/pnet/sys/amd64/include/sysarch.h projects/pnet/sys/amd64/include/ucontext.h projects/pnet/sys/amd64/linux32/linux.h projects/pnet/sys/amd64/linux32/linux32_locore.s projects/pnet/sys/amd64/linux32/linux32_machdep.c projects/pnet/sys/amd64/linux32/linux32_sysvec.c projects/pnet/sys/amd64/pci/pci_bus.c projects/pnet/sys/amd64/pci/pci_cfgreg.c projects/pnet/sys/arm/arm/busdma_machdep.c projects/pnet/sys/arm/arm/cpufunc.c projects/pnet/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/pnet/sys/arm/arm/dump_machdep.c projects/pnet/sys/arm/arm/elf_machdep.c projects/pnet/sys/arm/arm/elf_trampoline.c projects/pnet/sys/arm/arm/genassym.c projects/pnet/sys/arm/arm/locore.S projects/pnet/sys/arm/arm/machdep.c projects/pnet/sys/arm/arm/pmap.c projects/pnet/sys/arm/arm/swtch.S projects/pnet/sys/arm/arm/trap.c projects/pnet/sys/arm/arm/vm_machdep.c projects/pnet/sys/arm/at91/at91.c projects/pnet/sys/arm/at91/at91_mci.c projects/pnet/sys/arm/at91/at91_twi.c projects/pnet/sys/arm/at91/at91_twireg.h projects/pnet/sys/arm/at91/at91var.h projects/pnet/sys/arm/at91/files.at91 projects/pnet/sys/arm/at91/uart_bus_at91usart.c projects/pnet/sys/arm/at91/uart_cpu_at91rm9200usart.c projects/pnet/sys/arm/at91/uart_dev_at91usart.c projects/pnet/sys/arm/conf/AVILA projects/pnet/sys/arm/conf/AVILA.hints projects/pnet/sys/arm/conf/BWCT projects/pnet/sys/arm/conf/BWCT.hints projects/pnet/sys/arm/conf/CAMBRIA projects/pnet/sys/arm/conf/CAMBRIA.hints projects/pnet/sys/arm/conf/HL200 projects/pnet/sys/arm/conf/KB920X projects/pnet/sys/arm/conf/NSLU projects/pnet/sys/arm/include/atomic.h projects/pnet/sys/arm/include/cpufunc.h projects/pnet/sys/arm/include/elf.h projects/pnet/sys/arm/include/param.h projects/pnet/sys/arm/include/proc.h projects/pnet/sys/arm/include/sysarch.h projects/pnet/sys/arm/include/vmparam.h projects/pnet/sys/arm/mv/common.c projects/pnet/sys/arm/mv/discovery/db78xxx.c projects/pnet/sys/arm/mv/discovery/discovery.c projects/pnet/sys/arm/mv/files.mv projects/pnet/sys/arm/mv/gpio.c projects/pnet/sys/arm/mv/ic.c projects/pnet/sys/arm/mv/kirkwood/db88f6xxx.c projects/pnet/sys/arm/mv/kirkwood/kirkwood.c projects/pnet/sys/arm/mv/mv_machdep.c projects/pnet/sys/arm/mv/mv_pci.c projects/pnet/sys/arm/mv/mvreg.h projects/pnet/sys/arm/mv/mvvar.h projects/pnet/sys/arm/mv/obio.c projects/pnet/sys/arm/mv/orion/db88f5xxx.c projects/pnet/sys/arm/mv/orion/orion.c projects/pnet/sys/arm/sa11x0/assabet_machdep.c projects/pnet/sys/arm/xscale/i8134x/i81342_mcu.c projects/pnet/sys/arm/xscale/ixp425/avila_machdep.c projects/pnet/sys/arm/xscale/ixp425/files.ixp425 projects/pnet/sys/arm/xscale/ixp425/if_npe.c projects/pnet/sys/arm/xscale/ixp425/ixp425.c projects/pnet/sys/arm/xscale/ixp425/ixp425_pci.c projects/pnet/sys/arm/xscale/ixp425/ixp425reg.h projects/pnet/sys/boot/Makefile projects/pnet/sys/boot/Makefile.inc projects/pnet/sys/boot/common/loader.8 projects/pnet/sys/boot/common/module.c projects/pnet/sys/boot/forth/loader.4th projects/pnet/sys/boot/forth/loader.conf projects/pnet/sys/boot/forth/pnp.4th projects/pnet/sys/boot/forth/support.4th projects/pnet/sys/boot/i386/boot2/Makefile projects/pnet/sys/boot/i386/boot2/boot1.S projects/pnet/sys/boot/i386/btx/btx/btx.S projects/pnet/sys/boot/i386/libi386/Makefile projects/pnet/sys/boot/i386/libi386/bioscd.c projects/pnet/sys/boot/i386/libi386/biosdisk.c projects/pnet/sys/boot/i386/libi386/biossmap.c projects/pnet/sys/boot/i386/libi386/bootinfo64.c projects/pnet/sys/boot/i386/libi386/devicename.c projects/pnet/sys/boot/i386/libi386/libi386.h projects/pnet/sys/boot/i386/libi386/smbios.c projects/pnet/sys/boot/i386/loader/Makefile projects/pnet/sys/boot/i386/loader/main.c projects/pnet/sys/boot/i386/pxeldr/pxeboot.8 projects/pnet/sys/boot/ia64/common/Makefile projects/pnet/sys/boot/ia64/efi/Makefile projects/pnet/sys/boot/ia64/ski/Makefile projects/pnet/sys/boot/pc98/libpc98/Makefile projects/pnet/sys/boot/pc98/libpc98/bioscd.c projects/pnet/sys/boot/pc98/libpc98/biosdisk.c projects/pnet/sys/boot/pc98/libpc98/time.c projects/pnet/sys/boot/pc98/loader/Makefile projects/pnet/sys/boot/pc98/loader/main.c projects/pnet/sys/boot/powerpc/ofw/Makefile projects/pnet/sys/boot/sparc64/loader/Makefile projects/pnet/sys/boot/sparc64/loader/main.c projects/pnet/sys/bsm/audit.h projects/pnet/sys/bsm/audit_errno.h projects/pnet/sys/bsm/audit_internal.h projects/pnet/sys/bsm/audit_kevents.h projects/pnet/sys/bsm/audit_record.h projects/pnet/sys/cam/cam_periph.c projects/pnet/sys/cam/cam_xpt.c projects/pnet/sys/cam/cam_xpt_sim.h projects/pnet/sys/cam/scsi/scsi_all.c projects/pnet/sys/cam/scsi/scsi_cd.c projects/pnet/sys/cam/scsi/scsi_ch.c projects/pnet/sys/cam/scsi/scsi_da.c projects/pnet/sys/cam/scsi/scsi_low.c projects/pnet/sys/cam/scsi/scsi_pass.c projects/pnet/sys/cam/scsi/scsi_pt.c projects/pnet/sys/cam/scsi/scsi_sa.c projects/pnet/sys/cam/scsi/scsi_ses.c projects/pnet/sys/cam/scsi/scsi_sg.c projects/pnet/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/pnet/sys/cddl/compat/opensolaris/sys/sysmacros.h projects/pnet/sys/cddl/compat/opensolaris/sys/vnode.h projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/pnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/pnet/sys/compat/freebsd32/freebsd32.h projects/pnet/sys/compat/freebsd32/freebsd32_ioctl.c projects/pnet/sys/compat/freebsd32/freebsd32_ioctl.h projects/pnet/sys/compat/freebsd32/freebsd32_misc.c projects/pnet/sys/compat/freebsd32/freebsd32_proto.h projects/pnet/sys/compat/freebsd32/freebsd32_syscall.h projects/pnet/sys/compat/freebsd32/freebsd32_syscalls.c projects/pnet/sys/compat/freebsd32/freebsd32_sysent.c projects/pnet/sys/compat/freebsd32/syscalls.master projects/pnet/sys/compat/ia32/ia32_signal.h projects/pnet/sys/compat/ia32/ia32_sysvec.c projects/pnet/sys/compat/linprocfs/linprocfs.c projects/pnet/sys/compat/linux/linux_emul.c projects/pnet/sys/compat/linux/linux_emul.h projects/pnet/sys/compat/linux/linux_file.c projects/pnet/sys/compat/linux/linux_futex.c projects/pnet/sys/compat/linux/linux_futex.h projects/pnet/sys/compat/linux/linux_getcwd.c projects/pnet/sys/compat/linux/linux_ioctl.c projects/pnet/sys/compat/linux/linux_misc.c projects/pnet/sys/compat/linux/linux_misc.h projects/pnet/sys/compat/linux/linux_stats.c projects/pnet/sys/compat/ndis/kern_ndis.c projects/pnet/sys/compat/ndis/kern_windrv.c projects/pnet/sys/compat/ndis/ndis_var.h projects/pnet/sys/compat/ndis/ntoskrnl_var.h projects/pnet/sys/compat/ndis/pe_var.h projects/pnet/sys/compat/ndis/resource_var.h projects/pnet/sys/compat/ndis/subr_hal.c projects/pnet/sys/compat/ndis/subr_ndis.c projects/pnet/sys/compat/ndis/subr_ntoskrnl.c projects/pnet/sys/compat/ndis/subr_pe.c projects/pnet/sys/compat/ndis/subr_usbd.c projects/pnet/sys/compat/ndis/usbd_var.h projects/pnet/sys/compat/ndis/winx32_wrap.S projects/pnet/sys/compat/svr4/svr4_misc.c projects/pnet/sys/compat/svr4/svr4_sockio.c projects/pnet/sys/compat/svr4/svr4_sysvec.c projects/pnet/sys/compat/svr4/svr4_types.h projects/pnet/sys/conf/Makefile.arm projects/pnet/sys/conf/NOTES projects/pnet/sys/conf/files projects/pnet/sys/conf/files.amd64 projects/pnet/sys/conf/files.i386 projects/pnet/sys/conf/files.ia64 projects/pnet/sys/conf/files.mips projects/pnet/sys/conf/files.pc98 projects/pnet/sys/conf/files.powerpc projects/pnet/sys/conf/files.sparc64 projects/pnet/sys/conf/files.sun4v projects/pnet/sys/conf/kern.mk projects/pnet/sys/conf/kern.post.mk projects/pnet/sys/conf/kern.pre.mk projects/pnet/sys/conf/kmod.mk projects/pnet/sys/conf/newvers.sh projects/pnet/sys/conf/options projects/pnet/sys/conf/options.amd64 projects/pnet/sys/conf/options.arm projects/pnet/sys/conf/options.i386 projects/pnet/sys/conf/options.ia64 projects/pnet/sys/conf/options.mips projects/pnet/sys/conf/options.pc98 projects/pnet/sys/contrib/altq/altq/altq_subr.c projects/pnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/pnet/sys/contrib/pf/ (props changed) projects/pnet/sys/contrib/pf/net/if_pflog.c projects/pnet/sys/contrib/pf/net/if_pfsync.c projects/pnet/sys/contrib/pf/net/pf.c projects/pnet/sys/contrib/pf/net/pf_if.c projects/pnet/sys/contrib/pf/net/pf_ioctl.c projects/pnet/sys/crypto/via/padlock.c projects/pnet/sys/crypto/via/padlock_hash.c projects/pnet/sys/ddb/db_expr.c projects/pnet/sys/dev/aac/aac.c projects/pnet/sys/dev/aac/aac_debug.c projects/pnet/sys/dev/aac/aac_pci.c projects/pnet/sys/dev/aac/aacreg.h projects/pnet/sys/dev/aac/aacvar.h projects/pnet/sys/dev/acpi_support/acpi_asus.c projects/pnet/sys/dev/acpi_support/acpi_panasonic.c projects/pnet/sys/dev/acpica/acpi.c projects/pnet/sys/dev/acpica/acpi_battery.c projects/pnet/sys/dev/acpica/acpi_cpu.c projects/pnet/sys/dev/acpica/acpi_ec.c projects/pnet/sys/dev/acpica/acpi_pcib_acpi.c projects/pnet/sys/dev/acpica/acpivar.h projects/pnet/sys/dev/adb/adb_kbd.c projects/pnet/sys/dev/adb/adb_mouse.c projects/pnet/sys/dev/ae/if_ae.c projects/pnet/sys/dev/age/if_age.c projects/pnet/sys/dev/age/if_agereg.h projects/pnet/sys/dev/agp/agp.c projects/pnet/sys/dev/agp/agp_amd64.c projects/pnet/sys/dev/agp/agp_i810.c projects/pnet/sys/dev/agp/agp_intel.c projects/pnet/sys/dev/agp/agp_via.c projects/pnet/sys/dev/agp/agppriv.h projects/pnet/sys/dev/aic7xxx/ahc_pci.c projects/pnet/sys/dev/aic7xxx/ahd_pci.c projects/pnet/sys/dev/ale/if_ale.c projects/pnet/sys/dev/an/if_an.c projects/pnet/sys/dev/an/if_anreg.h projects/pnet/sys/dev/arcmsr/arcmsr.c projects/pnet/sys/dev/ata/ata-all.c projects/pnet/sys/dev/ata/ata-all.h projects/pnet/sys/dev/ata/ata-card.c projects/pnet/sys/dev/ata/ata-cbus.c projects/pnet/sys/dev/ata/ata-disk.c projects/pnet/sys/dev/ata/ata-dma.c projects/pnet/sys/dev/ata/ata-isa.c projects/pnet/sys/dev/ata/ata-pci.c projects/pnet/sys/dev/ata/ata-pci.h projects/pnet/sys/dev/ata/ata-queue.c projects/pnet/sys/dev/ata/ata-raid.c projects/pnet/sys/dev/ata/ata-raid.h projects/pnet/sys/dev/ata/ata-sata.c projects/pnet/sys/dev/ata/atapi-cam.c projects/pnet/sys/dev/ata/atapi-cd.c projects/pnet/sys/dev/ata/atapi-fd.c projects/pnet/sys/dev/ata/atapi-tape.c projects/pnet/sys/dev/ata/chipsets/ata-acard.c projects/pnet/sys/dev/ata/chipsets/ata-acerlabs.c projects/pnet/sys/dev/ata/chipsets/ata-ahci.c projects/pnet/sys/dev/ata/chipsets/ata-highpoint.c projects/pnet/sys/dev/ata/chipsets/ata-intel.c projects/pnet/sys/dev/ata/chipsets/ata-jmicron.c projects/pnet/sys/dev/ata/chipsets/ata-marvell.c projects/pnet/sys/dev/ata/chipsets/ata-netcell.c projects/pnet/sys/dev/ata/chipsets/ata-nvidia.c projects/pnet/sys/dev/ata/chipsets/ata-promise.c projects/pnet/sys/dev/ata/chipsets/ata-serverworks.c projects/pnet/sys/dev/ata/chipsets/ata-siliconimage.c projects/pnet/sys/dev/ata/chipsets/ata-sis.c projects/pnet/sys/dev/ata/chipsets/ata-via.c projects/pnet/sys/dev/ath/ah_osdep.c projects/pnet/sys/dev/ath/ath_hal/ah.c projects/pnet/sys/dev/ath/ath_hal/ah.h projects/pnet/sys/dev/ath/ath_hal/ah_internal.h projects/pnet/sys/dev/ath/ath_hal/ah_regdomain.c projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c projects/pnet/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c projects/pnet/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar2316.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar2317.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar2413.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar2425.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5111.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5112.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/pnet/sys/dev/ath/ath_hal/ar5212/ar5413.c projects/pnet/sys/dev/ath/ath_hal/ar5312/ar5312.h projects/pnet/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c projects/pnet/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c projects/pnet/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar2133.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416.ini projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/pnet/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9160.ini projects/pnet/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c projects/pnet/sys/dev/ath/ath_rate/amrr/amrr.c projects/pnet/sys/dev/ath/ath_rate/onoe/onoe.c projects/pnet/sys/dev/ath/ath_rate/sample/sample.c projects/pnet/sys/dev/ath/if_ath.c projects/pnet/sys/dev/ath/if_ath_pci.c projects/pnet/sys/dev/ath/if_athioctl.h projects/pnet/sys/dev/ath/if_athvar.h projects/pnet/sys/dev/atkbdc/atkbd.c projects/pnet/sys/dev/atkbdc/atkbdc_isa.c projects/pnet/sys/dev/atkbdc/psm.c projects/pnet/sys/dev/bce/if_bce.c projects/pnet/sys/dev/bce/if_bcefw.h projects/pnet/sys/dev/bce/if_bcereg.h projects/pnet/sys/dev/bge/if_bge.c projects/pnet/sys/dev/bge/if_bgereg.h projects/pnet/sys/dev/bm/if_bm.c projects/pnet/sys/dev/cardbus/cardbus.c projects/pnet/sys/dev/cardbus/cardbus_cis.c projects/pnet/sys/dev/cardbus/cardbus_device.c projects/pnet/sys/dev/ce/if_ce.c projects/pnet/sys/dev/cfi/cfi_core.c projects/pnet/sys/dev/cfi/cfi_dev.c projects/pnet/sys/dev/cfi/cfi_reg.h projects/pnet/sys/dev/cfi/cfi_var.h projects/pnet/sys/dev/ciss/ciss.c projects/pnet/sys/dev/cm/smc90cx6.c projects/pnet/sys/dev/cp/if_cp.c projects/pnet/sys/dev/ctau/if_ct.c projects/pnet/sys/dev/cx/if_cx.c projects/pnet/sys/dev/cxgb/ (props changed) projects/pnet/sys/dev/cxgb/bin2h.pl projects/pnet/sys/dev/cxgb/common/cxgb_ael1002.c projects/pnet/sys/dev/cxgb/common/cxgb_common.h projects/pnet/sys/dev/cxgb/common/cxgb_t3_cpl.h projects/pnet/sys/dev/cxgb/common/cxgb_t3_hw.c projects/pnet/sys/dev/cxgb/common/cxgb_xgmac.c projects/pnet/sys/dev/cxgb/cxgb_adapter.h projects/pnet/sys/dev/cxgb/cxgb_ioctl.h projects/pnet/sys/dev/cxgb/cxgb_main.c projects/pnet/sys/dev/cxgb/cxgb_multiq.c projects/pnet/sys/dev/cxgb/cxgb_offload.c projects/pnet/sys/dev/cxgb/cxgb_sge.c projects/pnet/sys/dev/cxgb/cxgb_t3fw.c projects/pnet/sys/dev/cxgb/cxgb_t3fw.h projects/pnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/pnet/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/pnet/sys/dev/dc/dcphy.c projects/pnet/sys/dev/dc/if_dc.c projects/pnet/sys/dev/dc/pnphy.c projects/pnet/sys/dev/dcons/dcons_crom.c projects/pnet/sys/dev/dcons/dcons_os.c projects/pnet/sys/dev/de/if_de.c projects/pnet/sys/dev/drm/ati_pcigart.c projects/pnet/sys/dev/drm/drmP.h projects/pnet/sys/dev/drm/drm_bufs.c projects/pnet/sys/dev/drm/drm_drv.c projects/pnet/sys/dev/drm/drm_irq.c projects/pnet/sys/dev/drm/drm_linux_list.h projects/pnet/sys/dev/drm/drm_lock.c projects/pnet/sys/dev/drm/drm_pci.c projects/pnet/sys/dev/drm/drm_pciids.h projects/pnet/sys/dev/drm/drm_scatter.c projects/pnet/sys/dev/drm/drm_sysctl.c projects/pnet/sys/dev/drm/drm_vm.c projects/pnet/sys/dev/drm/i915_dma.c projects/pnet/sys/dev/drm/i915_drv.c projects/pnet/sys/dev/drm/i915_drv.h projects/pnet/sys/dev/drm/i915_irq.c projects/pnet/sys/dev/drm/i915_suspend.c projects/pnet/sys/dev/drm/mach64_drv.c projects/pnet/sys/dev/drm/mach64_drv.h projects/pnet/sys/dev/drm/mach64_irq.c projects/pnet/sys/dev/drm/mga_dma.c projects/pnet/sys/dev/drm/mga_drv.c projects/pnet/sys/dev/drm/mga_irq.c projects/pnet/sys/dev/drm/r128_drv.c projects/pnet/sys/dev/drm/r128_drv.h projects/pnet/sys/dev/drm/r128_irq.c projects/pnet/sys/dev/drm/r300_cmdbuf.c projects/pnet/sys/dev/drm/r300_reg.h projects/pnet/sys/dev/drm/radeon_cp.c projects/pnet/sys/dev/drm/radeon_drm.h projects/pnet/sys/dev/drm/radeon_drv.c projects/pnet/sys/dev/drm/radeon_drv.h projects/pnet/sys/dev/drm/radeon_irq.c projects/pnet/sys/dev/drm/radeon_state.c projects/pnet/sys/dev/drm/savage_drv.c projects/pnet/sys/dev/drm/sis_drv.c projects/pnet/sys/dev/drm/tdfx_drv.c projects/pnet/sys/dev/e1000/e1000_80003es2lan.c projects/pnet/sys/dev/e1000/e1000_82540.c projects/pnet/sys/dev/e1000/e1000_82541.c projects/pnet/sys/dev/e1000/e1000_82571.c projects/pnet/sys/dev/e1000/e1000_82575.c projects/pnet/sys/dev/e1000/e1000_82575.h projects/pnet/sys/dev/e1000/e1000_api.c projects/pnet/sys/dev/e1000/e1000_api.h projects/pnet/sys/dev/e1000/e1000_defines.h projects/pnet/sys/dev/e1000/e1000_hw.h projects/pnet/sys/dev/e1000/e1000_ich8lan.c projects/pnet/sys/dev/e1000/e1000_ich8lan.h projects/pnet/sys/dev/e1000/e1000_mac.c projects/pnet/sys/dev/e1000/e1000_mac.h projects/pnet/sys/dev/e1000/e1000_nvm.c projects/pnet/sys/dev/e1000/e1000_nvm.h projects/pnet/sys/dev/e1000/e1000_phy.c projects/pnet/sys/dev/e1000/e1000_phy.h projects/pnet/sys/dev/e1000/e1000_regs.h projects/pnet/sys/dev/e1000/if_em.c projects/pnet/sys/dev/e1000/if_em.h projects/pnet/sys/dev/e1000/if_igb.c projects/pnet/sys/dev/e1000/if_igb.h projects/pnet/sys/dev/ed/ax88x90reg.h projects/pnet/sys/dev/ed/dl100xxreg.h projects/pnet/sys/dev/ed/if_ed.c projects/pnet/sys/dev/ed/if_ed_cbus.c projects/pnet/sys/dev/ed/if_ed_isa.c projects/pnet/sys/dev/ed/if_ed_pccard.c projects/pnet/sys/dev/ed/if_ed_pci.c projects/pnet/sys/dev/ed/if_ed_wd80x3.c projects/pnet/sys/dev/ed/if_edreg.h projects/pnet/sys/dev/ed/if_edvar.h projects/pnet/sys/dev/ep/if_ep.c projects/pnet/sys/dev/ep/if_ep_pccard.c projects/pnet/sys/dev/ep/if_epreg.h projects/pnet/sys/dev/ep/if_epvar.h projects/pnet/sys/dev/exca/exca.c projects/pnet/sys/dev/fb/creator.c projects/pnet/sys/dev/fb/machfb.c projects/pnet/sys/dev/fe/if_fe_pccard.c projects/pnet/sys/dev/firewire/firewire.c projects/pnet/sys/dev/firewire/firewire.h projects/pnet/sys/dev/firewire/fwohci.c projects/pnet/sys/dev/firewire/fwohci_pci.c projects/pnet/sys/dev/firewire/fwohcireg.h projects/pnet/sys/dev/firewire/fwohcivar.h projects/pnet/sys/dev/firewire/fwphyreg.h projects/pnet/sys/dev/firewire/if_fwe.c projects/pnet/sys/dev/firewire/if_fwip.c projects/pnet/sys/dev/firewire/sbp.c projects/pnet/sys/dev/firewire/sbp.h projects/pnet/sys/dev/fxp/if_fxp.c projects/pnet/sys/dev/hifn/hifn7751.c projects/pnet/sys/dev/hptiop/hptiop.h projects/pnet/sys/dev/hptmv/access601.h projects/pnet/sys/dev/hptmv/amd64-elf.raid.o.uu projects/pnet/sys/dev/hptmv/array.h projects/pnet/sys/dev/hptmv/command.h projects/pnet/sys/dev/hptmv/entry.c projects/pnet/sys/dev/hptmv/global.h projects/pnet/sys/dev/hptmv/gui_lib.c projects/pnet/sys/dev/hptmv/hptintf.h projects/pnet/sys/dev/hptmv/hptproc.c projects/pnet/sys/dev/hptmv/i386-elf.raid.o.uu projects/pnet/sys/dev/hptmv/ioctl.c projects/pnet/sys/dev/hptmv/mvOs.h projects/pnet/sys/dev/hptmv/mvSata.h projects/pnet/sys/dev/hptmv/mvStorageDev.h projects/pnet/sys/dev/hptmv/osbsd.h projects/pnet/sys/dev/hptmv/raid5n.h projects/pnet/sys/dev/hptmv/readme.txt projects/pnet/sys/dev/hptmv/vdevice.h projects/pnet/sys/dev/hwpmc/hwpmc_core.c projects/pnet/sys/dev/hwpmc/hwpmc_intel.c projects/pnet/sys/dev/hwpmc/pmc_events.h projects/pnet/sys/dev/ichsmb/ichsmb.c projects/pnet/sys/dev/ichwd/ichwd.c projects/pnet/sys/dev/if_ndis/if_ndis.c projects/pnet/sys/dev/if_ndis/if_ndis_pccard.c projects/pnet/sys/dev/if_ndis/if_ndis_pci.c projects/pnet/sys/dev/if_ndis/if_ndis_usb.c projects/pnet/sys/dev/if_ndis/if_ndisvar.h projects/pnet/sys/dev/iicbus/ad7418.c projects/pnet/sys/dev/iicbus/ds133x.c projects/pnet/sys/dev/iicbus/ds1672.c projects/pnet/sys/dev/iicbus/icee.c projects/pnet/sys/dev/iicbus/if_ic.c projects/pnet/sys/dev/iicbus/iic.c projects/pnet/sys/dev/iicbus/iic.h projects/pnet/sys/dev/iicbus/iicbb.c projects/pnet/sys/dev/iicbus/iicbus.c projects/pnet/sys/dev/iicbus/iicsmb.c projects/pnet/sys/dev/ipmi/ipmi_acpi.c projects/pnet/sys/dev/ipmi/ipmi_smbios.c projects/pnet/sys/dev/ipw/if_ipw.c projects/pnet/sys/dev/iscsi/initiator/isc_subr.c projects/pnet/sys/dev/iwi/if_iwi.c projects/pnet/sys/dev/iwn/if_iwn.c projects/pnet/sys/dev/ixgbe/LICENSE projects/pnet/sys/dev/ixgbe/README projects/pnet/sys/dev/ixgbe/ixgbe.c projects/pnet/sys/dev/ixgbe/ixgbe.h projects/pnet/sys/dev/ixgbe/ixgbe_82598.c projects/pnet/sys/dev/ixgbe/ixgbe_api.c projects/pnet/sys/dev/ixgbe/ixgbe_api.h projects/pnet/sys/dev/ixgbe/ixgbe_common.c projects/pnet/sys/dev/ixgbe/ixgbe_common.h projects/pnet/sys/dev/ixgbe/ixgbe_osdep.h projects/pnet/sys/dev/ixgbe/ixgbe_phy.c projects/pnet/sys/dev/ixgbe/ixgbe_phy.h projects/pnet/sys/dev/ixgbe/ixgbe_type.h projects/pnet/sys/dev/joy/joy.c projects/pnet/sys/dev/kbd/kbdreg.h projects/pnet/sys/dev/kbdmux/kbdmux.c projects/pnet/sys/dev/lmc/if_lmc.c projects/pnet/sys/dev/lmc/if_lmc.h projects/pnet/sys/dev/malo/if_malo.c projects/pnet/sys/dev/malo/if_malo_pci.c projects/pnet/sys/dev/malo/if_malohal.c projects/pnet/sys/dev/mca/mca_bus.c projects/pnet/sys/dev/md/md.c projects/pnet/sys/dev/mge/if_mge.c projects/pnet/sys/dev/mge/if_mgevar.h projects/pnet/sys/dev/mii/ip1000phy.c projects/pnet/sys/dev/mii/ip1000phyreg.h projects/pnet/sys/dev/mii/miidevs projects/pnet/sys/dev/mlx/mlx.c projects/pnet/sys/dev/mly/mly.c projects/pnet/sys/dev/mmc/mmc.c projects/pnet/sys/dev/mmc/mmcreg.h projects/pnet/sys/dev/mmc/mmcsd.c projects/pnet/sys/dev/mpt/mpt.c projects/pnet/sys/dev/mpt/mpt.h projects/pnet/sys/dev/mpt/mpt_cam.c projects/pnet/sys/dev/mpt/mpt_raid.c projects/pnet/sys/dev/mpt/mpt_user.c projects/pnet/sys/dev/mse/mse.c projects/pnet/sys/dev/msk/if_msk.c projects/pnet/sys/dev/msk/if_mskreg.h projects/pnet/sys/dev/mxge/eth_z8e.h projects/pnet/sys/dev/mxge/ethp_z8e.h projects/pnet/sys/dev/mxge/if_mxge.c projects/pnet/sys/dev/mxge/if_mxge_var.h projects/pnet/sys/dev/mxge/mxge_mcp.h projects/pnet/sys/dev/mxge/rss_eth_z8e.h projects/pnet/sys/dev/mxge/rss_ethp_z8e.h projects/pnet/sys/dev/my/if_my.c projects/pnet/sys/dev/nsp/nsp.c projects/pnet/sys/dev/nve/if_nve.c projects/pnet/sys/dev/ofw/ofw_bus_subr.c projects/pnet/sys/dev/ofw/ofw_standard.c projects/pnet/sys/dev/ofw/openfirm.c projects/pnet/sys/dev/ofw/openfirm.h projects/pnet/sys/dev/pccard/card_if.m projects/pnet/sys/dev/pccard/pccard.c projects/pnet/sys/dev/pccard/pccard_cis.c projects/pnet/sys/dev/pccard/pccarddevs projects/pnet/sys/dev/pccard/pccardvar.h projects/pnet/sys/dev/pccard/pccardvarp.h projects/pnet/sys/dev/pccbb/pccbb.c projects/pnet/sys/dev/pccbb/pccbb_pci.c projects/pnet/sys/dev/pccbb/pccbbvar.h projects/pnet/sys/dev/pci/pci.c projects/pnet/sys/dev/pci/pci_pci.c projects/pnet/sys/dev/pci/pci_private.h projects/pnet/sys/dev/pci/pci_user.c projects/pnet/sys/dev/pci/pcib_private.h projects/pnet/sys/dev/pci/pcireg.h projects/pnet/sys/dev/pci/vga_pci.c projects/pnet/sys/dev/pcn/if_pcn.c projects/pnet/sys/dev/powermac_nvram/powermac_nvram.c projects/pnet/sys/dev/ppbus/if_plip.c projects/pnet/sys/dev/ppbus/immio.c projects/pnet/sys/dev/ppbus/lpbb.c projects/pnet/sys/dev/ppbus/lpt.c projects/pnet/sys/dev/ppbus/pcfclock.c projects/pnet/sys/dev/ppbus/ppb_1284.c projects/pnet/sys/dev/ppbus/ppb_base.c projects/pnet/sys/dev/ppbus/ppb_msq.c projects/pnet/sys/dev/ppbus/ppbconf.c projects/pnet/sys/dev/ppbus/ppbconf.h projects/pnet/sys/dev/ppbus/ppi.c projects/pnet/sys/dev/ppbus/pps.c projects/pnet/sys/dev/ppbus/vpo.c projects/pnet/sys/dev/ppbus/vpoio.c projects/pnet/sys/dev/ppc/ppc.c projects/pnet/sys/dev/ppc/ppc_acpi.c projects/pnet/sys/dev/ppc/ppc_isa.c projects/pnet/sys/dev/ppc/ppc_pci.c projects/pnet/sys/dev/ppc/ppc_puc.c projects/pnet/sys/dev/ppc/ppcreg.h projects/pnet/sys/dev/ppc/ppcvar.h projects/pnet/sys/dev/puc/puc_pci.c projects/pnet/sys/dev/puc/pucdata.c projects/pnet/sys/dev/ral/if_ral_pci.c projects/pnet/sys/dev/ral/rt2560.c projects/pnet/sys/dev/ral/rt2560var.h projects/pnet/sys/dev/ral/rt2661.c projects/pnet/sys/dev/ral/rt2661var.h projects/pnet/sys/dev/re/if_re.c projects/pnet/sys/dev/safe/safe.c projects/pnet/sys/dev/scc/scc_if.m projects/pnet/sys/dev/sdhci/sdhci.c projects/pnet/sys/dev/si/si.c projects/pnet/sys/dev/sio/sio_pci.c projects/pnet/sys/dev/sis/if_sis.c projects/pnet/sys/dev/smbus/smb.c projects/pnet/sys/dev/smbus/smbus.c projects/pnet/sys/dev/smbus/smbus.h projects/pnet/sys/dev/snp/snp.c projects/pnet/sys/dev/sound/pci/cmi.c projects/pnet/sys/dev/sound/pci/ds1.c projects/pnet/sys/dev/sound/pci/emu10k1.c projects/pnet/sys/dev/sound/pci/emu10kx.c projects/pnet/sys/dev/sound/pci/envy24.c projects/pnet/sys/dev/sound/pci/envy24ht.c projects/pnet/sys/dev/sound/pci/hda/hdac.c projects/pnet/sys/dev/sound/pci/spicds.c projects/pnet/sys/dev/sound/pcm/dsp.c projects/pnet/sys/dev/sound/pcm/mixer.c projects/pnet/sys/dev/sound/pcm/sound.c projects/pnet/sys/dev/sound/pcm/sound.h projects/pnet/sys/dev/speaker/spkr.c projects/pnet/sys/dev/stg/tmc18c30.c projects/pnet/sys/dev/streams/streams.c projects/pnet/sys/dev/syscons/scterm-teken.c projects/pnet/sys/dev/syscons/syscons.c projects/pnet/sys/dev/syscons/syscons.h projects/pnet/sys/dev/syscons/teken/sequences projects/pnet/sys/dev/syscons/teken/teken.c projects/pnet/sys/dev/syscons/teken/teken.h projects/pnet/sys/dev/syscons/teken/teken_demo.c projects/pnet/sys/dev/syscons/teken/teken_subr.h projects/pnet/sys/dev/syscons/teken/teken_subr_compat.h projects/pnet/sys/dev/tdfx/tdfx_pci.c projects/pnet/sys/dev/tl/if_tl.c projects/pnet/sys/dev/tsec/if_tsec.c projects/pnet/sys/dev/tsec/if_tsec.h projects/pnet/sys/dev/tsec/if_tsec_ocp.c projects/pnet/sys/dev/tsec/if_tsecreg.h projects/pnet/sys/dev/twa/tw_cl_init.c projects/pnet/sys/dev/twa/tw_osl.h projects/pnet/sys/dev/twa/tw_osl_freebsd.c projects/pnet/sys/dev/twe/twe_freebsd.c projects/pnet/sys/dev/tx/if_tx.c projects/pnet/sys/dev/txp/3c990img.h projects/pnet/sys/dev/txp/if_txp.c projects/pnet/sys/dev/txp/if_txpreg.h projects/pnet/sys/dev/uart/uart_bus_pci.c projects/pnet/sys/dev/uart/uart_cpu_mv.c projects/pnet/sys/dev/uart/uart_cpu_powerpc.c projects/pnet/sys/dev/uart/uart_dev_ns8250.c projects/pnet/sys/dev/vge/if_vge.c projects/pnet/sys/dev/wi/if_wi.c projects/pnet/sys/dev/wpi/if_wpi.c projects/pnet/sys/dev/wpi/if_wpireg.h projects/pnet/sys/dev/xen/balloon/balloon.c projects/pnet/sys/dev/xen/blkback/blkback.c projects/pnet/sys/dev/xen/blkfront/blkfront.c projects/pnet/sys/dev/xen/console/console.c projects/pnet/sys/dev/xen/console/xencons_ring.c projects/pnet/sys/dev/xen/netback/netback.c projects/pnet/sys/dev/xen/netfront/ (props changed) projects/pnet/sys/dev/xen/netfront/netfront.c projects/pnet/sys/dev/xl/if_xl.c projects/pnet/sys/fs/cd9660/cd9660_lookup.c projects/pnet/sys/fs/cd9660/cd9660_node.c projects/pnet/sys/fs/cd9660/cd9660_node.h projects/pnet/sys/fs/cd9660/cd9660_rrip.c projects/pnet/sys/fs/cd9660/cd9660_vfsops.c projects/pnet/sys/fs/cd9660/cd9660_vnops.c projects/pnet/sys/fs/coda/coda_vfsops.c projects/pnet/sys/fs/coda/coda_vnops.c projects/pnet/sys/fs/devfs/devfs_devs.c projects/pnet/sys/fs/devfs/devfs_vnops.c projects/pnet/sys/fs/fifofs/fifo_vnops.c projects/pnet/sys/fs/hpfs/hpfs_vfsops.c projects/pnet/sys/fs/msdosfs/denode.h projects/pnet/sys/fs/msdosfs/msdosfs_conv.c projects/pnet/sys/fs/msdosfs/msdosfs_vfsops.c projects/pnet/sys/fs/msdosfs/msdosfs_vnops.c projects/pnet/sys/fs/msdosfs/msdosfsmount.h projects/pnet/sys/fs/nullfs/null_vnops.c projects/pnet/sys/fs/nwfs/nwfs_subr.c projects/pnet/sys/fs/nwfs/nwfs_vnops.c projects/pnet/sys/fs/procfs/procfs.c projects/pnet/sys/fs/procfs/procfs_dbregs.c projects/pnet/sys/fs/procfs/procfs_fpregs.c projects/pnet/sys/fs/procfs/procfs_regs.c projects/pnet/sys/fs/pseudofs/pseudofs_vncache.c projects/pnet/sys/fs/pseudofs/pseudofs_vnops.c projects/pnet/sys/fs/smbfs/smbfs_vnops.c projects/pnet/sys/fs/tmpfs/tmpfs.h projects/pnet/sys/fs/tmpfs/tmpfs_subr.c projects/pnet/sys/fs/tmpfs/tmpfs_vnops.c projects/pnet/sys/fs/udf/ecma167-udf.h projects/pnet/sys/fs/udf/udf.h projects/pnet/sys/fs/udf/udf_vfsops.c projects/pnet/sys/fs/udf/udf_vnops.c projects/pnet/sys/fs/unionfs/union_subr.c projects/pnet/sys/fs/unionfs/union_vnops.c projects/pnet/sys/geom/eli/g_eli.c projects/pnet/sys/geom/geom.h projects/pnet/sys/geom/geom_dev.c projects/pnet/sys/geom/geom_subr.c projects/pnet/sys/geom/geom_vfs.c projects/pnet/sys/geom/label/g_label.c projects/pnet/sys/geom/label/g_label.h projects/pnet/sys/geom/label/g_label_msdosfs.c projects/pnet/sys/geom/label/g_label_ufs.c projects/pnet/sys/geom/part/g_part.c projects/pnet/sys/geom/part/g_part.h projects/pnet/sys/geom/part/g_part_apm.c projects/pnet/sys/geom/part/g_part_bsd.c projects/pnet/sys/geom/part/g_part_gpt.c projects/pnet/sys/geom/part/g_part_if.m projects/pnet/sys/geom/part/g_part_mbr.c projects/pnet/sys/geom/part/g_part_pc98.c projects/pnet/sys/geom/part/g_part_vtoc8.c projects/pnet/sys/geom/vinum/geom_vinum.c projects/pnet/sys/geom/vinum/geom_vinum.h projects/pnet/sys/geom/vinum/geom_vinum_drive.c projects/pnet/sys/geom/vinum/geom_vinum_init.c projects/pnet/sys/geom/vinum/geom_vinum_list.c projects/pnet/sys/geom/vinum/geom_vinum_move.c projects/pnet/sys/geom/vinum/geom_vinum_plex.c projects/pnet/sys/geom/vinum/geom_vinum_raid5.c projects/pnet/sys/geom/vinum/geom_vinum_raid5.h projects/pnet/sys/geom/vinum/geom_vinum_rename.c projects/pnet/sys/geom/vinum/geom_vinum_rm.c projects/pnet/sys/geom/vinum/geom_vinum_share.c projects/pnet/sys/geom/vinum/geom_vinum_share.h projects/pnet/sys/geom/vinum/geom_vinum_state.c projects/pnet/sys/geom/vinum/geom_vinum_subr.c projects/pnet/sys/geom/vinum/geom_vinum_var.h projects/pnet/sys/geom/vinum/geom_vinum_volume.c projects/pnet/sys/gnu/fs/ext2fs/ext2_bitops.h projects/pnet/sys/gnu/fs/ext2fs/ext2_fs.h projects/pnet/sys/gnu/fs/ext2fs/ext2_fs_sb.h projects/pnet/sys/gnu/fs/ext2fs/ext2_inode.c projects/pnet/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c projects/pnet/sys/gnu/fs/ext2fs/ext2_vfsops.c projects/pnet/sys/gnu/fs/reiserfs/reiserfs_fs.h projects/pnet/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c projects/pnet/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h projects/pnet/sys/i386/acpica/acpi_wakeup.c projects/pnet/sys/i386/acpica/madt.c projects/pnet/sys/i386/conf/DEFAULTS projects/pnet/sys/i386/conf/GENERIC projects/pnet/sys/i386/conf/NOTES projects/pnet/sys/i386/conf/XBOX projects/pnet/sys/i386/cpufreq/est.c projects/pnet/sys/i386/cpufreq/smist.c projects/pnet/sys/i386/i386/busdma_machdep.c projects/pnet/sys/i386/i386/elf_machdep.c projects/pnet/sys/i386/i386/i686_mem.c projects/pnet/sys/i386/i386/identcpu.c projects/pnet/sys/i386/i386/in_cksum.c projects/pnet/sys/i386/i386/initcpu.c projects/pnet/sys/i386/i386/io_apic.c projects/pnet/sys/i386/i386/k6_mem.c projects/pnet/sys/i386/i386/local_apic.c projects/pnet/sys/i386/i386/locore.s projects/pnet/sys/i386/i386/machdep.c projects/pnet/sys/i386/i386/mp_machdep.c projects/pnet/sys/i386/i386/msi.c projects/pnet/sys/i386/i386/pmap.c projects/pnet/sys/i386/i386/swtch.s projects/pnet/sys/i386/i386/trap.c projects/pnet/sys/i386/i386/vm86.c projects/pnet/sys/i386/i386/vm_machdep.c projects/pnet/sys/i386/ibcs2/ibcs2_misc.c projects/pnet/sys/i386/ibcs2/ibcs2_sysi86.c projects/pnet/sys/i386/include/apicvar.h projects/pnet/sys/i386/include/cpufunc.h projects/pnet/sys/i386/include/elf.h projects/pnet/sys/i386/include/endian.h projects/pnet/sys/i386/include/intr_machdep.h projects/pnet/sys/i386/include/metadata.h projects/pnet/sys/i386/include/npx.h projects/pnet/sys/i386/include/param.h projects/pnet/sys/i386/include/pc/bios.h projects/pnet/sys/i386/include/pcb.h projects/pnet/sys/i386/include/pmap.h projects/pnet/sys/i386/include/signal.h projects/pnet/sys/i386/include/ucontext.h projects/pnet/sys/i386/include/vmparam.h projects/pnet/sys/i386/include/xen/xenpmap.h projects/pnet/sys/i386/include/xen/xenvar.h projects/pnet/sys/i386/isa/npx.c projects/pnet/sys/i386/linux/linux.h projects/pnet/sys/i386/linux/linux_locore.s projects/pnet/sys/i386/linux/linux_machdep.c projects/pnet/sys/i386/linux/linux_sysvec.c projects/pnet/sys/i386/pci/pci_cfgreg.c projects/pnet/sys/i386/svr4/svr4_locore.s projects/pnet/sys/i386/xen/clock.c projects/pnet/sys/i386/xen/mp_machdep.c projects/pnet/sys/i386/xen/pmap.c projects/pnet/sys/i386/xen/xen_machdep.c projects/pnet/sys/ia64/conf/GENERIC projects/pnet/sys/ia64/conf/NOTES projects/pnet/sys/ia64/ia64/busdma_machdep.c projects/pnet/sys/ia64/ia64/elf_machdep.c projects/pnet/sys/ia64/ia64/mca.c projects/pnet/sys/ia64/ia64/mp_machdep.c projects/pnet/sys/ia64/ia64/pmap.c projects/pnet/sys/ia64/include/elf.h projects/pnet/sys/ia64/include/mca.h projects/pnet/sys/ia64/include/param.h projects/pnet/sys/isa/syscons_isa.c projects/pnet/sys/kern/imgact_elf.c projects/pnet/sys/kern/kern_acct.c projects/pnet/sys/kern/kern_alq.c projects/pnet/sys/kern/kern_clock.c projects/pnet/sys/kern/kern_condvar.c projects/pnet/sys/kern/kern_conf.c projects/pnet/sys/kern/kern_cons.c projects/pnet/sys/kern/kern_descrip.c projects/pnet/sys/kern/kern_environment.c projects/pnet/sys/kern/kern_exec.c projects/pnet/sys/kern/kern_exit.c projects/pnet/sys/kern/kern_jail.c projects/pnet/sys/kern/kern_ktrace.c projects/pnet/sys/kern/kern_linker.c projects/pnet/sys/kern/kern_lock.c projects/pnet/sys/kern/kern_malloc.c projects/pnet/sys/kern/kern_mib.c projects/pnet/sys/kern/kern_mutex.c projects/pnet/sys/kern/kern_osd.c projects/pnet/sys/kern/kern_poll.c projects/pnet/sys/kern/kern_priv.c projects/pnet/sys/kern/kern_proc.c projects/pnet/sys/kern/kern_prot.c projects/pnet/sys/kern/kern_rwlock.c projects/pnet/sys/kern/kern_shutdown.c projects/pnet/sys/kern/kern_sig.c projects/pnet/sys/kern/kern_sx.c projects/pnet/sys/kern/kern_synch.c projects/pnet/sys/kern/kern_sysctl.c projects/pnet/sys/kern/kern_tc.c projects/pnet/sys/kern/kern_thr.c projects/pnet/sys/kern/kern_thread.c projects/pnet/sys/kern/kern_time.c projects/pnet/sys/kern/kern_timeout.c projects/pnet/sys/kern/kern_umtx.c projects/pnet/sys/kern/kern_uuid.c projects/pnet/sys/kern/kern_vimage.c projects/pnet/sys/kern/link_elf.c projects/pnet/sys/kern/link_elf_obj.c projects/pnet/sys/kern/sched_4bsd.c projects/pnet/sys/kern/sched_ule.c projects/pnet/sys/kern/subr_autoconf.c projects/pnet/sys/kern/subr_bus.c projects/pnet/sys/kern/subr_clist.c projects/pnet/sys/kern/subr_devstat.c projects/pnet/sys/kern/subr_disk.c projects/pnet/sys/kern/subr_firmware.c projects/pnet/sys/kern/subr_kobj.c projects/pnet/sys/kern/subr_lock.c projects/pnet/sys/kern/subr_param.c projects/pnet/sys/kern/subr_pcpu.c projects/pnet/sys/kern/subr_prf.c projects/pnet/sys/kern/subr_prof.c projects/pnet/sys/kern/subr_rman.c projects/pnet/sys/kern/subr_rtc.c projects/pnet/sys/kern/subr_smp.c projects/pnet/sys/kern/subr_taskqueue.c projects/pnet/sys/kern/subr_witness.c projects/pnet/sys/kern/sys_generic.c projects/pnet/sys/kern/sys_pipe.c projects/pnet/sys/kern/sys_process.c projects/pnet/sys/kern/sysv_sem.c projects/pnet/sys/kern/sysv_shm.c projects/pnet/sys/kern/tty.c projects/pnet/sys/kern/tty_info.c projects/pnet/sys/kern/tty_inq.c projects/pnet/sys/kern/tty_outq.c projects/pnet/sys/kern/tty_pts.c projects/pnet/sys/kern/tty_pty.c projects/pnet/sys/kern/tty_ttydisc.c projects/pnet/sys/kern/uipc_cow.c projects/pnet/sys/kern/uipc_debug.c projects/pnet/sys/kern/uipc_domain.c projects/pnet/sys/kern/uipc_mbuf.c projects/pnet/sys/kern/uipc_sem.c projects/pnet/sys/kern/uipc_sockbuf.c projects/pnet/sys/kern/uipc_socket.c projects/pnet/sys/kern/uipc_syscalls.c projects/pnet/sys/kern/uipc_usrreq.c projects/pnet/sys/kern/vfs_acl.c projects/pnet/sys/kern/vfs_aio.c projects/pnet/sys/kern/vfs_bio.c projects/pnet/sys/kern/vfs_cache.c projects/pnet/sys/kern/vfs_default.c projects/pnet/sys/kern/vfs_extattr.c projects/pnet/sys/kern/vfs_init.c projects/pnet/sys/kern/vfs_lookup.c projects/pnet/sys/kern/vfs_mount.c projects/pnet/sys/kern/vfs_subr.c projects/pnet/sys/kern/vfs_syscalls.c projects/pnet/sys/kern/vfs_vnops.c projects/pnet/sys/kern/vnode_if.src projects/pnet/sys/legacy/dev/usb/ (props changed) projects/pnet/sys/libkern/crc32.c projects/pnet/sys/libkern/strtouq.c projects/pnet/sys/mips/idt/idtpci.c projects/pnet/sys/mips/include/bus.h projects/pnet/sys/mips/include/elf.h projects/pnet/sys/mips/include/fpu.h projects/pnet/sys/mips/include/frame.h projects/pnet/sys/mips/include/param.h projects/pnet/sys/mips/include/pmap.h projects/pnet/sys/mips/malta/gt_pci.c projects/pnet/sys/mips/mips/busdma_machdep.c projects/pnet/sys/mips/mips/cpu.c projects/pnet/sys/mips/mips/elf64_machdep.c (contents, props changed) projects/pnet/sys/mips/mips/elf_machdep.c projects/pnet/sys/mips/mips/in_cksum.c projects/pnet/sys/mips/mips/machdep.c projects/pnet/sys/mips/mips/nexus.c projects/pnet/sys/mips/mips/pmap.c projects/pnet/sys/modules/Makefile projects/pnet/sys/modules/acpi/acpi/Makefile projects/pnet/sys/modules/agp/Makefile projects/pnet/sys/modules/ata/atausb/Makefile projects/pnet/sys/modules/ath/Makefile projects/pnet/sys/modules/cpufreq/Makefile projects/pnet/sys/modules/drm/radeon/Makefile projects/pnet/sys/modules/dtrace/Makefile projects/pnet/sys/modules/dtrace/dtrace/Makefile projects/pnet/sys/modules/dtrace/dtraceall/dtraceall.c projects/pnet/sys/modules/geom/geom_part/Makefile projects/pnet/sys/modules/geom/geom_vinum/Makefile projects/pnet/sys/modules/if_ndis/Makefile projects/pnet/sys/modules/ip_mroute_mod/Makefile projects/pnet/sys/modules/ipmi/Makefile projects/pnet/sys/modules/iwnfw/Makefile projects/pnet/sys/modules/ixgbe/Makefile projects/pnet/sys/modules/libalias/libalias/Makefile projects/pnet/sys/modules/linprocfs/Makefile projects/pnet/sys/modules/linux/Makefile projects/pnet/sys/modules/mii/Makefile projects/pnet/sys/modules/ndis/Makefile projects/pnet/sys/modules/netgraph/Makefile projects/pnet/sys/modules/netgraph/bluetooth/ubt/Makefile projects/pnet/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile projects/pnet/sys/modules/nfsclient/Makefile projects/pnet/sys/modules/opensolaris/Makefile projects/pnet/sys/modules/sound/driver/Makefile projects/pnet/sys/modules/sound/driver/uaudio/Makefile projects/pnet/sys/modules/svr4/Makefile projects/pnet/sys/net/bpf.c projects/pnet/sys/net/bpf.h projects/pnet/sys/net/bpf_zerocopy.c projects/pnet/sys/net/bridgestp.c projects/pnet/sys/net/ethernet.h projects/pnet/sys/net/if.c projects/pnet/sys/net/if.h projects/pnet/sys/net/if_arc.h projects/pnet/sys/net/if_arcsubr.c projects/pnet/sys/net/if_atm.h projects/pnet/sys/net/if_atmsubr.c projects/pnet/sys/net/if_bridge.c projects/pnet/sys/net/if_disc.c projects/pnet/sys/net/if_ef.c projects/pnet/sys/net/if_enc.c projects/pnet/sys/net/if_ethersubr.c projects/pnet/sys/net/if_faith.c projects/pnet/sys/net/if_fddisubr.c projects/pnet/sys/net/if_fwsubr.c projects/pnet/sys/net/if_gif.c projects/pnet/sys/net/if_gif.h projects/pnet/sys/net/if_gre.c projects/pnet/sys/net/if_iso88025subr.c projects/pnet/sys/net/if_lagg.c projects/pnet/sys/net/if_lagg.h projects/pnet/sys/net/if_llatbl.c projects/pnet/sys/net/if_llatbl.h projects/pnet/sys/net/if_loop.c projects/pnet/sys/net/if_mib.c projects/pnet/sys/net/if_spppsubr.c projects/pnet/sys/net/if_stf.c projects/pnet/sys/net/if_tap.c projects/pnet/sys/net/if_tun.c projects/pnet/sys/net/if_var.h projects/pnet/sys/net/if_vlan.c projects/pnet/sys/net/iso88025.h projects/pnet/sys/net/netisr.h projects/pnet/sys/net/radix_mpath.c projects/pnet/sys/net/raw_cb.c projects/pnet/sys/net/raw_usrreq.c projects/pnet/sys/net/route.c projects/pnet/sys/net/route.h projects/pnet/sys/net/rtsock.c projects/pnet/sys/net/vnet.h projects/pnet/sys/net80211/_ieee80211.h projects/pnet/sys/net80211/ieee80211.c projects/pnet/sys/net80211/ieee80211.h projects/pnet/sys/net80211/ieee80211_adhoc.c projects/pnet/sys/net80211/ieee80211_crypto.h projects/pnet/sys/net80211/ieee80211_ddb.c projects/pnet/sys/net80211/ieee80211_freebsd.c projects/pnet/sys/net80211/ieee80211_freebsd.h projects/pnet/sys/net80211/ieee80211_hostap.c projects/pnet/sys/net80211/ieee80211_ht.h projects/pnet/sys/net80211/ieee80211_input.c projects/pnet/sys/net80211/ieee80211_input.h projects/pnet/sys/net80211/ieee80211_ioctl.c projects/pnet/sys/net80211/ieee80211_ioctl.h projects/pnet/sys/net80211/ieee80211_node.c projects/pnet/sys/net80211/ieee80211_node.h projects/pnet/sys/net80211/ieee80211_output.c projects/pnet/sys/net80211/ieee80211_phy.c projects/pnet/sys/net80211/ieee80211_proto.c projects/pnet/sys/net80211/ieee80211_proto.h projects/pnet/sys/net80211/ieee80211_regdomain.c projects/pnet/sys/net80211/ieee80211_regdomain.h projects/pnet/sys/net80211/ieee80211_scan.c projects/pnet/sys/net80211/ieee80211_scan.h projects/pnet/sys/net80211/ieee80211_scan_sta.c projects/pnet/sys/net80211/ieee80211_sta.c projects/pnet/sys/net80211/ieee80211_var.h projects/pnet/sys/net80211/ieee80211_wds.c projects/pnet/sys/netatalk/at_control.c projects/pnet/sys/netatalk/ddp_usrreq.c projects/pnet/sys/netgraph/atm/ng_atm.c projects/pnet/sys/netgraph/atm/ng_ccatm.h projects/pnet/sys/netgraph/atm/uni/ng_uni_cust.h projects/pnet/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c projects/pnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/pnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/pnet/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/pnet/sys/netgraph/ng_deflate.c projects/pnet/sys/netgraph/ng_eiface.c projects/pnet/sys/netgraph/ng_ether.c projects/pnet/sys/netgraph/ng_fec.c projects/pnet/sys/netgraph/ng_gif.c projects/pnet/sys/netgraph/ng_iface.c projects/pnet/sys/netgraph/ng_iface.h projects/pnet/sys/netgraph/ng_l2tp.c projects/pnet/sys/netgraph/ng_mppc.c projects/pnet/sys/netgraph/ng_ppp.c projects/pnet/sys/netgraph/ng_pppoe.c projects/pnet/sys/netgraph/ng_pppoe.h projects/pnet/sys/netgraph/ng_pred1.c projects/pnet/sys/netgraph/ng_vjc.c projects/pnet/sys/netinet/icmp6.h projects/pnet/sys/netinet/icmp_var.h projects/pnet/sys/netinet/if_ether.c projects/pnet/sys/netinet/if_ether.h projects/pnet/sys/netinet/igmp.c projects/pnet/sys/netinet/igmp.h projects/pnet/sys/netinet/igmp_var.h projects/pnet/sys/netinet/in.c projects/pnet/sys/netinet/in.h projects/pnet/sys/netinet/in_gif.c projects/pnet/sys/netinet/in_mcast.c projects/pnet/sys/netinet/in_pcb.c projects/pnet/sys/netinet/in_pcb.h projects/pnet/sys/netinet/in_proto.c projects/pnet/sys/netinet/in_rmx.c projects/pnet/sys/netinet/in_systm.h projects/pnet/sys/netinet/in_var.h projects/pnet/sys/netinet/ip.h projects/pnet/sys/netinet/ip6.h projects/pnet/sys/netinet/ip_carp.c projects/pnet/sys/netinet/ip_carp.h projects/pnet/sys/netinet/ip_divert.c projects/pnet/sys/netinet/ip_dummynet.c projects/pnet/sys/netinet/ip_dummynet.h projects/pnet/sys/netinet/ip_fastfwd.c projects/pnet/sys/netinet/ip_fw.h projects/pnet/sys/netinet/ip_fw2.c projects/pnet/sys/netinet/ip_fw_nat.c projects/pnet/sys/netinet/ip_fw_pfil.c projects/pnet/sys/netinet/ip_icmp.c projects/pnet/sys/netinet/ip_icmp.h projects/pnet/sys/netinet/ip_input.c projects/pnet/sys/netinet/ip_ipsec.c projects/pnet/sys/netinet/ip_mroute.c projects/pnet/sys/netinet/ip_mroute.h projects/pnet/sys/netinet/ip_options.c projects/pnet/sys/netinet/ip_options.h projects/pnet/sys/netinet/ip_output.c projects/pnet/sys/netinet/ip_var.h projects/pnet/sys/netinet/libalias/alias.c projects/pnet/sys/netinet/libalias/alias_cuseeme.c projects/pnet/sys/netinet/libalias/alias_db.c projects/pnet/sys/netinet/libalias/alias_dummy.c projects/pnet/sys/netinet/libalias/alias_ftp.c projects/pnet/sys/netinet/libalias/alias_irc.c projects/pnet/sys/netinet/libalias/alias_local.h projects/pnet/sys/netinet/libalias/alias_mod.c projects/pnet/sys/netinet/libalias/alias_mod.h projects/pnet/sys/netinet/libalias/alias_nbt.c projects/pnet/sys/netinet/libalias/alias_pptp.c projects/pnet/sys/netinet/libalias/alias_skinny.c projects/pnet/sys/netinet/libalias/alias_smedia.c projects/pnet/sys/netinet/pim_var.h projects/pnet/sys/netinet/raw_ip.c projects/pnet/sys/netinet/sctp.h projects/pnet/sys/netinet/sctp_auth.c projects/pnet/sys/netinet/sctp_bsd_addr.c projects/pnet/sys/netinet/sctp_constants.h projects/pnet/sys/netinet/sctp_crc32.c projects/pnet/sys/netinet/sctp_crc32.h projects/pnet/sys/netinet/sctp_header.h projects/pnet/sys/netinet/sctp_indata.c projects/pnet/sys/netinet/sctp_input.c projects/pnet/sys/netinet/sctp_os_bsd.h projects/pnet/sys/netinet/sctp_output.c projects/pnet/sys/netinet/sctp_output.h projects/pnet/sys/netinet/sctp_pcb.c projects/pnet/sys/netinet/sctp_pcb.h projects/pnet/sys/netinet/sctp_structs.h projects/pnet/sys/netinet/sctp_sysctl.c projects/pnet/sys/netinet/sctp_sysctl.h projects/pnet/sys/netinet/sctp_timer.c projects/pnet/sys/netinet/sctp_uio.h projects/pnet/sys/netinet/sctp_usrreq.c projects/pnet/sys/netinet/sctp_var.h projects/pnet/sys/netinet/sctputil.c projects/pnet/sys/netinet/sctputil.h projects/pnet/sys/netinet/tcp_debug.h projects/pnet/sys/netinet/tcp_hostcache.c projects/pnet/sys/netinet/tcp_input.c projects/pnet/sys/netinet/tcp_output.c projects/pnet/sys/netinet/tcp_reass.c projects/pnet/sys/netinet/tcp_sack.c projects/pnet/sys/netinet/tcp_subr.c projects/pnet/sys/netinet/tcp_syncache.c projects/pnet/sys/netinet/tcp_timer.c projects/pnet/sys/netinet/tcp_timewait.c projects/pnet/sys/netinet/tcp_usrreq.c projects/pnet/sys/netinet/tcp_var.h projects/pnet/sys/netinet/udp_usrreq.c projects/pnet/sys/netinet/udp_var.h projects/pnet/sys/netinet/vinet.h projects/pnet/sys/netinet6/frag6.c projects/pnet/sys/netinet6/icmp6.c projects/pnet/sys/netinet6/in6.c projects/pnet/sys/netinet6/in6.h projects/pnet/sys/netinet6/in6_gif.c projects/pnet/sys/netinet6/in6_ifattach.c projects/pnet/sys/netinet6/in6_pcb.c projects/pnet/sys/netinet6/in6_proto.c projects/pnet/sys/netinet6/in6_rmx.c projects/pnet/sys/netinet6/in6_src.c projects/pnet/sys/netinet6/in6_var.h projects/pnet/sys/netinet6/ip6_forward.c projects/pnet/sys/netinet6/ip6_input.c projects/pnet/sys/netinet6/ip6_ipsec.c projects/pnet/sys/netinet6/ip6_mroute.c projects/pnet/sys/netinet6/ip6_mroute.h projects/pnet/sys/netinet6/ip6_output.c projects/pnet/sys/netinet6/ip6_var.h projects/pnet/sys/netinet6/ip6protosw.h projects/pnet/sys/netinet6/mld6.c projects/pnet/sys/netinet6/nd6.c projects/pnet/sys/netinet6/nd6.h projects/pnet/sys/netinet6/nd6_nbr.c projects/pnet/sys/netinet6/nd6_rtr.c projects/pnet/sys/netinet6/raw_ip6.c projects/pnet/sys/netinet6/route6.c projects/pnet/sys/netinet6/scope6.c projects/pnet/sys/netinet6/sctp6_usrreq.c projects/pnet/sys/netinet6/udp6_usrreq.c projects/pnet/sys/netinet6/vinet6.h projects/pnet/sys/netipsec/ipsec.c projects/pnet/sys/netipsec/ipsec.h projects/pnet/sys/netipsec/ipsec6.h projects/pnet/sys/netipsec/ipsec_mbuf.c projects/pnet/sys/netipsec/ipsec_output.c projects/pnet/sys/netipsec/key.c projects/pnet/sys/netipsec/key_debug.c projects/pnet/sys/netipsec/keysock.c projects/pnet/sys/netipsec/vipsec.h projects/pnet/sys/netipsec/xform_ah.c projects/pnet/sys/netipsec/xform_esp.c projects/pnet/sys/netipsec/xform_ipcomp.c projects/pnet/sys/netipsec/xform_ipip.c projects/pnet/sys/netipx/ipx_outputfl.c projects/pnet/sys/netnatm/natm.c projects/pnet/sys/nfs4client/nfs4_socket.c projects/pnet/sys/nfs4client/nfs4_subs.c projects/pnet/sys/nfs4client/nfs4_vnops.c projects/pnet/sys/nfsclient/bootp_subr.c projects/pnet/sys/nfsclient/nfs.h projects/pnet/sys/nfsclient/nfs_bio.c projects/pnet/sys/nfsclient/nfs_diskless.c projects/pnet/sys/nfsclient/nfs_krpc.c projects/pnet/sys/nfsclient/nfs_socket.c projects/pnet/sys/nfsclient/nfs_subs.c projects/pnet/sys/nfsclient/nfs_vfsops.c projects/pnet/sys/nfsclient/nfs_vnops.c projects/pnet/sys/nfsclient/nfsnode.h projects/pnet/sys/nfsserver/nfs.h projects/pnet/sys/nfsserver/nfs_serv.c projects/pnet/sys/nfsserver/nfs_srvkrpc.c projects/pnet/sys/nfsserver/nfs_srvsubs.c projects/pnet/sys/nfsserver/nfs_syscalls.c projects/pnet/sys/opencrypto/cryptosoft.c projects/pnet/sys/pc98/cbus/olpt.c projects/pnet/sys/pc98/cbus/scterm-sck.c projects/pnet/sys/pc98/cbus/syscons_cbus.c projects/pnet/sys/pc98/conf/GENERIC projects/pnet/sys/pc98/conf/NOTES projects/pnet/sys/pc98/pc98/machdep.c projects/pnet/sys/pci/if_rl.c projects/pnet/sys/pci/if_rlreg.h projects/pnet/sys/pci/intpm.c projects/pnet/sys/pci/viapm.c projects/pnet/sys/powerpc/aim/machdep.c projects/pnet/sys/powerpc/aim/mmu_oea.c projects/pnet/sys/powerpc/aim/mp_cpudep.c projects/pnet/sys/powerpc/aim/ofw_machdep.c projects/pnet/sys/powerpc/aim/swtch.S projects/pnet/sys/powerpc/aim/trap.c projects/pnet/sys/powerpc/aim/trap_subr.S projects/pnet/sys/powerpc/aim/uma_machdep.c projects/pnet/sys/powerpc/aim/vm_machdep.c projects/pnet/sys/powerpc/booke/locore.S projects/pnet/sys/powerpc/booke/machdep.c projects/pnet/sys/powerpc/booke/pmap.c projects/pnet/sys/powerpc/booke/swtch.S projects/pnet/sys/powerpc/booke/trap.c projects/pnet/sys/powerpc/booke/trap_subr.S projects/pnet/sys/powerpc/booke/vm_machdep.c projects/pnet/sys/powerpc/conf/GENERIC projects/pnet/sys/powerpc/conf/MPC85XX projects/pnet/sys/powerpc/conf/NOTES projects/pnet/sys/powerpc/include/elf.h projects/pnet/sys/powerpc/include/frame.h projects/pnet/sys/powerpc/include/hid.h projects/pnet/sys/powerpc/include/intr.h projects/pnet/sys/powerpc/include/md_var.h projects/pnet/sys/powerpc/include/param.h projects/pnet/sys/powerpc/include/pcb.h projects/pnet/sys/powerpc/include/pcpu.h projects/pnet/sys/powerpc/include/pmap.h projects/pnet/sys/powerpc/include/pte.h projects/pnet/sys/powerpc/include/sf_buf.h projects/pnet/sys/powerpc/include/spr.h projects/pnet/sys/powerpc/include/tlb.h projects/pnet/sys/powerpc/include/trap_aim.h projects/pnet/sys/powerpc/include/vmparam.h projects/pnet/sys/powerpc/mpc85xx/mpc85xx.c projects/pnet/sys/powerpc/mpc85xx/mpc85xx.h projects/pnet/sys/powerpc/mpc85xx/ocpbus.c projects/pnet/sys/powerpc/ofw/ofw_syscons.c projects/pnet/sys/powerpc/powermac/ata_macio.c projects/pnet/sys/powerpc/powermac/grackle.c projects/pnet/sys/powerpc/powermac/gracklevar.h projects/pnet/sys/powerpc/powermac/macgpio.c projects/pnet/sys/powerpc/powermac/macio.c projects/pnet/sys/powerpc/powermac/uninorth.c projects/pnet/sys/powerpc/powermac/uninorthvar.h projects/pnet/sys/powerpc/powerpc/bus_machdep.c projects/pnet/sys/powerpc/powerpc/cpu.c projects/pnet/sys/powerpc/powerpc/elf_machdep.c projects/pnet/sys/powerpc/powerpc/genassym.c projects/pnet/sys/powerpc/powerpc/intr_machdep.c projects/pnet/sys/powerpc/powerpc/mem.c projects/pnet/sys/powerpc/powerpc/mmu_if.m projects/pnet/sys/powerpc/powerpc/pmap_dispatch.c projects/pnet/sys/rpc/clnt_rc.c projects/pnet/sys/rpc/svc.h projects/pnet/sys/security/audit/audit.c projects/pnet/sys/security/audit/audit.h projects/pnet/sys/security/audit/audit_bsm.c projects/pnet/sys/security/audit/audit_bsm_errno.c projects/pnet/sys/security/audit/audit_bsm_klib.c projects/pnet/sys/security/audit/audit_bsm_token.c projects/pnet/sys/security/audit/audit_pipe.c projects/pnet/sys/security/audit/audit_private.h projects/pnet/sys/security/audit/audit_syscalls.c projects/pnet/sys/security/mac/mac_atalk.c projects/pnet/sys/security/mac/mac_audit.c projects/pnet/sys/security/mac/mac_cred.c projects/pnet/sys/security/mac/mac_framework.c projects/pnet/sys/security/mac/mac_framework.h projects/pnet/sys/security/mac/mac_inet.c projects/pnet/sys/security/mac/mac_inet6.c projects/pnet/sys/security/mac/mac_internal.h projects/pnet/sys/security/mac/mac_net.c projects/pnet/sys/security/mac/mac_pipe.c projects/pnet/sys/security/mac/mac_policy.h projects/pnet/sys/security/mac/mac_posix_sem.c projects/pnet/sys/security/mac/mac_posix_shm.c projects/pnet/sys/security/mac/mac_priv.c projects/pnet/sys/security/mac/mac_process.c projects/pnet/sys/security/mac/mac_socket.c projects/pnet/sys/security/mac/mac_syscalls.c projects/pnet/sys/security/mac/mac_system.c projects/pnet/sys/security/mac/mac_sysv_msg.c projects/pnet/sys/security/mac/mac_sysv_sem.c projects/pnet/sys/security/mac/mac_sysv_shm.c projects/pnet/sys/security/mac/mac_vfs.c projects/pnet/sys/security/mac_biba/mac_biba.c projects/pnet/sys/security/mac_bsdextended/mac_bsdextended.c projects/pnet/sys/security/mac_bsdextended/ugidfw_internal.h projects/pnet/sys/security/mac_bsdextended/ugidfw_vnode.c projects/pnet/sys/security/mac_ifoff/mac_ifoff.c projects/pnet/sys/security/mac_lomac/mac_lomac.c projects/pnet/sys/security/mac_mls/mac_mls.c projects/pnet/sys/security/mac_none/mac_none.c projects/pnet/sys/security/mac_partition/mac_partition.c projects/pnet/sys/security/mac_portacl/mac_portacl.c projects/pnet/sys/security/mac_seeotheruids/mac_seeotheruids.c projects/pnet/sys/security/mac_stub/mac_stub.c projects/pnet/sys/security/mac_test/mac_test.c projects/pnet/sys/sparc64/central/central.c projects/pnet/sys/sparc64/conf/GENERIC projects/pnet/sys/sparc64/ebus/ebus.c projects/pnet/sys/sparc64/fhc/fhc.c projects/pnet/sys/sparc64/include/bus_private.h projects/pnet/sys/sparc64/include/elf.h projects/pnet/sys/sparc64/include/param.h projects/pnet/sys/sparc64/include/trap.h projects/pnet/sys/sparc64/include/vmparam.h projects/pnet/sys/sparc64/isa/isa.c projects/pnet/sys/sparc64/isa/ofw_isa.c projects/pnet/sys/sparc64/pci/apb.c projects/pnet/sys/sparc64/pci/ofw_pcib.c projects/pnet/sys/sparc64/pci/ofw_pcibus.c projects/pnet/sys/sparc64/pci/psycho.c projects/pnet/sys/sparc64/pci/psychovar.h projects/pnet/sys/sparc64/pci/schizo.c projects/pnet/sys/sparc64/sbus/dma_sbus.c projects/pnet/sys/sparc64/sbus/sbus.c projects/pnet/sys/sparc64/sbus/sbusvar.h projects/pnet/sys/sparc64/sparc64/db_disasm.c projects/pnet/sys/sparc64/sparc64/eeprom.c projects/pnet/sys/sparc64/sparc64/elf_machdep.c projects/pnet/sys/sparc64/sparc64/iommu.c projects/pnet/sys/sparc64/sparc64/jbusppm.c projects/pnet/sys/sparc64/sparc64/mp_machdep.c projects/pnet/sys/sparc64/sparc64/nexus.c projects/pnet/sys/sparc64/sparc64/rtc.c projects/pnet/sys/sparc64/sparc64/sc_machdep.c projects/pnet/sys/sparc64/sparc64/schppm.c projects/pnet/sys/sparc64/sparc64/trap.c projects/pnet/sys/sparc64/sparc64/upa.c projects/pnet/sys/sun4v/conf/GENERIC projects/pnet/sys/sun4v/include/elf.h projects/pnet/sys/sun4v/include/param.h projects/pnet/sys/sun4v/include/pcpu.h projects/pnet/sys/sun4v/include/trap.h projects/pnet/sys/sun4v/include/vmparam.h projects/pnet/sys/sun4v/sun4v/trap.c projects/pnet/sys/sys/_null.h projects/pnet/sys/sys/_pthreadtypes.h projects/pnet/sys/sys/acl.h projects/pnet/sys/sys/aio.h projects/pnet/sys/sys/buf.h projects/pnet/sys/sys/bus_dma.h projects/pnet/sys/sys/cdefs.h projects/pnet/sys/sys/cfictl.h projects/pnet/sys/sys/clist.h projects/pnet/sys/sys/conf.h projects/pnet/sys/sys/disk.h projects/pnet/sys/sys/diskpc98.h projects/pnet/sys/sys/dtrace_bsd.h projects/pnet/sys/sys/elf_common.h projects/pnet/sys/sys/fcntl.h projects/pnet/sys/sys/imgact.h projects/pnet/sys/sys/imgact_elf.h projects/pnet/sys/sys/jail.h projects/pnet/sys/sys/kernel.h projects/pnet/sys/sys/kerneldump.h projects/pnet/sys/sys/kobj.h projects/pnet/sys/sys/ktr.h projects/pnet/sys/sys/ktrace.h projects/pnet/sys/sys/libkern.h projects/pnet/sys/sys/lock.h projects/pnet/sys/sys/lock_profile.h projects/pnet/sys/sys/lockmgr.h projects/pnet/sys/sys/malloc.h projects/pnet/sys/sys/mbuf.h projects/pnet/sys/sys/memrange.h projects/pnet/sys/sys/mount.h projects/pnet/sys/sys/osd.h projects/pnet/sys/sys/param.h projects/pnet/sys/sys/pciio.h projects/pnet/sys/sys/pcpu.h projects/pnet/sys/sys/pipe.h projects/pnet/sys/sys/pmc.h projects/pnet/sys/sys/priv.h projects/pnet/sys/sys/proc.h projects/pnet/sys/sys/protosw.h projects/pnet/sys/sys/sched.h projects/pnet/sys/sys/sdt.h projects/pnet/sys/sys/sem.h projects/pnet/sys/sys/shm.h projects/pnet/sys/sys/smp.h projects/pnet/sys/sys/soundcard.h projects/pnet/sys/sys/stat.h projects/pnet/sys/sys/syscallsubr.h projects/pnet/sys/sys/sysctl.h projects/pnet/sys/sys/syslog.h projects/pnet/sys/sys/systm.h projects/pnet/sys/sys/termios.h projects/pnet/sys/sys/time.h projects/pnet/sys/sys/tree.h projects/pnet/sys/sys/tty.h projects/pnet/sys/sys/ttyqueue.h projects/pnet/sys/sys/types.h projects/pnet/sys/sys/uio.h projects/pnet/sys/sys/unistd.h projects/pnet/sys/sys/vimage.h projects/pnet/sys/sys/vnode.h projects/pnet/sys/tools/vnode_if.awk projects/pnet/sys/ufs/ffs/ffs_alloc.c projects/pnet/sys/ufs/ffs/ffs_balloc.c projects/pnet/sys/ufs/ffs/ffs_extern.h projects/pnet/sys/ufs/ffs/ffs_inode.c projects/pnet/sys/ufs/ffs/ffs_snapshot.c projects/pnet/sys/ufs/ffs/ffs_softdep.c projects/pnet/sys/ufs/ffs/ffs_vfsops.c projects/pnet/sys/ufs/ffs/ffs_vnops.c projects/pnet/sys/ufs/ufs/inode.h projects/pnet/sys/ufs/ufs/ufs_dirhash.c projects/pnet/sys/ufs/ufs/ufs_extattr.c projects/pnet/sys/ufs/ufs/ufs_extern.h projects/pnet/sys/ufs/ufs/ufs_lookup.c projects/pnet/sys/ufs/ufs/ufs_vnops.c projects/pnet/sys/vm/swap_pager.c projects/pnet/sys/vm/uma.h projects/pnet/sys/vm/uma_core.c projects/pnet/sys/vm/uma_dbg.c projects/pnet/sys/vm/uma_int.h projects/pnet/sys/vm/vm_extern.h projects/pnet/sys/vm/vm_fault.c projects/pnet/sys/vm/vm_init.c projects/pnet/sys/vm/vm_kern.c projects/pnet/sys/vm/vm_map.c projects/pnet/sys/vm/vm_map.h projects/pnet/sys/vm/vm_meter.c projects/pnet/sys/vm/vm_mmap.c projects/pnet/sys/vm/vm_object.c projects/pnet/sys/vm/vm_object.h projects/pnet/sys/vm/vm_page.c projects/pnet/sys/vm/vm_page.h projects/pnet/sys/vm/vm_pageout.c projects/pnet/sys/vm/vm_pager.c projects/pnet/sys/vm/vm_reserv.c projects/pnet/sys/vm/vm_unix.c projects/pnet/sys/vm/vnode_pager.c projects/pnet/sys/vm/vnode_pager.h projects/pnet/sys/xdr/xdr_mem.c projects/pnet/sys/xen/evtchn.h (props changed) projects/pnet/sys/xen/evtchn/evtchn.c projects/pnet/sys/xen/evtchn/evtchn_dev.c projects/pnet/sys/xen/features.c projects/pnet/sys/xen/gnttab.c projects/pnet/sys/xen/gnttab.h projects/pnet/sys/xen/hypervisor.h (contents, props changed) projects/pnet/sys/xen/interface/arch-x86/xen.h projects/pnet/sys/xen/interface/hvm/params.h projects/pnet/sys/xen/xen_intr.h (contents, props changed) projects/pnet/sys/xen/xenbus/xenbus_probe.c projects/pnet/sys/xen/xenbus/xenbus_xs.c Modified: projects/pnet/sys/Makefile ============================================================================== --- projects/pnet/sys/Makefile Wed Apr 22 14:19:21 2009 (r191382) +++ projects/pnet/sys/Makefile Wed Apr 22 14:20:21 2009 (r191383) @@ -12,7 +12,7 @@ CSCOPEDIRS= boot bsm cam cddl compat con geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ - pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} + pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else Copied: projects/pnet/sys/amd64/acpica/Makefile (from r191380, head/sys/amd64/acpica/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pnet/sys/amd64/acpica/Makefile Wed Apr 22 14:20:21 2009 (r191383, copy of r191380, head/sys/amd64/acpica/Makefile) @@ -0,0 +1,33 @@ +# $FreeBSD$ + +# Correct path for kernel builds +# Don't rely on the kernel's .depend file +.ifdef MAKESRCPATH +.PATH: ${MAKESRCPATH} +DEPENDFILE= +.else +MAKESRCPATH= ${.CURDIR} +CLEANFILES= acpi_wakecode.h acpi_wakedata.h acpi_wakecode.bin acpi_wakecode.o +.endif +.if ${CC} == "icc" +CFLAGS+= -restrict +NOSTDINC= -X +.else +NOSTDINC= -nostdinc +.endif +CFLAGS+= ${NOSTDINC} -include opt_global.h -I. -I${MAKESRCPATH}/../.. + +all: acpi_wakecode.h acpi_wakedata.h + +acpi_wakecode.o: acpi_wakecode.S assym.s + +acpi_wakecode.bin: acpi_wakecode.o + objcopy -S -O binary acpi_wakecode.o acpi_wakecode.bin + +acpi_wakecode.h: acpi_wakecode.bin + sh ${MAKESRCPATH}/genwakecode.sh > acpi_wakecode.h + +acpi_wakedata.h: acpi_wakecode.bin + sh ${MAKESRCPATH}/genwakedata.sh > acpi_wakedata.h + +.include Modified: projects/pnet/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- projects/pnet/sys/amd64/acpica/acpi_machdep.c Wed Apr 22 14:19:21 2009 (r191382) +++ projects/pnet/sys/amd64/acpica/acpi_machdep.c Wed Apr 22 14:20:21 2009 (r191383) @@ -31,25 +31,51 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +SYSCTL_DECL(_debug_acpi); + +int acpi_resume_beep; +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); + +int acpi_reset_video; +TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); + static int intr_model = ACPI_INTR_PIC; +static struct apm_clone_data acpi_clone; int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; sc = devclass_get_softc(devclass_find("acpi"), 0); + + /* Create a fake clone for /dev/acpi. */ + STAILQ_INIT(&sc->apm_cdevs); + acpi_clone.cdev = sc->acpi_dev_t; + acpi_clone.acpi_sc = sc; + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); + ACPI_UNLOCK(acpi); + sc->acpi_clone = &acpi_clone; acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, + "Call the VESA reset BIOS vector on the resume path"); + return (0); } Copied: projects/pnet/sys/amd64/acpica/acpi_switch.S (from r191380, head/sys/amd64/acpica/acpi_switch.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pnet/sys/amd64/acpica/acpi_switch.S Wed Apr 22 14:20:21 2009 (r191383, copy of r191380, head/sys/amd64/acpica/acpi_switch.S) @@ -0,0 +1,190 @@ +/*- + * Copyright (c) 2001 Takanori Watanabe + * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2008-2009 Jung-uk Kim + * 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$ + */ + +#include +#include + +#include "acpi_wakedata.h" +#include "assym.s" + +#define WAKEUP_DECL(member) \ + .set WAKEUP_ ## member, wakeup_ ## member - wakeup_ctx + + WAKEUP_DECL(xpcb) + WAKEUP_DECL(gdt) + WAKEUP_DECL(efer) + WAKEUP_DECL(pat) + WAKEUP_DECL(star) + WAKEUP_DECL(lstar) + WAKEUP_DECL(cstar) + WAKEUP_DECL(sfmask) + WAKEUP_DECL(cpu) + +#define WAKEUP_CTX(member) WAKEUP_ ## member (%rdi) +#define WAKEUP_PCB(member) PCB_ ## member(%r11) +#define WAKEUP_XPCB(member) XPCB_ ## member(%r11) + +ENTRY(acpi_restorecpu) + /* Switch to KPML4phys. */ + movq %rsi, %rax + movq %rax, %cr3 + + /* Restore GDT. */ + lgdt WAKEUP_CTX(gdt) + jmp 1f +1: + + /* Fetch PCB. */ + movq WAKEUP_CTX(xpcb), %r11 + + /* Force kernel segment registers. */ + movl $KDSEL, %eax + movw %ax, %ds + movw %ax, %es + movw %ax, %ss + movl $KUF32SEL, %eax + movw %ax, %fs + movl $KUG32SEL, %eax + movw %ax, %gs + + movl $MSR_FSBASE, %ecx + movl WAKEUP_PCB(FSBASE), %eax + movl 4 + WAKEUP_PCB(FSBASE), %edx + wrmsr + movl $MSR_GSBASE, %ecx + movl WAKEUP_PCB(GSBASE), %eax + movl 4 + WAKEUP_PCB(GSBASE), %edx + wrmsr + movl $MSR_KGSBASE, %ecx + movl WAKEUP_XPCB(KGSBASE), %eax + movl 4 + WAKEUP_XPCB(KGSBASE), %edx + wrmsr + + /* Restore EFER. */ + movl $MSR_EFER, %ecx + movl WAKEUP_CTX(efer), %eax + wrmsr + + /* Restore PAT. */ + movl $MSR_PAT, %ecx + movl WAKEUP_CTX(pat), %eax + movl 4 + WAKEUP_CTX(pat), %edx + wrmsr + + /* Restore fast syscall stuff. */ + movl $MSR_STAR, %ecx + movl WAKEUP_CTX(star), %eax + movl 4 + WAKEUP_CTX(star), %edx + wrmsr + movl $MSR_LSTAR, %ecx + movl WAKEUP_CTX(lstar), %eax + movl 4 + WAKEUP_CTX(lstar), %edx + wrmsr + movl $MSR_CSTAR, %ecx + movl WAKEUP_CTX(cstar), %eax + movl 4 + WAKEUP_CTX(cstar), %edx + wrmsr + movl $MSR_SF_MASK, %ecx + movl WAKEUP_CTX(sfmask), %eax + wrmsr + + /* Restore CR0, CR2 and CR4. */ + movq WAKEUP_XPCB(CR0), %rax + movq %rax, %cr0 + movq WAKEUP_XPCB(CR2), %rax + movq %rax, %cr2 + movq WAKEUP_XPCB(CR4), %rax + movq %rax, %cr4 + + /* Restore descriptor tables. */ + lidt WAKEUP_XPCB(IDT) + lldt WAKEUP_XPCB(LDT) + +#define SDT_SYSTSS 9 +#define SDT_SYSBSY 11 + + /* Clear "task busy" bit and reload TR. */ + movq PCPU(TSS), %rax + andb $(~SDT_SYSBSY | SDT_SYSTSS), 5(%rax) + movw WAKEUP_XPCB(TR), %ax + ltr %ax + +#undef SDT_SYSTSS +#undef SDT_SYSBSY + + /* Restore other callee saved registers. */ + movq WAKEUP_PCB(R15), %r15 + movq WAKEUP_PCB(R14), %r14 + movq WAKEUP_PCB(R13), %r13 + movq WAKEUP_PCB(R12), %r12 + movq WAKEUP_PCB(RBP), %rbp + movq WAKEUP_PCB(RSP), %rsp + movq WAKEUP_PCB(RBX), %rbx + + /* Restore debug registers. */ + movq WAKEUP_PCB(DR0), %rax + movq %rax, %dr0 + movq WAKEUP_PCB(DR1), %rax + movq %rax, %dr1 + movq WAKEUP_PCB(DR2), %rax + movq %rax, %dr2 + movq WAKEUP_PCB(DR3), %rax + movq %rax, %dr3 + movq WAKEUP_PCB(DR6), %rax + movq %rax, %dr6 + movq WAKEUP_PCB(DR7), %rax + movq %rax, %dr7 + + /* Restore return address. */ + movq WAKEUP_PCB(RIP), %rax + movq %rax, (%rsp) + + /* Indicate the CPU is resumed. */ + xorl %eax, %eax + movl %eax, WAKEUP_CTX(cpu) + + ret +END(acpi_restorecpu) + +ENTRY(acpi_savecpu) + /* Fetch XPCB and save CPU context. */ + movq %rdi, %r10 + call savectx2 + movq %r10, %r11 + + /* Patch caller's return address and stack pointer. */ + movq (%rsp), %rax + movq %rax, WAKEUP_PCB(RIP) + movq %rsp, %rax + movq %rax, WAKEUP_PCB(RSP) + + movl $1, %eax + ret +END(acpi_savecpu) Copied: projects/pnet/sys/amd64/acpica/acpi_wakecode.S (from r191380, head/sys/amd64/acpica/acpi_wakecode.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pnet/sys/amd64/acpica/acpi_wakecode.S Wed Apr 22 14:20:21 2009 (r191383, copy of r191380, head/sys/amd64/acpica/acpi_wakecode.S) @@ -0,0 +1,286 @@ +/*- + * Copyright (c) 2001 Takanori Watanabe + * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim + * 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$ + */ + +#define LOCORE + +#include +#include + +#include "assym.s" + +/* + * Resume entry point for real mode. + * + * If XFirmwareWakingVector is zero and FirmwareWakingVector is non-zero + * in FACS, the BIOS enters here in real mode after POST with CS set to + * (FirmwareWakingVector >> 4) and IP set to (FirmwareWakingVector & 0xf). + * Depending on the previous sleep state, we may need to initialize more + * of the system (i.e., S3 suspend-to-RAM vs. S4 suspend-to-disk). + * + * Note: If XFirmwareWakingVector is non-zero, it should disable address + * translation/paging and interrupts, load all segment registers with + * a flat 4 GB address space, and set EFLAGS.IF to zero. Currently + * this mode is not supported by this code. + */ + + .data /* So we can modify it */ + + ALIGN_TEXT +wakeup_start: + .code16 + /* + * Set up segment registers for real mode, a small stack for + * any calls we make, and clear any flags. + */ + cli /* make sure no interrupts */ + cld + mov %cs, %ax /* copy %cs to %ds. Remember these */ + mov %ax, %ds /* are offsets rather than selectors */ + mov %ax, %ss + movw $PAGE_SIZE - 8, %sp + xorw %ax, %ax + pushw %ax + popfw + + /* To debug resume hangs, beep the speaker if the user requested. */ + testb $~0, resume_beep - wakeup_start + jz 1f + movb $0, resume_beep - wakeup_start + movb $0xc0, %al + outb %al, $0x42 + movb $0x04, %al + outb %al, $0x42 + inb $0x61, %al + orb $0x3, %al + outb %al, $0x61 +1: + + /* Re-initialize video BIOS if the reset_video tunable is set. */ + testb $~0, reset_video - wakeup_start + jz 1f + movb $0, reset_video - wakeup_start + lcall $0xc000, $3 + + /* Re-start in case the previous BIOS call clobbers them. */ + jmp wakeup_start +1: + + /* + * Find relocation base and patch the gdt descript and ljmp targets + */ + xorl %ebx, %ebx + mov %cs, %bx + sall $4, %ebx /* %ebx is now our relocation base */ + + /* + * Load the descriptor table pointer. We'll need it when running + * in 16-bit protected mode. + */ + lgdtl bootgdtdesc - wakeup_start + + /* Enable protected mode */ + movl $CR0_PE, %eax + mov %eax, %cr0 + + /* + * Now execute a far jump to turn on protected mode. This + * causes the segment registers to turn into selectors and causes + * %cs to be loaded from the gdt. + * + * The following instruction is: + * ljmpl $bootcode32 - bootgdt, $wakeup_32 - wakeup_start + * but gas cannot assemble that. And besides, we patch the targets + * in early startup and its a little clearer what we are patching. + */ +wakeup_sw32: + .byte 0x66 /* size override to 32 bits */ + .byte 0xea /* opcode for far jump */ + .long wakeup_32 - wakeup_start /* offset in segment */ + .word bootcode32 - bootgdt /* index in gdt for 32 bit code */ + + /* + * At this point, we are running in 32 bit legacy protected mode. + */ + .code32 +wakeup_32: + + mov $bootdata32 - bootgdt, %eax + mov %ax, %ds + + /* Turn on the PAE and PSE bits for when paging is enabled */ + mov %cr4, %eax + orl $(CR4_PAE | CR4_PSE), %eax + mov %eax, %cr4 + + /* + * Enable EFER.LME so that we get long mode when all the prereqs are + * in place. In this case, it turns on when CR0_PG is finally enabled. + * Pick up a few other EFER bits that we'll use need we're here. + */ + movl $MSR_EFER, %ecx + rdmsr + orl $EFER_LME | EFER_SCE, %eax + wrmsr + + /* + * Point to the embedded page tables for startup. Note that this + * only gets accessed after we're actually in 64 bit mode, however + * we can only set the bottom 32 bits of %cr3 in this state. This + * means we are required to use a temporary page table that is below + * the 4GB limit. %ebx is still our relocation base. We could just + * subtract 3 * PAGE_SIZE, but that would be too easy. + */ + leal wakeup_pagetables - wakeup_start(%ebx), %eax + movl (%eax), %eax + mov %eax, %cr3 + + /* + * Finally, switch to long bit mode by enabling paging. We have + * to be very careful here because all the segmentation disappears + * out from underneath us. The spec says we can depend on the + * subsequent pipelined branch to execute, but *only if* everthing + * is still identity mapped. If any mappings change, the pipeline + * will flush. + */ + mov %cr0, %eax + orl $CR0_PG, %eax + mov %eax, %cr0 + + /* + * At this point paging is enabled, and we are in "compatability" mode. + * We do another far jump to reload %cs with the 64 bit selector. + * %cr3 points to a 4-level page table page. + * We cannot yet jump all the way to the kernel because we can only + * specify a 32 bit linear address. So, yet another trampoline. + * + * The following instruction is: + * ljmp $bootcode64 - bootgdt, $wakeup_64 - wakeup_start + * but gas cannot assemble that. And besides, we patch the targets + * in early startup and its a little clearer what we are patching. + */ +wakeup_sw64: + .byte 0xea /* opcode for far jump */ + .long wakeup_64 - wakeup_start /* offset in segment */ + .word bootcode64 - bootgdt /* index in gdt for 64 bit code */ + + /* + * Yeehar! We're running in 64-bit mode! We can mostly ignore our + * segment registers, and get on with it. + * Note that we are running at the correct virtual address, but with + * a 1:1 1GB mirrored mapping over entire address space. We had better + * switch to a real %cr3 promptly so that we can get to the direct map + * space. Remember that jmp is relative and that we've been relocated, + * so use an indirect jump. + */ + ALIGN_TEXT + .code64 +wakeup_64: + mov $bootdata64 - bootgdt, %eax + mov %ax, %ds + + /* Restore arguments and return. */ + movq wakeup_ctx - wakeup_start(%rbx), %rdi + movq wakeup_kpml4 - wakeup_start(%rbx), %rsi + movq wakeup_retaddr - wakeup_start(%rbx), %rax + jmp *%rax + + .data + +resume_beep: + .byte 0 +reset_video: + .byte 0 + + ALIGN_DATA +bootgdt: + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + +bootcode64: + .long 0x0000ffff + .long 0x00af9b00 + +bootdata64: + .long 0x0000ffff + .long 0x00af9300 + +bootcode32: + .long 0x0000ffff + .long 0x00cf9b00 + +bootdata32: + .long 0x0000ffff + .long 0x00cf9300 +bootgdtend: + +wakeup_pagetables: + .long 0 + +bootgdtdesc: + .word bootgdtend - bootgdt /* Length */ + .long bootgdt - wakeup_start /* Offset plus %ds << 4 */ + + ALIGN_DATA +wakeup_retaddr: + .quad 0 +wakeup_kpml4: + .quad 0 + +wakeup_ctx: + .quad 0 +wakeup_xpcb: + .quad 0 +wakeup_gdt: + .word 0 + .quad 0 + + ALIGN_DATA +wakeup_efer: + .quad 0 +wakeup_pat: + .quad 0 +wakeup_star: + .quad 0 +wakeup_lstar: + .quad 0 +wakeup_cstar: + .quad 0 +wakeup_sfmask: + .quad 0 +wakeup_cpu: + .long 0 +dummy: Modified: projects/pnet/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- projects/pnet/sys/amd64/acpica/acpi_wakeup.c Wed Apr 22 14:19:21 2009 (r191382) +++ projects/pnet/sys/amd64/acpica/acpi_wakeup.c Wed Apr 22 14:20:21 2009 (r191383) @@ -1,6 +1,8 @@ /*- * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,18 +31,390 @@ __FBSDID("$FreeBSD$"); #include +#include #include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#ifdef SMP +#include +#include +#endif #include #include +#include "acpi_wakecode.h" +#include "acpi_wakedata.h" + +/* Make sure the code is less than a page and leave room for the stack. */ +CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +extern int acpi_resume_beep; +extern int acpi_reset_video; + +#ifdef SMP +extern struct xpcb *stopxpcbs; +#else +static struct xpcb *stopxpcbs; +#endif + +int acpi_restorecpu(struct xpcb *, vm_offset_t); +int acpi_savecpu(struct xpcb *); + +static void acpi_alloc_wakeup_handler(void); +static void acpi_stop_beep(void *); + +#ifdef SMP +static int acpi_wakeup_ap(struct acpi_softc *, int); +static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +#endif + +#define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) +#define WAKECODE_PADDR(sc) ((sc)->acpi_wakephys + (3 * PAGE_SIZE)) +#define WAKECODE_FIXUP(offset, type, val) do { \ + type *addr; \ + addr = (type *)(WAKECODE_VADDR(sc) + offset); \ + *addr = val; \ +} while (0) + +/* Turn off bits 1&2 of the PIT, stopping the beep. */ +static void +acpi_stop_beep(void *arg) +{ + outb(0x61, inb(0x61) & ~0x3); +} + +#ifdef SMP +static int +acpi_wakeup_ap(struct acpi_softc *sc, int cpu) +{ + int vector = (WAKECODE_PADDR(sc) >> 12) & 0xff; + int apic_id = cpu_apic_ids[cpu]; + int ms; + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[cpu].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, cpu); + + /* do an INIT IPI: assert RESET */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); + + /* wait for pending status end */ + lapic_ipi_wait(-1); + + /* do an INIT IPI: deassert RESET */ + lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0); + + /* wait for pending status end */ + DELAY(10000); /* wait ~10mS */ + lapic_ipi_wait(-1); + + /* + * next we do a STARTUP IPI: the previous INIT IPI might still be + * latched, (P5 bug) this 1st STARTUP would then terminate + * immediately, and the previously started INIT IPI would continue. OR + * the previous INIT IPI has already run. and this STARTUP IPI will + * run. OR the previous INIT IPI was ignored. and this STARTUP IPI + * will run. + */ + + /* do a STARTUP IPI */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* + * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF + * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR + * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is + * recognized after hardware RESET or INIT IPI. + */ + + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0) + return (1); /* return SUCCESS */ + DELAY(1000); + } + return (0); /* return FAILURE */ +} + +#define WARMBOOT_TARGET 0 +#define WARMBOOT_OFF (KERNBASE + 0x0467) +#define WARMBOOT_SEG (KERNBASE + 0x0469) + +#define CMOS_REG (0x70) +#define CMOS_DATA (0x71) +#define BIOS_RESET (0x0f) +#define BIOS_WARM (0x0a) + +static void +acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +{ + uint32_t mpbioswarmvec; + cpumask_t map; + int cpu; + u_char mpbiosreason; + + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ + + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + map = 1ul << cpu; + if ((wakeup_cpus & map) != map) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } + } + + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} +#endif + int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - return (0); + struct savefpu *stopfpu; +#ifdef SMP + cpumask_t wakeup_cpus; +#endif + register_t cr3, rf; + ACPI_STATUS status; + int ret; + + ret = -1; + + if (sc->acpi_wakeaddr == 0ul) + return (ret); + +#ifdef SMP + wakeup_cpus = PCPU_GET(other_cpus); +#endif + + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + + rf = intr_disable(); + intr_suspend(); + + /* + * Temporarily switch to the kernel pmap because it provides + * an identity mapping (setup at boot) for the low physical + * memory region containing the wakeup code. + */ + cr3 = rcr3(); + load_cr3(KPML4phys); + + stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; + if (acpi_savecpu(&stopxpcbs[0])) { + fpugetregs(curthread, stopfpu); + +#ifdef SMP + if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, + "Failed to suspend APs: CPU mask = 0x%jx\n", + (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + goto out; + } +#endif + + WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0)); + WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0)); + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, + stopxpcbs[0].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[0].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, 0); + + /* Call ACPICA to enter the desired sleep state */ + if (state == ACPI_STATE_S4 && sc->acpi_s4bios) + status = AcpiEnterSleepStateS4bios(); + else + status = AcpiEnterSleepState(state); + + if (status != AE_OK) { + device_printf(sc->acpi_dev, + "AcpiEnterSleepState failed - %s\n", + AcpiFormatException(status)); + goto out; + } + + for (;;) + ia32_pause(); + } else { + fpusetregs(curthread, stopfpu); +#ifdef SMP + if (wakeup_cpus != 0) + acpi_wakeup_cpus(sc, wakeup_cpus); +#endif + acpi_resync_clock(sc); + ret = 0; + } + +out: +#ifdef SMP + if (wakeup_cpus != 0) + restart_cpus(wakeup_cpus); +#endif + + load_cr3(cr3); + intr_resume(); + intr_restore(rf); + + AcpiSetFirmwareWakingVector(0); + + if (ret == 0 && mem_range_softc.mr_op != NULL && + mem_range_softc.mr_op->reinit != NULL) + mem_range_softc.mr_op->reinit(&mem_range_softc); + + /* If we beeped, turn it off after a delay. */ + if (acpi_resume_beep) + timeout(acpi_stop_beep, NULL, 3 * hz); + + return (ret); } +static vm_offset_t acpi_wakeaddr; + +static void +acpi_alloc_wakeup_handler(void) +{ + void *wakeaddr; + + if (!cold) + return; + + /* + * Specify the region for our wakeup code. We want it in the low 1 MB + * region, excluding video memory and above (0xa0000). We ask for + * it to be page-aligned, just to be safe. + */ + wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff, + PAGE_SIZE, 0ul); + if (wakeaddr == NULL) { + printf("%s: can't alloc wake memory\n", __func__); + return; + } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); + if (stopxpcbs == NULL) { + contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); + printf("%s: can't alloc CPU state memory\n", __func__); + return; + } + acpi_wakeaddr = (vm_offset_t)wakeaddr; +} + +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); + void acpi_install_wakeup_handler(struct acpi_softc *sc) { + uint64_t *pt4, *pt3, *pt2; + int i; + + if (acpi_wakeaddr == 0ul) + return; + + sc->acpi_wakeaddr = acpi_wakeaddr; + sc->acpi_wakephys = vtophys(acpi_wakeaddr); + + bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode)); + + /* Patch GDT base address, ljmp targets and page table base address. */ + WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t, + WAKECODE_PADDR(sc) + bootgdt); + WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t, + WAKECODE_PADDR(sc) + wakeup_32); + WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t, + WAKECODE_PADDR(sc) + wakeup_64); + WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys); + + /* Save pointers to some global data. */ + WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu); + WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys); + WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, + WAKECODE_VADDR(sc) + wakeup_ctx); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); + WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); + WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); + WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); + WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK)); + + /* Build temporary page tables below realmode code. */ + pt4 = (uint64_t *)acpi_wakeaddr; + pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t); + + /* Create the initial 1GB replicated page tables */ + for (i = 0; i < 512; i++) { + /* + * Each slot of the level 4 pages points + * to the same level 3 page + */ + pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE); + pt4[i] |= PG_V | PG_RW | PG_U; + + /* + * Each slot of the level 3 pages points + * to the same level 2 page + */ + pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE)); + pt3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + pt2[i] = i * (2 * 1024 * 1024); + pt2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + + if (bootverbose) + device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n", + (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys); } Copied: projects/pnet/sys/amd64/acpica/genwakecode.sh (from r191380, head/sys/amd64/acpica/genwakecode.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pnet/sys/amd64/acpica/genwakecode.sh Wed Apr 22 14:20:21 2009 (r191383, copy of r191380, head/sys/amd64/acpica/genwakecode.sh) @@ -0,0 +1,6 @@ +#!/bin/sh +# $FreeBSD$ +# +file2c -sx 'static char wakecode[] = {' '};' 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 AAC441065673; Wed, 22 Apr 2009 23:38: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 99AA98FC15; Wed, 22 Apr 2009 23:38:57 +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 n3MNcvCr070565; Wed, 22 Apr 2009 23:38:57 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MNcv3T070564; Wed, 22 Apr 2009 23:38:57 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904222338.n3MNcv3T070564@svn.freebsd.org> From: Rui Paulo Date: Wed, 22 Apr 2009 23:38:57 +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: r191407 - 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: Wed, 22 Apr 2009 23:38:57 -0000 Author: rpaulo Date: Wed Apr 22 23:38:57 2009 New Revision: 191407 URL: http://svn.freebsd.org/changeset/base/191407 Log: Add a default case switch for opmode. Use correct variable name tmpmeshid. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Apr 22 21:50:32 2009 (r191406) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Apr 22 23:38:57 2009 (r191407) @@ -100,6 +100,7 @@ static int mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; enum ieee80211_state ostate; IEEE80211_LOCK_ASSERT(ic); @@ -124,6 +125,8 @@ mesh_newstate(struct ieee80211vap *vap, case IEEE80211_S_SCAN: switch (ostate) { case IEEE80211_S_INIT: + default: + break; } case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: @@ -189,7 +192,7 @@ mesh_ioctl_get80211(struct ieee80211vap if (vap->iv_opmode != IEEE80211_M_MBSS) return EINVAL; ireq->i_len = vap->iv_meshidlen; - memcpy(meshid, vap->iv_meshid, ireq->i_len); + memcpy(tmpmeshid, vap->iv_meshid, ireq->i_len); error = copyout(tmpmeshid, ireq->i_data, ireq->i_len); break; default: From owner-svn-src-projects@FreeBSD.ORG Wed Apr 22 23:56: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 5E4B2106564A; Wed, 22 Apr 2009 23:56: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 4D4A98FC0A; Wed, 22 Apr 2009 23:56:18 +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 n3MNuI8E070976; Wed, 22 Apr 2009 23:56:18 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MNuIcA070974; Wed, 22 Apr 2009 23:56:18 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904222356.n3MNuIcA070974@svn.freebsd.org> From: Rui Paulo Date: Wed, 22 Apr 2009 23:56:18 +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: r191409 - projects/mesh11s/sys/dev/ath 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, 22 Apr 2009 23:56:18 -0000 Author: rpaulo Date: Wed Apr 22 23:56:18 2009 New Revision: 191409 URL: http://svn.freebsd.org/changeset/base/191409 Log: Initialize ic_opmode. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/dev/ath/if_ath.c Modified: projects/mesh11s/sys/dev/ath/if_ath.c ============================================================================== --- projects/mesh11s/sys/dev/ath/if_ath.c Wed Apr 22 23:54:41 2009 (r191408) +++ projects/mesh11s/sys/dev/ath/if_ath.c Wed Apr 22 23:56:18 2009 (r191409) @@ -926,6 +926,7 @@ ath_vap_create(struct ieee80211com *ic, ic_opmode = IEEE80211_M_HOSTAP; break; case IEEE80211_M_MBSS: + ic_opmode = IEEE80211_M_IBSS; /* XXXRP TBD */ break; default: From owner-svn-src-projects@FreeBSD.ORG Thu Apr 23 12:08:15 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 D572A106592D; Thu, 23 Apr 2009 12:08:15 +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 DFDEC8FC17; Thu, 23 Apr 2009 12:08:08 +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 n3NC88do086707; Thu, 23 Apr 2009 12:08:08 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NC88Eg086706; Thu, 23 Apr 2009 12:08:08 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904231208.n3NC88Eg086706@svn.freebsd.org> From: Rui Paulo Date: Thu, 23 Apr 2009 12:08:08 +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: r191421 - 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: Thu, 23 Apr 2009 12:08:32 -0000 Author: rpaulo Date: Thu Apr 23 12:08:08 2009 New Revision: 191421 URL: http://svn.freebsd.org/changeset/base/191421 Log: Print ssid+meshid if verbose is on. 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 Thu Apr 23 12:05:55 2009 (r191420) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Thu Apr 23 12:08:08 2009 (r191421) @@ -4012,14 +4012,18 @@ ieee80211_status(int s) gothtconf = 0; gotregdomain = 0; - if (opmode == IEEE80211_M_MBSS) { - printf("\tmeshid "); + printf("\t"); + if (opmode == IEEE80211_M_MBSS || verbose) { + printf("meshid "); getid(s, 0, data, sizeof(data), &len, 1); print_string(data, len); - } else { + } + if (verbose) + printf(" "); + if (opmode != IEEE80211_M_MBSS || verbose) { if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0) num = 0; - printf("\tssid "); + printf("ssid "); if (num > 1) { for (i = 0; i < num; i++) { if (getid(s, i, data, sizeof(data), &len, 0) >= 0 && len > 0) { From owner-svn-src-projects@FreeBSD.ORG Thu Apr 23 12:09:49 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 DF8A610656F6; Thu, 23 Apr 2009 12:09:49 +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 C0A028FC19; Thu, 23 Apr 2009 12:09:49 +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 n3NC9nrl086773; Thu, 23 Apr 2009 12:09:49 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NC9nna086771; Thu, 23 Apr 2009 12:09:49 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904231209.n3NC9nna086771@svn.freebsd.org> From: Rui Paulo Date: Thu, 23 Apr 2009 12:09:49 +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: r191422 - in projects/mesh11s: sbin/ifconfig 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, 23 Apr 2009 12:10:05 -0000 Author: rpaulo Date: Thu Apr 23 12:09:49 2009 New Revision: 191422 URL: http://svn.freebsd.org/changeset/base/191422 Log: Rename 'meshpoint' to just 'mesh'. Discussed with: sam Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c projects/mesh11s/sys/net/if_media.h Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/mesh11s/sbin/ifconfig/ifieee80211.c Thu Apr 23 12:08:08 2009 (r191421) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Thu Apr 23 12:09:49 2009 (r191422) @@ -4800,7 +4800,7 @@ DECL_CMD_FUNC(set80211clone_wlanmode, ar else if (iseq(arg, "tdma")) { params.icp_opmode = IEEE80211_M_AHDEMO; params.icp_flags |= IEEE80211_CLONE_TDMA; - } else if (iseq(arg, "meshpoint") || iseq(arg, "mp")) + } else if (iseq(arg, "mesh") || iseq(arg, "mp")) /* mesh point */ params.icp_opmode = IEEE80211_M_MBSS; else errx(1, "Don't know to create %s for %s", arg, name); Modified: projects/mesh11s/sys/net/if_media.h ============================================================================== --- projects/mesh11s/sys/net/if_media.h Thu Apr 23 12:08:08 2009 (r191421) +++ projects/mesh11s/sys/net/if_media.h Thu Apr 23 12:09:49 2009 (r191422) @@ -508,7 +508,7 @@ struct ifmedia_description { { IFM_IEEE80211_WDS, "wds" }, \ { IFM_IEEE80211_TURBO, "turbo" }, \ { IFM_IEEE80211_MONITOR, "monitor" }, \ - { IFM_IEEE80211_MBSS, "meshpoint" }, \ + { IFM_IEEE80211_MBSS, "mesh" }, \ { 0, NULL }, \ } From owner-svn-src-projects@FreeBSD.ORG Thu Apr 23 18:46: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 D5180106564A; Thu, 23 Apr 2009 18:46:04 +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 BF0C78FC14; Thu, 23 Apr 2009 18:46:04 +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 n3NIk4ET096570; Thu, 23 Apr 2009 18:46:04 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NIk4fl096556; Thu, 23 Apr 2009 18:46:04 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904231846.n3NIk4fl096556@svn.freebsd.org> From: Rui Paulo Date: Thu, 23 Apr 2009 18:46:04 +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: r191436 - in projects/mesh11s: . contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gdb contrib/gdtoa contrib/libpcap contrib/ncurses contrib/netcat contrib/ntp contrib/ntp/nt... 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, 23 Apr 2009 18:46:05 -0000 Author: rpaulo Date: Thu Apr 23 18:46:03 2009 New Revision: 191436 URL: http://svn.freebsd.org/changeset/base/191436 Log: MFH 191059:191433 Sponsored by: The FreeBSD Foundation Added: projects/mesh11s/contrib/openbsm/libbsm/au_fcntl_cmd.3 - copied unchanged from r191433, head/contrib/openbsm/libbsm/au_fcntl_cmd.3 projects/mesh11s/contrib/openbsm/libbsm/bsm_fcntl.c - copied unchanged from r191433, head/contrib/openbsm/libbsm/bsm_fcntl.c projects/mesh11s/contrib/openbsm/sys/bsm/audit_fcntl.h - copied unchanged from r191433, head/contrib/openbsm/sys/bsm/audit_fcntl.h projects/mesh11s/lib/libarchive/archive_read_support_compression_xz.c - copied unchanged from r191433, head/lib/libarchive/archive_read_support_compression_xz.c projects/mesh11s/lib/libarchive/archive_write_set_compression_xz.c - copied unchanged from r191433, head/lib/libarchive/archive_write_set_compression_xz.c projects/mesh11s/lib/libarchive/test/test_compat_xz.c - copied unchanged from r191433, head/lib/libarchive/test/test_compat_xz.c projects/mesh11s/lib/libarchive/test/test_compat_xz_1.txz.uu - copied unchanged from r191433, head/lib/libarchive/test/test_compat_xz_1.txz.uu projects/mesh11s/lib/libarchive/test/test_open_fd.c - copied unchanged from r191433, head/lib/libarchive/test/test_open_fd.c projects/mesh11s/lib/libarchive/test/test_open_file.c - copied unchanged from r191433, head/lib/libarchive/test/test_open_file.c projects/mesh11s/lib/libarchive/test/test_open_filename.c - copied unchanged from r191433, head/lib/libarchive/test/test_open_filename.c projects/mesh11s/lib/libarchive/test/test_read_disk_entry_from_file.c - copied unchanged from r191433, head/lib/libarchive/test/test_read_disk_entry_from_file.c projects/mesh11s/lib/libarchive/test/test_read_format_cpio_bin_xz.c - copied unchanged from r191433, head/lib/libarchive/test/test_read_format_cpio_bin_xz.c projects/mesh11s/lib/libarchive/test/test_read_format_gtar_lzma.c - copied unchanged from r191433, head/lib/libarchive/test/test_read_format_gtar_lzma.c projects/mesh11s/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu - copied unchanged from r191433, head/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu projects/mesh11s/lib/libarchive/test/test_read_format_txz.c - copied unchanged from r191433, head/lib/libarchive/test/test_read_format_txz.c projects/mesh11s/lib/libarchive/test/test_write_compress_bzip2.c - copied unchanged from r191433, head/lib/libarchive/test/test_write_compress_bzip2.c projects/mesh11s/lib/libarchive/test/test_write_compress_gzip.c - copied unchanged from r191433, head/lib/libarchive/test/test_write_compress_gzip.c projects/mesh11s/lib/libarchive/test/test_write_compress_lzma.c - copied unchanged from r191433, head/lib/libarchive/test/test_write_compress_lzma.c projects/mesh11s/lib/libarchive/test/test_write_compress_xz.c - copied unchanged from r191433, head/lib/libarchive/test/test_write_compress_xz.c projects/mesh11s/lib/libarchive/test/test_write_format_mtree.c - copied unchanged from r191433, head/lib/libarchive/test/test_write_format_mtree.c projects/mesh11s/share/man/man4/man4.powerpc/tsec.4 - copied unchanged from r191433, head/share/man/man4/man4.powerpc/tsec.4 projects/mesh11s/sys/arm/at91/at91_cfata.c - copied unchanged from r191433, head/sys/arm/at91/at91_cfata.c projects/mesh11s/sys/bsm/audit_fcntl.h - copied unchanged from r191433, head/sys/bsm/audit_fcntl.h projects/mesh11s/sys/net/flowtable.c - copied unchanged from r191433, head/sys/net/flowtable.c projects/mesh11s/sys/net/flowtable.h - copied unchanged from r191433, head/sys/net/flowtable.h projects/mesh11s/sys/net/if_dead.c - copied unchanged from r191433, head/sys/net/if_dead.c projects/mesh11s/sys/security/audit/audit_bsm_fcntl.c - copied unchanged from r191433, head/sys/security/audit/audit_bsm_fcntl.c projects/mesh11s/tools/tools/nanobsd/fill_pkg.sh - copied unchanged from r191433, head/tools/tools/nanobsd/fill_pkg.sh Deleted: projects/mesh11s/share/man/man4/man4.i386/ar.4 projects/mesh11s/share/man/man4/man4.i386/ray.4 projects/mesh11s/share/man/man4/man4.i386/sr.4 projects/mesh11s/sys/dev/ar/ projects/mesh11s/sys/dev/ray/ projects/mesh11s/sys/dev/sr/ projects/mesh11s/sys/legacy/dev/usb/if_aue.c projects/mesh11s/sys/legacy/dev/usb/if_auereg.h projects/mesh11s/sys/legacy/dev/usb/if_axe.c projects/mesh11s/sys/legacy/dev/usb/if_axereg.h projects/mesh11s/sys/legacy/dev/usb/if_cdce.c projects/mesh11s/sys/legacy/dev/usb/if_cdcereg.h projects/mesh11s/sys/legacy/dev/usb/if_cue.c projects/mesh11s/sys/legacy/dev/usb/if_cuereg.h projects/mesh11s/sys/legacy/dev/usb/if_kue.c projects/mesh11s/sys/legacy/dev/usb/if_kuereg.h projects/mesh11s/sys/legacy/dev/usb/if_rue.c projects/mesh11s/sys/legacy/dev/usb/if_ruereg.h projects/mesh11s/sys/legacy/dev/usb/if_rum.c projects/mesh11s/sys/legacy/dev/usb/if_rumreg.h projects/mesh11s/sys/legacy/dev/usb/if_rumvar.h projects/mesh11s/sys/legacy/dev/usb/if_udav.c projects/mesh11s/sys/legacy/dev/usb/if_udavreg.h projects/mesh11s/sys/legacy/dev/usb/if_ural.c projects/mesh11s/sys/legacy/dev/usb/if_uralreg.h projects/mesh11s/sys/legacy/dev/usb/if_uralvar.h projects/mesh11s/sys/legacy/dev/usb/if_zyd.c projects/mesh11s/sys/legacy/dev/usb/if_zydfw.h projects/mesh11s/sys/legacy/dev/usb/if_zydreg.h projects/mesh11s/sys/legacy/dev/usb/kue_fw.h projects/mesh11s/sys/modules/ar/ projects/mesh11s/sys/modules/netgraph/sync_ar/ projects/mesh11s/sys/modules/netgraph/sync_sr/ projects/mesh11s/sys/modules/ray/ projects/mesh11s/sys/modules/sr/ projects/mesh11s/usr.sbin/raycontrol/ Modified: projects/mesh11s/ (props changed) projects/mesh11s/ObsoleteFiles.inc projects/mesh11s/UPDATING projects/mesh11s/contrib/bind9/ (props changed) projects/mesh11s/contrib/cpio/ (props changed) projects/mesh11s/contrib/csup/ (props changed) projects/mesh11s/contrib/file/ (props changed) projects/mesh11s/contrib/gdb/ (props changed) projects/mesh11s/contrib/gdtoa/ (props changed) projects/mesh11s/contrib/libpcap/ (props changed) projects/mesh11s/contrib/ncurses/ (props changed) projects/mesh11s/contrib/netcat/ (props changed) projects/mesh11s/contrib/ntp/ (props changed) projects/mesh11s/contrib/ntp/ntpq/ntpq.c projects/mesh11s/contrib/openbsm/ (props changed) projects/mesh11s/contrib/openbsm/CREDITS projects/mesh11s/contrib/openbsm/INSTALL projects/mesh11s/contrib/openbsm/Makefile.in projects/mesh11s/contrib/openbsm/NEWS projects/mesh11s/contrib/openbsm/README projects/mesh11s/contrib/openbsm/TODO projects/mesh11s/contrib/openbsm/VERSION projects/mesh11s/contrib/openbsm/aclocal.m4 projects/mesh11s/contrib/openbsm/bin/Makefile.in projects/mesh11s/contrib/openbsm/bin/audit/Makefile.in projects/mesh11s/contrib/openbsm/bin/audit/audit.c projects/mesh11s/contrib/openbsm/bin/auditd/Makefile.in projects/mesh11s/contrib/openbsm/bin/auditd/auditd.c projects/mesh11s/contrib/openbsm/bin/auditd/auditd_darwin.c projects/mesh11s/contrib/openbsm/bin/auditd/auditd_fbsd.c projects/mesh11s/contrib/openbsm/bin/auditfilterd/Makefile.in projects/mesh11s/contrib/openbsm/bin/auditfilterd/auditfilterd.8 projects/mesh11s/contrib/openbsm/bin/auditreduce/Makefile.in projects/mesh11s/contrib/openbsm/bin/praudit/Makefile.in projects/mesh11s/contrib/openbsm/bsm/Makefile.in projects/mesh11s/contrib/openbsm/bsm/audit_uevents.h projects/mesh11s/contrib/openbsm/bsm/libbsm.h projects/mesh11s/contrib/openbsm/config/config.h.in projects/mesh11s/contrib/openbsm/config/ltmain.sh projects/mesh11s/contrib/openbsm/configure projects/mesh11s/contrib/openbsm/configure.ac projects/mesh11s/contrib/openbsm/etc/audit_class projects/mesh11s/contrib/openbsm/etc/audit_control projects/mesh11s/contrib/openbsm/etc/audit_event projects/mesh11s/contrib/openbsm/libauditd/Makefile.in projects/mesh11s/contrib/openbsm/libauditd/auditd_lib.c projects/mesh11s/contrib/openbsm/libbsm/Makefile.am projects/mesh11s/contrib/openbsm/libbsm/Makefile.in projects/mesh11s/contrib/openbsm/libbsm/au_control.3 projects/mesh11s/contrib/openbsm/libbsm/audit_submit.3 projects/mesh11s/contrib/openbsm/libbsm/bsm_audit.c projects/mesh11s/contrib/openbsm/libbsm/bsm_control.c projects/mesh11s/contrib/openbsm/libbsm/bsm_domain.c projects/mesh11s/contrib/openbsm/libbsm/bsm_io.c projects/mesh11s/contrib/openbsm/libbsm/bsm_notify.c projects/mesh11s/contrib/openbsm/libbsm/bsm_token.c projects/mesh11s/contrib/openbsm/libbsm/bsm_wrappers.c projects/mesh11s/contrib/openbsm/libbsm/libbsm.3 projects/mesh11s/contrib/openbsm/man/Makefile.in projects/mesh11s/contrib/openbsm/man/auditon.2 projects/mesh11s/contrib/openbsm/modules/Makefile.in projects/mesh11s/contrib/openbsm/modules/auditfilter_noop/Makefile.in projects/mesh11s/contrib/openbsm/sys/Makefile.in projects/mesh11s/contrib/openbsm/sys/bsm/Makefile.am projects/mesh11s/contrib/openbsm/sys/bsm/Makefile.in projects/mesh11s/contrib/openbsm/sys/bsm/audit.h projects/mesh11s/contrib/openbsm/sys/bsm/audit_domain.h projects/mesh11s/contrib/openbsm/sys/bsm/audit_kevents.h projects/mesh11s/contrib/openbsm/sys/bsm/audit_record.h projects/mesh11s/contrib/openbsm/test/Makefile.in projects/mesh11s/contrib/openbsm/test/bsm/Makefile.in projects/mesh11s/contrib/openbsm/tools/Makefile.in projects/mesh11s/contrib/openpam/ (props changed) projects/mesh11s/contrib/pf/ (props changed) projects/mesh11s/contrib/sendmail/ (props changed) projects/mesh11s/contrib/tcpdump/ (props changed) projects/mesh11s/contrib/top/ (props changed) projects/mesh11s/contrib/top/install-sh (props changed) projects/mesh11s/contrib/wpa/ (props changed) projects/mesh11s/crypto/openssh/ (props changed) projects/mesh11s/crypto/openssl/ (props changed) projects/mesh11s/crypto/openssl/crypto/asn1/asn1.h projects/mesh11s/crypto/openssl/crypto/asn1/asn1_err.c projects/mesh11s/crypto/openssl/crypto/asn1/tasn_dec.c projects/mesh11s/include/signal.h projects/mesh11s/lib/libarchive/Makefile projects/mesh11s/lib/libarchive/archive.h projects/mesh11s/lib/libarchive/archive_entry.c projects/mesh11s/lib/libarchive/archive_platform.h projects/mesh11s/lib/libarchive/archive_read.3 projects/mesh11s/lib/libarchive/archive_read.c projects/mesh11s/lib/libarchive/archive_read_disk_entry_from_file.c projects/mesh11s/lib/libarchive/archive_read_disk_set_standard_lookup.c projects/mesh11s/lib/libarchive/archive_read_open_fd.c projects/mesh11s/lib/libarchive/archive_read_open_file.c projects/mesh11s/lib/libarchive/archive_read_open_filename.c projects/mesh11s/lib/libarchive/archive_read_support_compression_all.c projects/mesh11s/lib/libarchive/archive_read_support_compression_bzip2.c projects/mesh11s/lib/libarchive/archive_read_support_compression_compress.c projects/mesh11s/lib/libarchive/archive_read_support_compression_gzip.c projects/mesh11s/lib/libarchive/archive_read_support_format_empty.c projects/mesh11s/lib/libarchive/archive_read_support_format_mtree.c projects/mesh11s/lib/libarchive/archive_write.3 projects/mesh11s/lib/libarchive/archive_write.c 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_open_filename.c projects/mesh11s/lib/libarchive/archive_write_set_compression_bzip2.c projects/mesh11s/lib/libarchive/archive_write_set_compression_gzip.c projects/mesh11s/lib/libarchive/archive_write_set_format_mtree.c projects/mesh11s/lib/libarchive/config_freebsd.h projects/mesh11s/lib/libarchive/libarchive-formats.5 projects/mesh11s/lib/libarchive/test/Makefile projects/mesh11s/lib/libarchive/test/main.c projects/mesh11s/lib/libarchive/test/read_open_memory.c projects/mesh11s/lib/libarchive/test/test_compat_bzip2.c projects/mesh11s/lib/libarchive/test/test_compat_gzip.c projects/mesh11s/lib/libarchive/test/test_entry.c projects/mesh11s/lib/libarchive/test/test_entry_strmode.c projects/mesh11s/lib/libarchive/test/test_extattr_freebsd.c projects/mesh11s/lib/libarchive/test/test_pax_filename_encoding.c projects/mesh11s/lib/libarchive/test/test_pax_filename_encoding.tar.uu 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_format_cpio_bin_bz2.c projects/mesh11s/lib/libarchive/test/test_read_format_cpio_bin_gz.c projects/mesh11s/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c projects/mesh11s/lib/libarchive/test/test_read_format_gtar_gz.c projects/mesh11s/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu projects/mesh11s/lib/libarchive/test/test_read_format_iso_gz.c projects/mesh11s/lib/libarchive/test/test_read_format_isojoliet_bz2.c projects/mesh11s/lib/libarchive/test/test_read_format_isorr_bz2.c projects/mesh11s/lib/libarchive/test/test_read_format_mtree.c projects/mesh11s/lib/libarchive/test/test_read_format_pax_bz2.c projects/mesh11s/lib/libarchive/test/test_read_format_tbz.c projects/mesh11s/lib/libarchive/test/test_read_format_tgz.c projects/mesh11s/lib/libarchive/test/test_write_compress_program.c projects/mesh11s/lib/libarchive/test/test_write_disk_failures.c projects/mesh11s/lib/libarchive/test/test_write_disk_sparse.c projects/mesh11s/lib/libbluetooth/Makefile projects/mesh11s/lib/libbluetooth/bluetooth.3 projects/mesh11s/lib/libbluetooth/bluetooth.h projects/mesh11s/lib/libbluetooth/hci.c projects/mesh11s/lib/libbsm/Makefile projects/mesh11s/lib/libc/ (props changed) projects/mesh11s/lib/libc/stdio/asprintf.c (props changed) projects/mesh11s/lib/libc/stdtime/ (props changed) projects/mesh11s/lib/libc/string/ffsll.c (props changed) projects/mesh11s/lib/libc/string/flsll.c (props changed) projects/mesh11s/lib/libc/string/memchr.3 projects/mesh11s/lib/libc/string/wcpcpy.c (props changed) projects/mesh11s/lib/libc/string/wcpncpy.c (props changed) projects/mesh11s/lib/libc/sys/setfib.2 projects/mesh11s/lib/libthr/thread/thr_rtld.c projects/mesh11s/lib/libusb/ (props changed) projects/mesh11s/lib/libusb/libusb.3 (props changed) projects/mesh11s/lib/libusb/usb.h (props changed) projects/mesh11s/lib/libutil/ (props changed) projects/mesh11s/libexec/rtld-elf/amd64/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/arm/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/i386/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/ia64/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/mips/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/powerpc/rtld_machdep.h projects/mesh11s/libexec/rtld-elf/rtld_lock.c projects/mesh11s/libexec/rtld-elf/sparc64/rtld_machdep.h projects/mesh11s/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/mesh11s/release/doc/share/misc/dev.archlist.txt projects/mesh11s/rescue/rescue/Makefile projects/mesh11s/sbin/ (props changed) projects/mesh11s/sbin/ifconfig/af_inet.c projects/mesh11s/sbin/ifconfig/ifconfig.c projects/mesh11s/sbin/ipfw/ (props changed) projects/mesh11s/sbin/pflogd/Makefile projects/mesh11s/sbin/route/keywords projects/mesh11s/sbin/route/route.c projects/mesh11s/sbin/savecore/savecore.8 projects/mesh11s/share/man/man4/cpuctl.4 projects/mesh11s/share/man/man4/ed.4 projects/mesh11s/share/man/man4/man4.i386/Makefile projects/mesh11s/share/man/man4/man4.i386/glxsb.4 projects/mesh11s/share/man/man4/man4.powerpc/Makefile projects/mesh11s/share/man/man4/man4.powerpc/bm.4 projects/mesh11s/share/man/man4/route.4 projects/mesh11s/share/man/man4/u3g.4 projects/mesh11s/share/man/man4/vlan.4 projects/mesh11s/share/man/man9/altq.9 projects/mesh11s/share/zoneinfo/ (props changed) projects/mesh11s/sys/ (props changed) projects/mesh11s/sys/amd64/amd64/busdma_machdep.c projects/mesh11s/sys/amd64/amd64/mp_machdep.c projects/mesh11s/sys/amd64/conf/DEFAULTS projects/mesh11s/sys/amd64/include/metadata.h projects/mesh11s/sys/amd64/include/param.h projects/mesh11s/sys/amd64/include/pc/bios.h projects/mesh11s/sys/amd64/include/xen/ (props changed) projects/mesh11s/sys/arm/arm/busdma_machdep.c projects/mesh11s/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/mesh11s/sys/arm/arm/cpufunc_asm_sheeva.S projects/mesh11s/sys/arm/at91/at91.c projects/mesh11s/sys/arm/at91/at91_machdep.c projects/mesh11s/sys/arm/at91/at91rm92reg.h projects/mesh11s/sys/arm/at91/files.at91 projects/mesh11s/sys/arm/conf/AVILA.hints projects/mesh11s/sys/arm/conf/BWCT projects/mesh11s/sys/arm/conf/BWCT.hints projects/mesh11s/sys/arm/conf/CAMBRIA.hints projects/mesh11s/sys/arm/include/param.h projects/mesh11s/sys/arm/mv/common.c projects/mesh11s/sys/arm/mv/gpio.c projects/mesh11s/sys/arm/mv/ic.c projects/mesh11s/sys/arm/mv/mv_pci.c projects/mesh11s/sys/arm/mv/mvreg.h projects/mesh11s/sys/boot/i386/libi386/biosdisk.c projects/mesh11s/sys/boot/i386/libi386/biossmap.c projects/mesh11s/sys/boot/sparc64/loader/main.c projects/mesh11s/sys/bsm/audit.h projects/mesh11s/sys/bsm/audit_domain.h projects/mesh11s/sys/bsm/audit_kevents.h projects/mesh11s/sys/bsm/audit_record.h projects/mesh11s/sys/cam/scsi/scsi_sa.c projects/mesh11s/sys/cam/scsi/scsi_ses.c projects/mesh11s/sys/cddl/dev/dtnfsclient/ (props changed) projects/mesh11s/sys/compat/linux/linux_emul.c projects/mesh11s/sys/compat/linux/linux_emul.h projects/mesh11s/sys/compat/linux/linux_futex.c projects/mesh11s/sys/conf/NOTES projects/mesh11s/sys/conf/files projects/mesh11s/sys/conf/options projects/mesh11s/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/mesh11s/sys/contrib/pf/ (props changed) projects/mesh11s/sys/contrib/pf/net/if_pflog.c projects/mesh11s/sys/contrib/pf/net/if_pfsync.c projects/mesh11s/sys/contrib/pf/net/pf.c projects/mesh11s/sys/dev/ata/ata-usb.c (props changed) projects/mesh11s/sys/dev/atkbdc/atkbd.c projects/mesh11s/sys/dev/cxgb/ (props changed) projects/mesh11s/sys/dev/drm/drm_drv.c projects/mesh11s/sys/dev/e1000/if_em.c projects/mesh11s/sys/dev/e1000/if_igb.c 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_edvar.h projects/mesh11s/sys/dev/fb/creator.c projects/mesh11s/sys/dev/fb/machfb.c projects/mesh11s/sys/dev/if_ndis/if_ndis.c projects/mesh11s/sys/dev/iicbus/ds133x.c projects/mesh11s/sys/dev/iicbus/ds1672.c projects/mesh11s/sys/dev/iicbus/if_ic.c projects/mesh11s/sys/dev/ipw/if_ipw.c projects/mesh11s/sys/dev/lmc/if_lmc.c projects/mesh11s/sys/dev/lmc/if_lmc.h projects/mesh11s/sys/dev/mge/if_mge.c projects/mesh11s/sys/dev/mlx/mlx.c projects/mesh11s/sys/dev/mly/mly.c projects/mesh11s/sys/dev/mse/mse.c projects/mesh11s/sys/dev/pccard/pccarddevs projects/mesh11s/sys/dev/pci/pci.c projects/mesh11s/sys/dev/pci/pcireg.h projects/mesh11s/sys/dev/ppbus/if_plip.c projects/mesh11s/sys/dev/re/if_re.c projects/mesh11s/sys/dev/sound/pci/envy24.c projects/mesh11s/sys/dev/sound/pci/envy24ht.c projects/mesh11s/sys/dev/sound/usb/uaudio.c (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/twa/tw_osl_freebsd.c projects/mesh11s/sys/dev/twe/twe_freebsd.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 (props changed) projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed) projects/mesh11s/sys/dev/usb/bluetooth/ubtbcmfw.c (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 (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 (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 (props changed) projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c (props changed) projects/mesh11s/sys/dev/usb/controller/ehci_pci.c (props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg.c (contents, props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg.h (props changed) projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c (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 (props changed) projects/mesh11s/sys/dev/usb/controller/ohci_pci.c (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 (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 (props changed) projects/mesh11s/sys/dev/usb/input/uhid.c (props changed) projects/mesh11s/sys/dev/usb/input/ukbd.c (props changed) projects/mesh11s/sys/dev/usb/input/ums.c (props changed) projects/mesh11s/sys/dev/usb/input/usb_rdesc.h (props changed) projects/mesh11s/sys/dev/usb/misc/udbp.c (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 (props changed) projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_axe.c (props changed) projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_cdce.c (props changed) projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_cue.c (props changed) projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_kue.c (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 (props changed) projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_udav.c (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 (props changed) projects/mesh11s/sys/dev/usb/serial/uark.c (props changed) projects/mesh11s/sys/dev/usb/serial/ubsa.c (props changed) projects/mesh11s/sys/dev/usb/serial/ubser.c (props changed) projects/mesh11s/sys/dev/usb/serial/uchcom.c (props changed) projects/mesh11s/sys/dev/usb/serial/ucycom.c (props changed) projects/mesh11s/sys/dev/usb/serial/ufoma.c (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 (props changed) projects/mesh11s/sys/dev/usb/serial/uipaq.c (props changed) projects/mesh11s/sys/dev/usb/serial/ulpt.c (props changed) projects/mesh11s/sys/dev/usb/serial/umct.c (props changed) projects/mesh11s/sys/dev/usb/serial/umodem.c (props changed) projects/mesh11s/sys/dev/usb/serial/umoscom.c (props changed) projects/mesh11s/sys/dev/usb/serial/uplcom.c (props changed) projects/mesh11s/sys/dev/usb/serial/usb_serial.c (props changed) projects/mesh11s/sys/dev/usb/serial/usb_serial.h (props changed) projects/mesh11s/sys/dev/usb/serial/uslcom.c (props changed) projects/mesh11s/sys/dev/usb/serial/uvisor.c (props changed) projects/mesh11s/sys/dev/usb/serial/uvscom.c (props changed) projects/mesh11s/sys/dev/usb/storage/rio500_usb.h (props changed) projects/mesh11s/sys/dev/usb/storage/umass.c (props changed) projects/mesh11s/sys/dev/usb/storage/urio.c (props changed) projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c (props changed) projects/mesh11s/sys/dev/usb/template/usb_template.c (contents, 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 (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 (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 (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 (contents, props changed) projects/mesh11s/sys/dev/usb/usb_dynamic.h (contents, props changed) projects/mesh11s/sys/dev/usb/usb_endian.h (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 (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 (props changed) projects/mesh11s/sys/dev/usb/usb_hid.h (props changed) projects/mesh11s/sys/dev/usb/usb_hub.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_hub.h (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 (props changed) projects/mesh11s/sys/dev/usb/usb_msctest.h (props changed) projects/mesh11s/sys/dev/usb/usb_parse.c (props changed) projects/mesh11s/sys/dev/usb/usb_parse.h (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 (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 (contents, props changed) projects/mesh11s/sys/dev/usb/usbhid.h (props changed) projects/mesh11s/sys/dev/usb/wlan/if_rum.c (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 (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 (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/dev/xl/if_xl.c projects/mesh11s/sys/geom/part/g_part.c projects/mesh11s/sys/geom/part/g_part_ebr.c projects/mesh11s/sys/geom/part/g_part_if.m projects/mesh11s/sys/geom/vinum/geom_vinum.c projects/mesh11s/sys/geom/vinum/geom_vinum_rename.c projects/mesh11s/sys/i386/conf/DEFAULTS projects/mesh11s/sys/i386/i386/busdma_machdep.c projects/mesh11s/sys/i386/i386/mp_machdep.c projects/mesh11s/sys/i386/include/metadata.h projects/mesh11s/sys/i386/include/param.h projects/mesh11s/sys/i386/include/pc/bios.h projects/mesh11s/sys/ia64/ia64/busdma_machdep.c projects/mesh11s/sys/ia64/include/param.h projects/mesh11s/sys/kern/kern_conf.c projects/mesh11s/sys/kern/kern_cpuset.c projects/mesh11s/sys/kern/kern_descrip.c projects/mesh11s/sys/kern/kern_exit.c projects/mesh11s/sys/kern/kern_malloc.c projects/mesh11s/sys/kern/kern_uuid.c projects/mesh11s/sys/kern/uipc_sockbuf.c projects/mesh11s/sys/kern/vfs_acl.c projects/mesh11s/sys/kern/vfs_bio.c projects/mesh11s/sys/kern/vfs_cache.c 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/ (props changed) projects/mesh11s/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) projects/mesh11s/sys/mips/include/param.h projects/mesh11s/sys/mips/mips/pmap.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/net/ethernet.h projects/mesh11s/sys/net/if.c projects/mesh11s/sys/net/if.h projects/mesh11s/sys/net/if_arc.h projects/mesh11s/sys/net/if_arcsubr.c projects/mesh11s/sys/net/if_atm.h projects/mesh11s/sys/net/if_atmsubr.c projects/mesh11s/sys/net/if_disc.c projects/mesh11s/sys/net/if_enc.c projects/mesh11s/sys/net/if_ethersubr.c projects/mesh11s/sys/net/if_faith.c projects/mesh11s/sys/net/if_fddisubr.c projects/mesh11s/sys/net/if_fwsubr.c projects/mesh11s/sys/net/if_gif.c projects/mesh11s/sys/net/if_gif.h projects/mesh11s/sys/net/if_gre.c projects/mesh11s/sys/net/if_iso88025subr.c projects/mesh11s/sys/net/if_lagg.c projects/mesh11s/sys/net/if_lagg.h projects/mesh11s/sys/net/if_llatbl.c projects/mesh11s/sys/net/if_llatbl.h projects/mesh11s/sys/net/if_loop.c projects/mesh11s/sys/net/if_mib.c projects/mesh11s/sys/net/if_spppsubr.c projects/mesh11s/sys/net/if_stf.c projects/mesh11s/sys/net/if_tun.c projects/mesh11s/sys/net/if_var.h projects/mesh11s/sys/net/if_vlan.c projects/mesh11s/sys/net/iso88025.h projects/mesh11s/sys/net/radix_mpath.c projects/mesh11s/sys/net/route.c projects/mesh11s/sys/net/route.h projects/mesh11s/sys/net/rtsock.c projects/mesh11s/sys/net80211/ieee80211.c projects/mesh11s/sys/net80211/ieee80211_output.c projects/mesh11s/sys/net80211/ieee80211_proto.h projects/mesh11s/sys/net80211/ieee80211_var.h projects/mesh11s/sys/netatalk/at_control.c projects/mesh11s/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c projects/mesh11s/sys/netgraph/ng_eiface.c projects/mesh11s/sys/netgraph/ng_fec.c projects/mesh11s/sys/netgraph/ng_iface.c projects/mesh11s/sys/netinet/if_ether.c projects/mesh11s/sys/netinet/igmp.c projects/mesh11s/sys/netinet/in.c projects/mesh11s/sys/netinet/in_mcast.c projects/mesh11s/sys/netinet/in_pcb.c projects/mesh11s/sys/netinet/in_pcb.h projects/mesh11s/sys/netinet/in_var.h projects/mesh11s/sys/netinet/ip_carp.c projects/mesh11s/sys/netinet/ip_divert.c projects/mesh11s/sys/netinet/ip_fastfwd.c projects/mesh11s/sys/netinet/ip_fw2.c projects/mesh11s/sys/netinet/ip_fw_nat.c projects/mesh11s/sys/netinet/ip_icmp.c projects/mesh11s/sys/netinet/ip_input.c projects/mesh11s/sys/netinet/ip_mroute.h projects/mesh11s/sys/netinet/ip_output.c projects/mesh11s/sys/netinet/sctp_bsd_addr.c projects/mesh11s/sys/netinet/sctp_structs.h projects/mesh11s/sys/netinet/vinet.h projects/mesh11s/sys/netinet6/icmp6.c projects/mesh11s/sys/netinet6/in6.c projects/mesh11s/sys/netinet6/in6.h projects/mesh11s/sys/netinet6/in6_ifattach.c projects/mesh11s/sys/netinet6/in6_var.h projects/mesh11s/sys/netinet6/ip6_input.c projects/mesh11s/sys/netinet6/mld6.c projects/mesh11s/sys/netinet6/nd6.c projects/mesh11s/sys/netinet6/nd6.h projects/mesh11s/sys/netinet6/nd6_rtr.c projects/mesh11s/sys/netipx/ipx_outputfl.c projects/mesh11s/sys/pc98/cbus/olpt.c projects/mesh11s/sys/pci/if_rlreg.h projects/mesh11s/sys/powerpc/aim/trap.c projects/mesh11s/sys/powerpc/booke/locore.S projects/mesh11s/sys/powerpc/booke/machdep.c projects/mesh11s/sys/powerpc/booke/swtch.S projects/mesh11s/sys/powerpc/booke/vm_machdep.c projects/mesh11s/sys/powerpc/include/hid.h projects/mesh11s/sys/powerpc/include/param.h projects/mesh11s/sys/powerpc/include/trap_aim.h projects/mesh11s/sys/powerpc/include/vmparam.h projects/mesh11s/sys/powerpc/powerpc/cpu.c projects/mesh11s/sys/powerpc/powerpc/intr_machdep.c projects/mesh11s/sys/rpc/svc.h projects/mesh11s/sys/security/audit/audit.c projects/mesh11s/sys/security/audit/audit_bsm.c projects/mesh11s/sys/security/audit/audit_bsm_domain.c projects/mesh11s/sys/security/audit/audit_bsm_token.c projects/mesh11s/sys/security/audit/audit_pipe.c projects/mesh11s/sys/security/audit/audit_private.h projects/mesh11s/sys/security/audit/audit_syscalls.c projects/mesh11s/sys/sparc64/include/param.h projects/mesh11s/sys/sun4v/include/param.h projects/mesh11s/sys/sys/acl.h projects/mesh11s/sys/sys/malloc.h projects/mesh11s/sys/sys/param.h projects/mesh11s/sys/ufs/ufs/ufs_extern.h projects/mesh11s/sys/ufs/ufs/ufs_lookup.c projects/mesh11s/sys/ufs/ufs/ufs_vnops.c projects/mesh11s/sys/vm/vm_fault.c projects/mesh11s/sys/vm/vm_map.c projects/mesh11s/sys/vm/vm_pageout.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/lib/msun/test-conj.t (props changed) projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.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/common projects/mesh11s/tools/tools/net80211/scripts/setup.wdsmain projects/mesh11s/tools/tools/net80211/wlanwds/wlanwds.c projects/mesh11s/usr.bin/cpio/Makefile projects/mesh11s/usr.bin/cpio/bsdcpio.1 projects/mesh11s/usr.bin/cpio/cmdline.c projects/mesh11s/usr.bin/cpio/cpio.c projects/mesh11s/usr.bin/cpio/cpio.h projects/mesh11s/usr.bin/cpio/cpio_platform.h projects/mesh11s/usr.bin/cpio/pathmatch.c projects/mesh11s/usr.bin/cpio/pathmatch.h projects/mesh11s/usr.bin/cpio/test/main.c projects/mesh11s/usr.bin/cpio/test/test.h projects/mesh11s/usr.bin/cpio/test/test_0.c projects/mesh11s/usr.bin/cpio/test/test_basic.c projects/mesh11s/usr.bin/cpio/test/test_format_newc.c projects/mesh11s/usr.bin/cpio/test/test_gcpio_compat.c projects/mesh11s/usr.bin/cpio/test/test_option_a.c projects/mesh11s/usr.bin/cpio/test/test_option_c.c projects/mesh11s/usr.bin/cpio/test/test_option_d.c projects/mesh11s/usr.bin/cpio/test/test_option_f.c projects/mesh11s/usr.bin/cpio/test/test_option_m.c projects/mesh11s/usr.bin/cpio/test/test_option_t.c projects/mesh11s/usr.bin/cpio/test/test_option_u.c projects/mesh11s/usr.bin/cpio/test/test_option_version.c projects/mesh11s/usr.bin/cpio/test/test_option_y.c projects/mesh11s/usr.bin/cpio/test/test_option_z.c projects/mesh11s/usr.bin/cpio/test/test_owner_parse.c projects/mesh11s/usr.bin/cpio/test/test_passthrough_dotdot.c projects/mesh11s/usr.bin/cpio/test/test_passthrough_reverse.c projects/mesh11s/usr.bin/cpio/test/test_pathmatch.c projects/mesh11s/usr.bin/csup/ (props changed) projects/mesh11s/usr.bin/login/login_audit.c projects/mesh11s/usr.bin/ncal/Makefile projects/mesh11s/usr.bin/ncal/ncal.c projects/mesh11s/usr.bin/netstat/mroute.c projects/mesh11s/usr.bin/procstat/ (props changed) projects/mesh11s/usr.bin/tar/Makefile projects/mesh11s/usr.bin/tar/bsdtar.1 projects/mesh11s/usr.bin/tar/bsdtar.c projects/mesh11s/usr.bin/tar/bsdtar.h projects/mesh11s/usr.bin/tar/bsdtar_platform.h projects/mesh11s/usr.bin/tar/cmdline.c projects/mesh11s/usr.bin/tar/read.c projects/mesh11s/usr.bin/tar/test/main.c projects/mesh11s/usr.bin/tar/test/test.h projects/mesh11s/usr.bin/tar/test/test_0.c projects/mesh11s/usr.bin/tar/test/test_basic.c projects/mesh11s/usr.bin/tar/test/test_copy.c projects/mesh11s/usr.bin/tar/test/test_patterns.c projects/mesh11s/usr.bin/tar/test/test_strip_components.c projects/mesh11s/usr.bin/tar/test/test_symlink_dir.c projects/mesh11s/usr.bin/tar/tree.c projects/mesh11s/usr.bin/tar/util.c projects/mesh11s/usr.bin/tar/write.c projects/mesh11s/usr.sbin/Makefile projects/mesh11s/usr.sbin/bluetooth/btpand/event.c projects/mesh11s/usr.sbin/cpucontrol/cpucontrol.8 projects/mesh11s/usr.sbin/crashinfo/crashinfo.8 projects/mesh11s/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mesh11s/usr.sbin/dumpcis/cis.h (props changed) 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/pciconf/cap.c projects/mesh11s/usr.sbin/pkg_install/add/main.c projects/mesh11s/usr.sbin/ppp/ipcp.c projects/mesh11s/usr.sbin/ppp/ipv6cp.c projects/mesh11s/usr.sbin/ppp/route.c projects/mesh11s/usr.sbin/ppp/route.h projects/mesh11s/usr.sbin/setfib/setfib.1 projects/mesh11s/usr.sbin/sysinstall/devices.c projects/mesh11s/usr.sbin/sysinstall/index.c projects/mesh11s/usr.sbin/sysinstall/menus.c projects/mesh11s/usr.sbin/zic/ (props changed) Modified: projects/mesh11s/ObsoleteFiles.inc ============================================================================== --- projects/mesh11s/ObsoleteFiles.inc Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/ObsoleteFiles.inc Thu Apr 23 18:46:03 2009 (r191436) @@ -14,8 +14,31 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090417: removal of legacy versions of USB network interface drivers +OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h +OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h +OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h +OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h +# 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8) +OLD_FILES+=usr/sbin/raycontrol +OLD_FILES+=usr/share/man/man4/i386/ar.4.gz +OLD_FILES+=usr/share/man/man4/i386/ray.4.gz +OLD_FILES+=usr/share/man/man4/i386/sr.4.gz +OLD_FILES+=usr/share/man/man8/raycontrol.8.gz # 20090410: VOP_LEASE.9 removed OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz +# 20090406: usb_sw_transfer.h removed +OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h # 20090405: removal of if_ppp(4) and if_sl(4) OLD_FILES+=sbin/slattach rescue/slattach OLD_FILES+=sbin/startslip rescue/startslip @@ -54,6 +77,7 @@ 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 +OLD_FILES+=usr/include/libusb20_compat10.h .if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libusb20.so.1 OLD_FILES+=usr/lib32/libusb20.a @@ -97,6 +121,8 @@ OLD_FILES+=usr/include/dev/usb/if_udavre OLD_FILES+=usr/include/dev/usb/if_upgtvar.h OLD_FILES+=usr/include/dev/usb/if_uralreg.h OLD_FILES+=usr/include/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/dev/usb/if_urtwreg.h +OLD_FILES+=usr/include/dev/usb/if_urtwvar.h OLD_FILES+=usr/include/dev/usb/if_zydfw.h OLD_FILES+=usr/include/dev/usb/if_zydreg.h OLD_FILES+=usr/include/dev/usb/kue_fw.h Modified: projects/mesh11s/UPDATING ============================================================================== --- projects/mesh11s/UPDATING Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/UPDATING Thu Apr 23 18:46:03 2009 (r191436) @@ -22,6 +22,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090422 + Implement low-level Bluetooth HCI API. + Bump __FreeBSD_version to 800083. + +20090415: + Anticipate overflowing inp_flags - add inp_flags2. + This changes most offsets in inpcb, so checking v4 connection + state will require a world rebuild. + Bump __FreeBSD_version to 800080. +20090415: + Add an llentry to struct route and struct route_in6. Modules + embedding a struct route will need to be recompiled. + Bump __FreeBSD_version to 800079. + +20090414: + The size of rt_metrics_lite and by extension rtentry has changed. + Networking administration apps will need to be recompiled. + The route command now supports show as an alias for get, weighting + of routes, sticky and nostick flags to alter the behavior of stateful + load balancing. + Bump __FreeBSD_version to 800078. 20090408: Do not use Giant for kbdmux(4) locking. This is wrong and apparently causing more problems than it solves. This will Modified: projects/mesh11s/contrib/ntp/ntpq/ntpq.c ============================================================================== --- projects/mesh11s/contrib/ntp/ntpq/ntpq.c Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/ntp/ntpq/ntpq.c Thu Apr 23 18:46:03 2009 (r191436) @@ -3185,9 +3185,9 @@ cookedprint( if (!decodeuint(value, &uval)) output_raw = '?'; else { - char b[10]; + char b[12]; - (void) sprintf(b, "%03lo", uval); + (void) snprintf(b, sizeof(b), "%03lo", uval); output(fp, name, b); } break; Modified: projects/mesh11s/contrib/openbsm/CREDITS ============================================================================== --- projects/mesh11s/contrib/openbsm/CREDITS Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/CREDITS Thu Apr 23 18:46:03 2009 (r191436) @@ -28,6 +28,7 @@ the development of OpenBSM: Xin LI Stacey Son Todd Heberlein + Gary Hoo In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the Modified: projects/mesh11s/contrib/openbsm/INSTALL ============================================================================== --- projects/mesh11s/contrib/openbsm/INSTALL Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/INSTALL Thu Apr 23 18:46:03 2009 (r191436) @@ -2,9 +2,8 @@ OpenBSM Build and Installation Instructi OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facilities in the -underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using: +and Linux. Some components are built only if appropriate kernel audit +suppport is found. Typical builds will be performed using: ./configure make @@ -15,10 +14,14 @@ force the compile to fail if a warning i CFLAGS="-Wall -Werror" ./configure -To install, use: +To install the library, binaries, and man pages, use: make install +The OpenBSM install will not install files in /etc; these have to be +manually installed or merged. Currently, the locations of these files are +not configurable. + You may wish to specify that the OpenBSM components not be installed in the base system, rather in a specific directory. This may be done using the --prefix argument to configure. If installing to a specific directory, @@ -29,7 +32,3 @@ directory the correct libbsm is used: make make install LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - -You will need to manually propagate openbsm/etc/* into /etc/security on your -system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not configurable. Modified: projects/mesh11s/contrib/openbsm/Makefile.in ============================================================================== --- projects/mesh11s/contrib/openbsm/Makefile.in Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/Makefile.in Thu Apr 23 18:46:03 2009 (r191436) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -97,6 +97,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -121,6 +122,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -184,6 +186,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys @@ -332,8 +335,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -358,8 +361,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -369,13 +372,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -446,6 +448,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -472,6 +478,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -623,8 +631,8 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ Modified: projects/mesh11s/contrib/openbsm/NEWS ============================================================================== --- projects/mesh11s/contrib/openbsm/NEWS Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/NEWS Thu Apr 23 18:46:03 2009 (r191436) @@ -1,5 +1,23 @@ OpenBSM Version History +OpenBSM 1.1 + +- Change auditon(2) parameters and data structures to be 32/64-bit architecture + independent. Add more information to man page about auditon(2) parameters. +- Add wrapper functions for auditon(2) to use legacy commands when the new + commands are not supported. +- Add default for 'expire-after' in audit_control to expire trail files when + the audit directory is more than 10 megabytes ('10M'). +- Interface to convert between local and BSM fcntl(2) command values has been + added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with + definitions of constants in audit_fcntl.h. +- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens + generated by audit_submit(3) were improperly encoded has been fixed. +- Fix example in audit_submit(3) man page. Also, make it clear that we want + the audit ID as the argument. +- A new audit event class 'aa', for post-login authentication and + authorization events, has been added. + OpenBSM 1.1 beta 1 - The filesz parameter in audit_control(5) now accepts suffixes: 'B' for @@ -431,4 +449,4 @@ OpenBSM 1.0 alpha 1 to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $ Modified: projects/mesh11s/contrib/openbsm/README ============================================================================== --- projects/mesh11s/contrib/openbsm/README Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/README Thu Apr 23 18:46:03 2009 (r191436) @@ -1,15 +1,22 @@ -OpenBSM 1.1 beta 1 +OpenBSM 1.1 Introduction -OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, this -implementation is now maintained by volunteers and the generous contribution -of several organizations. Coupled with a kernel audit implementation, -OpenBSM can be used to maintain system audit streams, and is a foundation for -an Audit-enabled system. Portions of OpenBSM, including include files and -token-building routines, are reusable in a kernel audit implementation, and -may be found in the FreeBSD and Mac OS X kernels. +OpenBSM is an open source implementation of Sun's BSM event auditing file +format and API. Originally created for Apple Computer by McAfee Research, +OpenBSM is now maintained by volunteers and through the generous contribution +of several organizations. + +OpenBSM includes several command line tools, including auditreduce(8) and +praudit(8) for reducing and printing audit trails, as well as the libbsm(3) +library to manage configuration files, generate audit records, and parse and +print audit trils. + +Coupled with a kernel audit implementation, OpenBSM can be used to maintain +system audit streams, and is a foundation for a full audit-enabled system. +Portions of OpenBSM, including include files and token-building routines, are +reusable in a kernel audit implementation, and may be found in the FreeBSD +and Mac OS X kernels. Contents @@ -17,7 +24,7 @@ OpenBSM consists of several directories: bin/ Audit-related command line tools bsm/ Library include files for BSM - compat/ Compatibility code to build on various OS's + compat/ Compatibility code to build on various operating systems etc/ Sample /etc/security configuration files libauditd Common audit management functions for auditd and launchd libbsm/ Implementation of BSM library interfaces and man pages @@ -44,7 +51,8 @@ Please see the file INSTALL for build an The TrustedBSD Project would appreciate the contribution of bug fixes, enhancements, etc, under identically or substantially similar licenses to -those present on the remainder of the OpenBSM source code. +those present on the remainder of the OpenBSM source code. Please see the +file CREDITS to learn more about who has contributed to the project. Location @@ -56,4 +64,4 @@ Information on TrustedBSD may be found o http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#35 $ +$P4: //depot/projects/trustedbsd/openbsm/README#36 $ Modified: projects/mesh11s/contrib/openbsm/TODO ============================================================================== --- projects/mesh11s/contrib/openbsm/TODO Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/TODO Thu Apr 23 18:46:03 2009 (r191436) @@ -16,11 +16,10 @@ OpenBSM TODO just at the beginning of a record. This will make it easier to use praudit in test suites processing single-token files without header and trailer context. -- Put hostname in trail file name. - Document audit_warn event arguments. - Allow the path /etc/security to be configured at configure-time so that alternative locations can be used. - NLS support for au_strerror(3), which provides error strings for BSM errors not available on the local OS platform. -$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#13 $ Modified: projects/mesh11s/contrib/openbsm/VERSION ============================================================================== --- projects/mesh11s/contrib/openbsm/VERSION Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/VERSION Thu Apr 23 18:46:03 2009 (r191436) @@ -1 +1 @@ -OPENBSM_1_1_BETA_1 +OPENBSM_1_1 Modified: projects/mesh11s/contrib/openbsm/aclocal.m4 ============================================================================== --- projects/mesh11s/contrib/openbsm/aclocal.m4 Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/aclocal.m4 Thu Apr 23 18:46:03 2009 (r191436) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,14 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.62],, +[m4_warning([this file was generated for autoconf 2.62. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -208,6 +210,8 @@ file_magic*) ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -614,7 +689,11 @@ sparc*-*solaris*) *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -707,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2], $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -978,7 +1057,7 @@ else AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -986,7 +1065,7 @@ else [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1303,7 +1382,7 @@ aix3*) soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1824,6 +1903,13 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2323,7 +2409,7 @@ lt_cv_deplibs_check_method='unknown' # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -2759,7 +2845,7 @@ aix3*) fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -2816,6 +2902,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)= _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -2925,7 +3012,7 @@ case $host_os in # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -2938,7 +3025,7 @@ case $host_os in # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3084,51 +3171,23 @@ case $host_os in fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -3379,7 +3438,7 @@ case $host_os in _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -3814,7 +3873,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -3939,6 +3999,11 @@ fi $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -3995,7 +4060,6 @@ solaris*) ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4080,7 +4144,7 @@ aix3*) postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4257,6 +4321,7 @@ if test -f "$ltmain"; then _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4319,7 +4384,7 @@ ifelse([$1], [], # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4556,6 +4621,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -4905,7 +4974,7 @@ EOF echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -4962,7 +5031,8 @@ AC_MSG_CHECKING([for $compiler option to # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -4999,7 +5069,7 @@ AC_MSG_CHECKING([for $compiler option to esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5095,7 +5165,7 @@ AC_MSG_CHECKING([for $compiler option to _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5246,7 +5316,8 @@ AC_MSG_CHECKING([for $compiler option to # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5316,7 +5387,8 @@ AC_MSG_CHECKING([for $compiler option to mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5453,7 +5525,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -5477,7 +5549,7 @@ esac # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -5493,7 +5565,7 @@ AC_MSG_CHECKING([whether the $compiler l ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -5512,6 +5584,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -5542,12 +5615,14 @@ ifelse([$1],[CXX],[ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -5597,7 +5672,7 @@ ifelse([$1],[CXX],[ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5816,7 +5891,7 @@ _LT_EOF fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5836,7 +5911,7 @@ _LT_EOF # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -5996,11 +6071,10 @@ _LT_EOF _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -6581,7 +6655,7 @@ AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6596,7 +6670,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6612,8 +6686,10 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6885,7 +6961,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6933,13 +7009,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7044,16 +7120,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7354,7 +7431,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Modified: projects/mesh11s/contrib/openbsm/bin/Makefile.in ============================================================================== --- projects/mesh11s/contrib/openbsm/bin/Makefile.in Thu Apr 23 18:23:08 2009 (r191435) +++ projects/mesh11s/contrib/openbsm/bin/Makefile.in Thu Apr 23 18:46:03 2009 (r191436) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 03:38:52 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 1205C106566C; Fri, 24 Apr 2009 03:38:52 +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 F3A008FC13; Fri, 24 Apr 2009 03:38:51 +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 n3O3cp6i007223; Fri, 24 Apr 2009 03:38:51 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3O3cpCY007222; Fri, 24 Apr 2009 03:38:51 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904240338.n3O3cpCY007222@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 24 Apr 2009 03:38:51 +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: r191448 - 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: Fri, 24 Apr 2009 03:38:52 -0000 Author: gonzo Date: Fri Apr 24 03:38:51 2009 New Revision: 191448 URL: http://svn.freebsd.org/changeset/base/191448 Log: - Fix whitespace to conform style(9) Modified: projects/mips/sys/mips/mips/cpu.c Modified: projects/mips/sys/mips/mips/cpu.c ============================================================================== --- projects/mips/sys/mips/mips/cpu.c Fri Apr 24 03:06:32 2009 (r191447) +++ projects/mips/sys/mips/mips/cpu.c Fri Apr 24 03:38:51 2009 (r191448) @@ -64,61 +64,66 @@ union cpuprid fpu_id; static void mips_get_identity(struct mips_cpuinfo *cpuinfo) { - u_int32_t prid; - u_int32_t cfg0; - u_int32_t cfg1; - u_int32_t tmp; - - memset(cpuinfo, 0, sizeof(struct mips_cpuinfo)); - - /* Read and store the PrID ID for CPU identification. */ - prid = mips_rd_prid(); - cpuinfo->cpu_vendor = MIPS_PRID_CID(prid); - cpuinfo->cpu_rev = MIPS_PRID_REV(prid); - cpuinfo->cpu_impl = MIPS_PRID_IMPL(prid); - - /* Read config register selection 0 to learn TLB type. */ - cfg0 = mips_rd_config(); - - cpuinfo->tlb_type = ((cfg0 & MIPS_CONFIG0_MT_MASK) >> MIPS_CONFIG0_MT_SHIFT); - cpuinfo->icache_virtual = cfg0 & MIPS_CONFIG0_VI; - - /* If config register selection 1 does not exist, exit. */ - if (!(cfg0 & MIPS3_CONFIG_CM)) - return; - - /* Learn TLB size and L1 cache geometry. */ - cfg1 = mips_rd_config_sel1(); - cpuinfo->tlb_nentries = ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; - - /* L1 instruction cache. */ - tmp = 1 << (((cfg1 & MIPS_CONFIG1_IL_MASK) >> MIPS_CONFIG1_IL_SHIFT) + 1); - if (tmp != 0) { - cpuinfo->l1.ic_linesize = tmp; - cpuinfo->l1.ic_nways = (((cfg1 & MIPS_CONFIG1_IA_MASK) >> MIPS_CONFIG1_IA_SHIFT)) + 1; - cpuinfo->l1.ic_nsets = 1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6); - cpuinfo->l1.ic_size = cpuinfo->l1.ic_linesize * cpuinfo->l1.ic_nsets - * cpuinfo->l1.ic_nways; - } - - /* L1 data cache. */ - tmp = 1 << (((cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT) + 1); - if (tmp != 0) { - cpuinfo->l1.dc_linesize = tmp; - cpuinfo->l1.dc_nways = (((cfg1 & MIPS_CONFIG1_DA_MASK) >> MIPS_CONFIG1_DA_SHIFT)) + 1; - cpuinfo->l1.dc_nsets = 1 << (((cfg1 & MIPS_CONFIG1_DS_MASK) >> MIPS_CONFIG1_DS_SHIFT) + 6); + u_int32_t prid; + u_int32_t cfg0; + u_int32_t cfg1; + u_int32_t tmp; + + memset(cpuinfo, 0, sizeof(struct mips_cpuinfo)); + + /* Read and store the PrID ID for CPU identification. */ + prid = mips_rd_prid(); + cpuinfo->cpu_vendor = MIPS_PRID_CID(prid); + cpuinfo->cpu_rev = MIPS_PRID_REV(prid); + cpuinfo->cpu_impl = MIPS_PRID_IMPL(prid); + + /* Read config register selection 0 to learn TLB type. */ + cfg0 = mips_rd_config(); + + cpuinfo->tlb_type = + ((cfg0 & MIPS_CONFIG0_MT_MASK) >> MIPS_CONFIG0_MT_SHIFT); + cpuinfo->icache_virtual = cfg0 & MIPS_CONFIG0_VI; + + /* If config register selection 1 does not exist, exit. */ + if (!(cfg0 & MIPS3_CONFIG_CM)) + return; + + /* Learn TLB size and L1 cache geometry. */ + cfg1 = mips_rd_config_sel1(); + cpuinfo->tlb_nentries = + ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; + + /* L1 instruction cache. */ + tmp = 1 << (((cfg1 & MIPS_CONFIG1_IL_MASK) >> MIPS_CONFIG1_IL_SHIFT) + 1); + if (tmp != 0) { + cpuinfo->l1.ic_linesize = tmp; + cpuinfo->l1.ic_nways = (((cfg1 & MIPS_CONFIG1_IA_MASK) >> MIPS_CONFIG1_IA_SHIFT)) + 1; + cpuinfo->l1.ic_nsets = + 1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6); + cpuinfo->l1.ic_size = + cpuinfo->l1.ic_linesize * cpuinfo->l1.ic_nsets * cpuinfo->l1.ic_nways; + } + + /* L1 data cache. */ + tmp = 1 << (((cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT) + 1); + if (tmp != 0) { + cpuinfo->l1.dc_linesize = tmp; + cpuinfo->l1.dc_nways = + (((cfg1 & MIPS_CONFIG1_DA_MASK) >> MIPS_CONFIG1_DA_SHIFT)) + 1; + cpuinfo->l1.dc_nsets = + 1 << (((cfg1 & MIPS_CONFIG1_DS_MASK) >> MIPS_CONFIG1_DS_SHIFT) + 6); #ifdef TARGET_OCTEON - /* - * Octeon does 128 byte line-size. But Config-Sel1 doesn't show - * 128 line-size, 1 Set, 64 ways. - */ - cpuinfo->l1.dc_linesize = 128; - cpuinfo->l1.dc_nsets = 1; - cpuinfo->l1.dc_nways = 64; + /* + * Octeon does 128 byte line-size. But Config-Sel1 doesn't show + * 128 line-size, 1 Set, 64 ways. + */ + cpuinfo->l1.dc_linesize = 128; + cpuinfo->l1.dc_nsets = 1; + cpuinfo->l1.dc_nways = 64; #endif - cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize * cpuinfo->l1.dc_nsets - * cpuinfo->l1.dc_nways; - } + cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize + * cpuinfo->l1.dc_nsets * cpuinfo->l1.dc_nways; + } } void @@ -141,77 +146,80 @@ mips_cpu_init(void) void cpu_identify(void) { - printf("cpu%d: ", 0); /* XXX per-cpu */ - switch (cpuinfo.cpu_vendor) { - case MIPS_PRID_CID_MTI: - printf("MIPS Technologies"); - break; - case MIPS_PRID_CID_BROADCOM: - case MIPS_PRID_CID_SIBYTE: - printf("Broadcom"); - break; - case MIPS_PRID_CID_ALCHEMY: - printf("AMD"); - break; - case MIPS_PRID_CID_SANDCRAFT: - printf("Sandcraft"); - break; - case MIPS_PRID_CID_PHILIPS: - printf("Philips"); - break; - case MIPS_PRID_CID_TOSHIBA: - printf("Toshiba"); - break; - case MIPS_PRID_CID_LSI: - printf("LSI"); - break; - case MIPS_PRID_CID_LEXRA: - printf("Lexra"); - break; - case MIPS_PRID_CID_PREHISTORIC: - default: - printf("Unknown"); - break; - } - printf(" processor v%d.%d\n", cpuinfo.cpu_rev, cpuinfo.cpu_impl); - - printf(" MMU: "); - if (cpuinfo.tlb_type == MIPS_MMU_NONE) { - printf("none present\n"); - } else { - if (cpuinfo.tlb_type == MIPS_MMU_TLB) { - printf("Standard TLB"); - } else if (cpuinfo.tlb_type == MIPS_MMU_BAT) { - printf("Standard BAT"); - } else if (cpuinfo.tlb_type == MIPS_MMU_FIXED) { - printf("Fixed mapping"); + printf("cpu%d: ", 0); /* XXX per-cpu */ + switch (cpuinfo.cpu_vendor) { + case MIPS_PRID_CID_MTI: + printf("MIPS Technologies"); + break; + case MIPS_PRID_CID_BROADCOM: + case MIPS_PRID_CID_SIBYTE: + printf("Broadcom"); + break; + case MIPS_PRID_CID_ALCHEMY: + printf("AMD"); + break; + case MIPS_PRID_CID_SANDCRAFT: + printf("Sandcraft"); + break; + case MIPS_PRID_CID_PHILIPS: + printf("Philips"); + break; + case MIPS_PRID_CID_TOSHIBA: + printf("Toshiba"); + break; + case MIPS_PRID_CID_LSI: + printf("LSI"); + break; + case MIPS_PRID_CID_LEXRA: + printf("Lexra"); + break; + case MIPS_PRID_CID_PREHISTORIC: + default: + printf("Unknown"); + break; } - printf(", %d entries\n", cpuinfo.tlb_nentries); - } + printf(" processor v%d.%d\n", cpuinfo.cpu_rev, cpuinfo.cpu_impl); - printf(" L1 i-cache: "); - if (cpuinfo.l1.ic_linesize == 0) { - printf("disabled"); - } else { - if (cpuinfo.l1.ic_nways == 1) { - printf("direct-mapped with"); + printf(" MMU: "); + if (cpuinfo.tlb_type == MIPS_MMU_NONE) { + printf("none present\n"); } else { - printf ("%d ways of", cpuinfo.l1.ic_nways); + if (cpuinfo.tlb_type == MIPS_MMU_TLB) { + printf("Standard TLB"); + } else if (cpuinfo.tlb_type == MIPS_MMU_BAT) { + printf("Standard BAT"); + } else if (cpuinfo.tlb_type == MIPS_MMU_FIXED) { + printf("Fixed mapping"); + } + printf(", %d entries\n", cpuinfo.tlb_nentries); } - printf(" %d sets, %d bytes per line\n", cpuinfo.l1.ic_nsets, cpuinfo.l1.ic_linesize); - } - printf(" L1 d-cache: "); - if (cpuinfo.l1.dc_linesize == 0) { - printf("disabled"); - } else { - if (cpuinfo.l1.dc_nways == 1) { - printf("direct-mapped with"); + printf(" L1 i-cache: "); + if (cpuinfo.l1.ic_linesize == 0) { + printf("disabled"); } else { - printf ("%d ways of", cpuinfo.l1.dc_nways); + if (cpuinfo.l1.ic_nways == 1) { + printf("direct-mapped with"); + } else { + printf ("%d ways of", cpuinfo.l1.ic_nways); + } + printf(" %d sets, %d bytes per line\n", + cpuinfo.l1.ic_nsets, cpuinfo.l1.ic_linesize); } - printf(" %d sets, %d bytes per line\n", cpuinfo.l1.dc_nsets, cpuinfo.l1.dc_linesize); - } + + printf(" L1 d-cache: "); + if (cpuinfo.l1.dc_linesize == 0) { + printf("disabled"); + } else { + if (cpuinfo.l1.dc_nways == 1) { + printf("direct-mapped with"); + } else { + printf ("%d ways of", cpuinfo.l1.dc_nways); + } + printf(" %d sets, %d bytes per line\n", + cpuinfo.l1.dc_nsets, cpuinfo.l1.dc_linesize); + } + } static struct rman cpu_hardirq_rman; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 04:17:21 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 585F1106566B; Fri, 24 Apr 2009 04:17:21 +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 470298FC17; Fri, 24 Apr 2009 04:17:21 +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 n3O4HLkN008099; Fri, 24 Apr 2009 04:17:21 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3O4HLI8008098; Fri, 24 Apr 2009 04:17:21 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904240417.n3O4HLI8008098@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 24 Apr 2009 04:17:21 +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: r191451 - projects/mips/sys/mips/include 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, 24 Apr 2009 04:17:21 -0000 Author: gonzo Date: Fri Apr 24 04:17:21 2009 New Revision: 191451 URL: http://svn.freebsd.org/changeset/base/191451 Log: - Define accessor functions for CP0 Config(16) register selects 1, 2, 3. Content of these registers is defined in MIPS spec and can be used for obtaining info about CPU capabilities. Modified: projects/mips/sys/mips/include/cpufunc.h Modified: projects/mips/sys/mips/include/cpufunc.h ============================================================================== --- projects/mips/sys/mips/include/cpufunc.h Fri Apr 24 03:51:11 2009 (r191450) +++ projects/mips/sys/mips/include/cpufunc.h Fri Apr 24 04:17:21 2009 (r191451) @@ -212,18 +212,24 @@ MIPS_RDRW32_COP0(pagemask, MIPS_COP_0_TL MIPS_RDRW32_COP0(prid, MIPS_COP_0_PRID); MIPS_RDRW32_COP0(watchlo, MIPS_COP_0_WATCH_LO); MIPS_RDRW32_COP0(watchhi, MIPS_COP_0_WATCH_HI); +#undef MIPS_RDRW32_COP0 -static __inline uint32_t -mips_rd_config_sel1(void) -{ - int v0; - __asm __volatile("mfc0 %[v0], $16, 1 ;" - : [v0] "=&r" (v0)); - mips_barrier(); - return (v0); +#define MIPS_RD_CONFIG_SEL(sel) \ +static __inline uint32_t \ +mips_rd_config_sel##sel(void) \ +{ \ + int v0; \ + __asm __volatile("mfc0 %[v0], $16, " #sel " ;" \ + : [v0] "=&r" (v0)); \ + mips_barrier(); \ + return (v0); \ } -#undef MIPS_RDRW32_COP0 + +MIPS_RD_CONFIG_SEL(1); +MIPS_RD_CONFIG_SEL(2); +MIPS_RD_CONFIG_SEL(3); +#undef MIPS_RD_CONFIG_SEL static __inline register_t intr_disable(void) From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 04:18:16 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 AA5691065673; Fri, 24 Apr 2009 04:18:16 +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 98F068FC16; Fri, 24 Apr 2009 04:18:16 +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 n3O4IGXQ008151; Fri, 24 Apr 2009 04:18:16 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3O4IG9X008150; Fri, 24 Apr 2009 04:18:16 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904240418.n3O4IG9X008150@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 24 Apr 2009 04:18:16 +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: r191452 - 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: Fri, 24 Apr 2009 04:18:16 -0000 Author: gonzo Date: Fri Apr 24 04:18:16 2009 New Revision: 191452 URL: http://svn.freebsd.org/changeset/base/191452 Log: - Print supported CPU capabilities during stratup Modified: projects/mips/sys/mips/mips/cpu.c Modified: projects/mips/sys/mips/mips/cpu.c ============================================================================== --- projects/mips/sys/mips/mips/cpu.c Fri Apr 24 04:17:21 2009 (r191451) +++ projects/mips/sys/mips/mips/cpu.c Fri Apr 24 04:18:16 2009 (r191452) @@ -146,6 +146,7 @@ mips_cpu_init(void) void cpu_identify(void) { + uint32_t cfg0, cfg1, cfg2, cfg3; printf("cpu%d: ", 0); /* XXX per-cpu */ switch (cpuinfo.cpu_vendor) { case MIPS_PRID_CID_MTI: @@ -220,6 +221,32 @@ cpu_identify(void) cpuinfo.l1.dc_nsets, cpuinfo.l1.dc_linesize); } + cfg0 = mips_rd_config(); + /* If config register selection 1 does not exist, exit. */ + if (!(cfg0 & MIPS3_CONFIG_CM)) + return; + + cfg1 = mips_rd_config_sel1(); + printf(" Config1=0x%b\n", cfg1, + "\20\7COP2\6MDMX\5PerfCount\4WatchRegs\3MIPS16\2EJTAG\1FPU"); + + /* If config register selection 2 does not exist, exit. */ + if (!(cfg1 & MIPS3_CONFIG_CM)) + return; + cfg2 = mips_rd_config_sel2(); + /* + * Config2 contains no useful information other then Config3 + * existence flag + */ + + /* If config register selection 3 does not exist, exit. */ + if (!(cfg2 & MIPS3_CONFIG_CM)) + return; + cfg3 = mips_rd_config_sel2(); + + /* Print Config3 if it contains any useful info */ + if (cfg3 & ~(0x80000000)) + printf(" Config3=0x%b\n", cfg3, "\20\2SmartMIPS\1TraceLogic"); } static struct rman cpu_hardirq_rman; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 05:28: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 D92AC1065675; Fri, 24 Apr 2009 05:28:44 +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 C7D798FC19; Fri, 24 Apr 2009 05:28:44 +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 n3O5SiL3009469; Fri, 24 Apr 2009 05:28:44 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3O5Sih7009468; Fri, 24 Apr 2009 05:28:44 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904240528.n3O5Sih7009468@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 24 Apr 2009 05:28: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: r191453 - 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: Fri, 24 Apr 2009 05:28:45 -0000 Author: gonzo Date: Fri Apr 24 05:28:44 2009 New Revision: 191453 URL: http://svn.freebsd.org/changeset/base/191453 Log: Fix cut'n'paste code. cfg3 should get the value of selector 3 Spotted by: thompa@ Modified: projects/mips/sys/mips/mips/cpu.c Modified: projects/mips/sys/mips/mips/cpu.c ============================================================================== --- projects/mips/sys/mips/mips/cpu.c Fri Apr 24 04:18:16 2009 (r191452) +++ projects/mips/sys/mips/mips/cpu.c Fri Apr 24 05:28:44 2009 (r191453) @@ -242,7 +242,7 @@ cpu_identify(void) /* If config register selection 3 does not exist, exit. */ if (!(cfg2 & MIPS3_CONFIG_CM)) return; - cfg3 = mips_rd_config_sel2(); + cfg3 = mips_rd_config_sel3(); /* Print Config3 if it contains any useful info */ if (cfg3 & ~(0x80000000)) From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 10:18:07 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 6542E106564A; Fri, 24 Apr 2009 10:18:07 +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 5461E8FC12; Fri, 24 Apr 2009 10:18:07 +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 n3OAI7oc015089; Fri, 24 Apr 2009 10:18:07 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OAI7Af015088; Fri, 24 Apr 2009 10:18:07 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241018.n3OAI7Af015088@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 10:18:07 +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: r191458 - 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: Fri, 24 Apr 2009 10:18:07 -0000 Author: rpaulo Date: Fri Apr 24 10:18:06 2009 New Revision: 191458 URL: http://svn.freebsd.org/changeset/base/191458 Log: Add MBSS to the scan mod names. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_scan.c Modified: projects/mesh11s/sys/net80211/ieee80211_scan.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan.c Fri Apr 24 09:58:50 2009 (r191457) +++ projects/mesh11s/sys/net80211/ieee80211_scan.c Fri Apr 24 10:18:06 2009 (r191458) @@ -197,6 +197,7 @@ static const char *scan_modnames[IEEE802 "wlan_scan_sta", /* IEEE80211_M_AHDEMO */ "wlan_scan_ap", /* IEEE80211_M_HOSTAP */ "wlan_scan_monitor", /* IEEE80211_M_MONITOR */ + "wlan_scan_sta", /* IEEE80211_M_MBSS */ }; static const struct ieee80211_scanner *scanners[IEEE80211_OPMODE_MAX]; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 10:19: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 59B40106564A; Fri, 24 Apr 2009 10:19:26 +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 47A3D8FC0C; Fri, 24 Apr 2009 10:19:26 +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 n3OAJQo9015148; Fri, 24 Apr 2009 10:19:26 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OAJQhT015146; Fri, 24 Apr 2009 10:19:26 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241019.n3OAJQhT015146@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 10:19: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: r191459 - 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: Fri, 24 Apr 2009 10:19:26 -0000 Author: rpaulo Date: Fri Apr 24 10:19:25 2009 New Revision: 191459 URL: http://svn.freebsd.org/changeset/base/191459 Log: Use a bunch of code from the IBSS operation to process input and management frames. Due to this, add Sam's copyright. Initial work on scanning mesh nodes. It works just like IBSS for now, but will needed to be changed later. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 10:18:06 2009 (r191458) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 10:19:25 2009 (r191459) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting * Copyright (c) 2009 The FreeBSD Foundation * All rights reserved. * @@ -125,6 +126,33 @@ mesh_newstate(struct ieee80211vap *vap, case IEEE80211_S_SCAN: switch (ostate) { case IEEE80211_S_INIT: + if (vap->iv_des_chan != IEEE80211_CHAN_ANYC && + !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) { + /* + * Already have a channel; bypass the + * scan and startup immediately. + */ + /* ieee80211_create_mesh(vap, vap->iv_des_chan); */ + break; + } + /* + * Initiate a scan. We can come here as a result + * of an IEEE80211_IOC_SCAN_REQ too in which case + * the vap will be marked with IEEE80211_FEXT_SCANREQ + * and the scan request parameters will be present + * in iv_scanreq. Otherwise we do the default. + */ + if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) { + ieee80211_check_scan(vap, + vap->iv_scanreq_flags, + vap->iv_scanreq_duration, + vap->iv_scanreq_mindwell, + vap->iv_scanreq_maxdwell, + vap->iv_scanreq_nssid, vap->iv_scanreq_ssid); + vap->iv_flags_ext &= ~IEEE80211_FEXT_SCANREQ; + } else + ieee80211_check_scan_current(vap); + break; default: break; } @@ -141,12 +169,128 @@ mesh_newstate(struct ieee80211vap *vap, return 0; } +/* + * Decide if a received management frame should be + * printed when debugging is enabled. This filters some + * of the less interesting frames that come frequently + * (e.g. beacons). + */ +static __inline int +doprint(struct ieee80211vap *vap, int subtype) +{ + switch (subtype) { + case IEEE80211_FC0_SUBTYPE_BEACON: + return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN); + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + return 1; + } + return 1; +} + static int mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise, uint32_t rstamp) { + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = vap->iv_ifp; + struct ieee80211_frame *wh; + int need_tap; + uint8_t dir, type, subtype; - return 0; + KASSERT(ni != NULL, ("null node")); + ni->ni_inact = ni->ni_inact_reload; + + need_tap = 1; /* mbuf need to be tapped. */ + type = -1; /* undefined */ + + if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, + ni->ni_macaddr, NULL, + "too short (1): len %u", m->m_pkthdr.len); + vap->iv_stats.is_rx_tooshort++; + goto out; + } + /* + * Bit of a cheat here, we use a pointer for a 3-address + * frame format but don't reference fields past outside + * ieee80211_frame_min w/o first validating the data is + * present. + */ + wh = mtod(m, struct ieee80211_frame *); + + if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != + IEEE80211_FC0_VERSION_0) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, + ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]); + vap->iv_stats.is_rx_badversion++; + goto err; + } + + dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; + type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; + subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; + if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { + } + + switch (type) { + case IEEE80211_FC0_TYPE_DATA: + case IEEE80211_FC0_TYPE_MGT: + vap->iv_stats.is_rx_mgmt++; + IEEE80211_NODE_STAT(ni, rx_mgmt); + if (dir != IEEE80211_FC1_DIR_NODS) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, "data", "incorrect dir 0x%x", dir); + vap->iv_stats.is_rx_wrongdir++; + goto err; + } + if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, + ni->ni_macaddr, "mgt", "too short: len %u", + m->m_pkthdr.len); + vap->iv_stats.is_rx_tooshort++; + goto out; + } +#ifdef IEEE80211_DEBUG + if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) || + ieee80211_msg_dumppkts(vap)) { + if_printf(ifp, "received %s from %s rssi %d\n", + ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + ether_sprintf(wh->i_addr2), rssi); + } +#endif + if (wh->i_fc[1] & IEEE80211_FC1_WEP) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "WEP set but not permitted"); + vap->iv_stats.is_rx_mgtdiscard++; /* XXX */ + goto out; + } + if (bpf_peers_present(vap->iv_rawbpf)) + bpf_mtap(vap->iv_rawbpf, m); + vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp); + m_freem(m); + return IEEE80211_FC0_TYPE_MGT; + + case IEEE80211_FC0_TYPE_CTL: + vap->iv_stats.is_rx_ctl++; + IEEE80211_NODE_STAT(ni, rx_ctrl); + goto out; + default: + IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, + wh, "bad", "frame type 0x%x", type); + /* should not come here */ + break; + } +err: + ifp->if_ierrors++; +out: + if (m != NULL) { + if (bpf_peers_present(vap->iv_rawbpf) && need_tap) + bpf_mtap(vap->iv_rawbpf, m); + m_freem(m); + } + return type; } @@ -154,8 +298,8 @@ static void mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, int rssi, int noise, uint32_t rstamp) { - /*struct ieee80211vap *vap = ni->ni_vap; - struct ieee80211com *ic = ni->ni_ic;*/ + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; struct ieee80211_frame *wh; uint8_t *frm, *efrm; @@ -168,15 +312,63 @@ mesh_recv_mgmt(struct ieee80211_node *ni { struct ieee80211_scanparams scan; - /* Parse beacons to discover mesh neighbours */ + /* + * We process beacon/probe response + * frames to discover neighbors. + */ if (ieee80211_parse_beacon(ni, m0, &scan) != 0) return; + /* + * Count frame now that we know it's to be processed. + */ + if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) { + vap->iv_stats.is_rx_beacon++; /* XXX remove */ + IEEE80211_NODE_STAT(ni, rx_beacons); + } else + IEEE80211_NODE_STAT(ni, rx_proberesp); + /* + * If scanning, just pass information to the scan module. + */ + if (ic->ic_flags & IEEE80211_F_SCAN) { + if (ic->ic_flags_ext & IEEE80211_FEXT_PROBECHAN) { + /* + * Actively scanning a channel marked passive; + * send a probe request now that we know there + * is 802.11 traffic present. + * + * XXX check if the beacon we recv'd gives + * us what we need and suppress the probe req + */ + ieee80211_probe_curchan(vap, 1); + ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN; + } + ieee80211_add_scan(vap, &scan, wh, + subtype, rssi, noise, rstamp); + return; + } break; } + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + break; + case IEEE80211_FC0_SUBTYPE_ACTION: + break; + case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: + case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: + case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_DEAUTH: + case IEEE80211_FC0_SUBTYPE_DISASSOC: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); + vap->iv_stats.is_rx_mgtdiscard++; + return; default: + IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, + wh, "mgt", "subtype 0x%x not handled", subtype); + vap->iv_stats.is_rx_badsubtype++; break; } - } Modified: projects/mesh11s/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 10:18:06 2009 (r191458) +++ projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 10:19:25 2009 (r191459) @@ -112,21 +112,22 @@ static void sta_flush_table(struct sta_t * contents explains why. The following flags are or'd to to this * mask and can be used to figure out why the entry was rejected. */ -#define MATCH_CHANNEL 0x0001 /* channel mismatch */ -#define MATCH_CAPINFO 0x0002 /* capabilities mismatch, e.g. no ess */ -#define MATCH_PRIVACY 0x0004 /* privacy mismatch */ -#define MATCH_RATE 0x0008 /* rate set mismatch */ -#define MATCH_SSID 0x0010 /* ssid mismatch */ -#define MATCH_BSSID 0x0020 /* bssid mismatch */ -#define MATCH_FAILS 0x0040 /* too many failed auth attempts */ -#define MATCH_NOTSEEN 0x0080 /* not seen in recent scans */ -#define MATCH_RSSI 0x0100 /* rssi deemed too low to use */ -#define MATCH_CC 0x0200 /* country code mismatch */ -#define MATCH_TDMA_NOIE 0x0400 /* no TDMA ie */ -#define MATCH_TDMA_NOTMASTER 0x0800 /* not TDMA master */ -#define MATCH_TDMA_NOSLOT 0x1000 /* all TDMA slots occupied */ -#define MATCH_TDMA_LOCAL 0x2000 /* local address */ -#define MATCH_TDMA_VERSION 0x4000 /* protocol version mismatch */ +#define MATCH_CHANNEL 0x00001 /* channel mismatch */ +#define MATCH_CAPINFO 0x00002 /* capabilities mismatch, e.g. no ess */ +#define MATCH_PRIVACY 0x00004 /* privacy mismatch */ +#define MATCH_RATE 0x00008 /* rate set mismatch */ +#define MATCH_SSID 0x00010 /* ssid mismatch */ +#define MATCH_BSSID 0x00020 /* bssid mismatch */ +#define MATCH_FAILS 0x00040 /* too many failed auth attempts */ +#define MATCH_NOTSEEN 0x00080 /* not seen in recent scans */ +#define MATCH_RSSI 0x00100 /* rssi deemed too low to use */ +#define MATCH_CC 0x00200 /* country code mismatch */ +#define MATCH_TDMA_NOIE 0x00400 /* no TDMA ie */ +#define MATCH_TDMA_NOTMASTER 0x00800 /* not TDMA master */ +#define MATCH_TDMA_NOSLOT 0x01000 /* all TDMA slots occupied */ +#define MATCH_TDMA_LOCAL 0x02000 /* local address */ +#define MATCH_TDMA_VERSION 0x04000 /* protocol version mismatch */ +#define MATCH_MESH_ID 0x10000 /* no MESH ID ie */ static int match_bss(struct ieee80211vap *, const struct ieee80211_scan_state *, struct sta_entry *, int); static void adhoc_age(struct ieee80211_scan_state *); @@ -989,6 +990,16 @@ match_bss(struct ieee80211vap *vap, #endif } #endif /* IEEE80211_SUPPORT_TDMA */ + } else if (vap->iv_opmode == IEEE80211_M_MBSS) { + /* + * We are only interested in finding non IBSS/ESS nodes. + */ + if (se->se_capinfo & (IEEE80211_CAPINFO_IBSS|IEEE80211_CAPINFO_ESS)) + fail |= MATCH_CAPINFO; + + if (vap->iv_caps & IEEE80211_C_MBSS) { + /* TBD */ + } } else { if ((se->se_capinfo & IEEE80211_CAPINFO_ESS) == 0) fail |= MATCH_CAPINFO; @@ -1073,6 +1084,7 @@ match_bss(struct ieee80211vap *vap, fail & MATCH_TDMA_NOSLOT ? 'f' : fail & MATCH_TDMA_LOCAL ? 'l' : #endif + fail & MATCH_MESH_ID ? 'm' : fail ? '-' : '+', ether_sprintf(se->se_macaddr)); printf(" %s%c", ether_sprintf(se->se_bssid), fail & MATCH_BSSID ? '!' : ' '); @@ -1517,7 +1529,8 @@ adhoc_pick_bss(struct ieee80211_scan_sta struct ieee80211_channel *chan; KASSERT(vap->iv_opmode == IEEE80211_M_IBSS || - vap->iv_opmode == IEEE80211_M_AHDEMO, + vap->iv_opmode == IEEE80211_M_AHDEMO || + vap->iv_opmode == IEEE80211_M_MBSS, ("wrong opmode %u", vap->iv_opmode)); if (st->st_newscan) { @@ -1785,6 +1798,23 @@ static const struct ieee80211_scanner ap .scan_assoc_fail = sta_assoc_fail, }; +static const struct ieee80211_scanner mesh_default = { + .scan_name = "default", + .scan_attach = sta_attach, + .scan_detach = sta_detach, + .scan_start = adhoc_start, + .scan_restart = sta_restart, + .scan_cancel = sta_cancel, + .scan_end = adhoc_pick_bss, + .scan_flush = sta_flush, + .scan_pickchan = adhoc_pick_channel, + .scan_add = sta_add, + .scan_age = adhoc_age, + .scan_iterate = sta_iterate, + .scan_assoc_fail = sta_assoc_fail, + .scan_assoc_success = sta_assoc_success, +}; + /* * Module glue. */ @@ -1793,3 +1823,4 @@ IEEE80211_SCANNER_ALG(sta, IEEE80211_M_S IEEE80211_SCANNER_ALG(ibss, IEEE80211_M_IBSS, adhoc_default); IEEE80211_SCANNER_ALG(ahdemo, IEEE80211_M_AHDEMO, adhoc_default); IEEE80211_SCANNER_ALG(ap, IEEE80211_M_HOSTAP, ap_default); +IEEE80211_SCANNER_ALG(mesh, IEEE80211_M_MBSS, mesh_default); From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 10:27:58 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 0CFC8106564A; Fri, 24 Apr 2009 10:27:58 +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 EF6AC8FC0C; Fri, 24 Apr 2009 10:27:57 +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 n3OARviv015350; Fri, 24 Apr 2009 10:27:57 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OARvhv015348; Fri, 24 Apr 2009 10:27:57 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241027.n3OARvhv015348@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 10:27:57 +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: r191460 - 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: Fri, 24 Apr 2009 10:27:58 -0000 Author: rpaulo Date: Fri Apr 24 10:27:57 2009 New Revision: 191460 URL: http://svn.freebsd.org/changeset/base/191460 Log: Don't polute ieee80211.h with mesh definitions. We have ieee80211_mesh.h just for that. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211.h projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211.h Fri Apr 24 10:19:25 2009 (r191459) +++ projects/mesh11s/sys/net80211/ieee80211.h Fri Apr 24 10:27:57 2009 (r191460) @@ -775,264 +775,6 @@ 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_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 */ - uint8_t id_len; -} __packed; - -#define IEEE80211_MESHID_MAX_SIZE \ - (sizeof(struct ieee80211_meshid_ie) + IEEE80211_NWID_LEN) - -/* 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 */ Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 10:19:25 2009 (r191459) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 10:27:57 2009 (r191460) @@ -31,6 +31,265 @@ #ifndef _NET80211_IEEE80211_MESH_H_ #define _NET80211_IEEE80211_MESH_H_ +/* + * 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_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 */ + uint8_t id_len; +} __packed; + +#define IEEE80211_MESHID_MAX_SIZE \ + (sizeof(struct ieee80211_meshid_ie) + IEEE80211_NWID_LEN) + +/* 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; + + void ieee80211_mesh_attach(struct ieee80211com *); void ieee80211_mesh_detach(struct ieee80211com *); From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 10:31:41 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 058AE1065672; Fri, 24 Apr 2009 10:31:40 +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 8CB338FC2E; Fri, 24 Apr 2009 10:31:40 +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 n3OAVeZT019967; Fri, 24 Apr 2009 10:31:40 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OAVebH019966; Fri, 24 Apr 2009 10:31:40 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241031.n3OAVebH019966@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 10:31:40 +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: r191461 - 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: Fri, 24 Apr 2009 10:31:41 -0000 Author: rpaulo Date: Fri Apr 24 10:31:40 2009 New Revision: 191461 URL: http://svn.freebsd.org/changeset/base/191461 Log: Replace IEEE80211_MESHID_MAX_SIZE with IEEE80211_MESHID_LEN, which makes more sense. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 10:27:57 2009 (r191460) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 10:31:40 2009 (r191461) @@ -63,8 +63,7 @@ struct ieee80211_meshid_ie { uint8_t id_len; } __packed; -#define IEEE80211_MESHID_MAX_SIZE \ - (sizeof(struct ieee80211_meshid_ie) + IEEE80211_NWID_LEN) +#define IEEE80211_MESHID_LEN IEEE80211_NWID_LEN /* Link Metric Report */ struct ieee80211_meshlink_ie { From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 11:20:15 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 B5BB7106566C; Fri, 24 Apr 2009 11:20:15 +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 A48908FC1B; Fri, 24 Apr 2009 11:20:15 +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 n3OBKFSS020942; Fri, 24 Apr 2009 11:20:15 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OBKFmd020940; Fri, 24 Apr 2009 11:20:15 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241120.n3OBKFmd020940@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 11:20:15 +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: r191462 - 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: Fri, 24 Apr 2009 11:20:16 -0000 Author: rpaulo Date: Fri Apr 24 11:20:15 2009 New Revision: 191462 URL: http://svn.freebsd.org/changeset/base/191462 Log: Parse mesh id IE. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_node.c projects/mesh11s/sys/net80211/ieee80211_node.h Modified: projects/mesh11s/sys/net80211/ieee80211_node.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 10:31:40 2009 (r191461) +++ projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 11:20:15 2009 (r191462) @@ -772,6 +772,8 @@ ieee80211_sta_join(struct ieee80211vap * if (ni->ni_ies.tdma_ie != NULL) ieee80211_parse_tdma(ni, ni->ni_ies.tdma_ie); #endif + if (ni->ni_ies.meshid_ie != NULL) + ieee80211_parse_meshid(ni, ni->ni_ies.meshid_ie); } vap->iv_dtim_period = se->se_dtimperiod; @@ -898,6 +900,9 @@ ieee80211_ies_expand(struct ieee80211_ie case IEEE80211_ELEMID_HTCAP: ies->htcap_ie = ie; break; + case IEEE80211_ELEMID_MESHID: + ies->meshid_ie = ie; + break; } ielen -= 2 + ie[1]; ie += 2 + ie[1]; Modified: projects/mesh11s/sys/net80211/ieee80211_node.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 10:31:40 2009 (r191461) +++ projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 11:20:15 2009 (r191462) @@ -81,6 +81,7 @@ struct ieee80211_ies { uint8_t *htcap_ie; /* captured HTCAP ie */ uint8_t *htinfo_ie; /* captured HTINFO ie */ uint8_t *tdma_ie; /* captured TDMA ie */ + uint8_t *meshid_ie; /* captured MESH ID ie */ /* NB: these must be the last members of this structure */ uint8_t *data; /* frame data > 802.11 header */ int len; /* data size in bytes */ From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 11:23:21 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 DAB4C1065673; Fri, 24 Apr 2009 11:23:21 +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 C9D708FC1C; Fri, 24 Apr 2009 11:23:21 +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 n3OBNLxk021041; Fri, 24 Apr 2009 11:23:21 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OBNLPD021039; Fri, 24 Apr 2009 11:23:21 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241123.n3OBNLPD021039@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 11:23:21 +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: r191463 - 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: Fri, 24 Apr 2009 11:23:22 -0000 Author: rpaulo Date: Fri Apr 24 11:23:21 2009 New Revision: 191463 URL: http://svn.freebsd.org/changeset/base/191463 Log: Initial implementation of ieee80211_parse_meshid(). 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 Fri Apr 24 11:20:15 2009 (r191462) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 11:23:21 2009 (r191463) @@ -370,7 +370,29 @@ mesh_recv_mgmt(struct ieee80211_node *ni break; } } +/* + * Parse a MESH ID ie on station join. + */ +void +ieee80211_parse_meshid(struct ieee80211_node *ni, const uint8_t *ie) +{ + struct ieee80211vap *vap = ni->ni_vap; + if (vap->iv_caps & IEEE80211_C_MBSS) { + const struct ieee80211_meshid_ie *meshid = + (const struct ieee80211_meshid_ie *)ie; + + /* + * Propagate capabilities based on the local + * configuration and the remote station's advertised + * capabilities. In particular this permits us to + * enable use of QoS to disable ACK's. + */ + if ((vap->iv_flags & IEEE80211_F_WME) && + ni->ni_ies.wme_ie != NULL) + ni->ni_flags |= IEEE80211_NODE_QOS; + } +} static int mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 11:20:15 2009 (r191462) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 11:23:21 2009 (r191463) @@ -291,5 +291,6 @@ struct ieee80211_meshact_ie { void ieee80211_mesh_attach(struct ieee80211com *); void ieee80211_mesh_detach(struct ieee80211com *); +void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); #endif /* !_NET80211_IEEE80211_MESH_H_ */ From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 13: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 19CEC1065672; Fri, 24 Apr 2009 13:28:26 +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 08E188FC1F; Fri, 24 Apr 2009 13:28:26 +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 n3ODSP65023392; Fri, 24 Apr 2009 13:28:25 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3ODSPqW023391; Fri, 24 Apr 2009 13:28:25 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241328.n3ODSPqW023391@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 13:28:25 +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: r191465 - 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: Fri, 24 Apr 2009 13:28:26 -0000 Author: rpaulo Date: Fri Apr 24 13:28:25 2009 New Revision: 191465 URL: http://svn.freebsd.org/changeset/base/191465 Log: Mesh stations require QoS, so we mark ni_flags as such. Pointed out by: sam Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 11:34:59 2009 (r191464) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 13:28:25 2009 (r191465) @@ -383,14 +383,9 @@ ieee80211_parse_meshid(struct ieee80211_ (const struct ieee80211_meshid_ie *)ie; /* - * Propagate capabilities based on the local - * configuration and the remote station's advertised - * capabilities. In particular this permits us to - * enable use of QoS to disable ACK's. + * Mesh STAs are QoS stations, so QoS is not optional. */ - if ((vap->iv_flags & IEEE80211_F_WME) && - ni->ni_ies.wme_ie != NULL) - ni->ni_flags |= IEEE80211_NODE_QOS; + ni->ni_flags |= IEEE80211_NODE_QOS; } } From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 14:22:09 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 EED3A106564A; Fri, 24 Apr 2009 14:22:09 +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 DC9F38FC0A; Fri, 24 Apr 2009 14:22:09 +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 n3OEM9q9024416; Fri, 24 Apr 2009 14:22:09 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OEM9Tc024411; Fri, 24 Apr 2009 14:22:09 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241422.n3OEM9Tc024411@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 14:22:09 +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: r191466 - 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: Fri, 24 Apr 2009 14:22:10 -0000 Author: rpaulo Date: Fri Apr 24 14:22:09 2009 New Revision: 191466 URL: http://svn.freebsd.org/changeset/base/191466 Log: Initial work on adding mesh ID IE on beacon construction. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_node.c projects/mesh11s/sys/net80211/ieee80211_output.c projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 14:22:09 2009 (r191466) @@ -379,8 +379,8 @@ ieee80211_parse_meshid(struct ieee80211_ struct ieee80211vap *vap = ni->ni_vap; if (vap->iv_caps & IEEE80211_C_MBSS) { - const struct ieee80211_meshid_ie *meshid = - (const struct ieee80211_meshid_ie *)ie; + /*const struct ieee80211_meshid_ie *meshid = + (const struct ieee80211_meshid_ie *)ie;*/ /* * Mesh STAs are QoS stations, so QoS is not optional. @@ -389,6 +389,29 @@ ieee80211_parse_meshid(struct ieee80211_ } } +/* + * Add a MESH ID element to a frame. + */ +uint8_t * +ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap) +{ + struct ieee80211_meshid_ie ie = { + .id_ie = IEEE80211_ELEMID_MESHID, + .id_len = sizeof(struct ieee80211_meshid_ie) + + vap->iv_meshidlen, + }; + + KASSERT(vap->iv_caps & IEEE80211_C_MBSS, + ("not a mbss vap, caps 0x%x", vap->iv_caps)); + + memcpy(frm, &ie, sizeof(ie)); + frm += sizeof(struct ieee80211_meshid_ie); + memcpy(frm, vap->iv_meshid, vap->iv_meshidlen); + frm += vap->iv_meshidlen; + + return frm; +} + static int mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 14:22:09 2009 (r191466) @@ -289,8 +289,9 @@ struct ieee80211_meshact_ie { } __packed; -void ieee80211_mesh_attach(struct ieee80211com *); -void ieee80211_mesh_detach(struct ieee80211com *); -void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); +void ieee80211_mesh_attach(struct ieee80211com *); +void ieee80211_mesh_detach(struct ieee80211com *); +void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); +uint8_t * ieee80211_add_meshid(uint8_t *, struct ieee80211vap *); #endif /* !_NET80211_IEEE80211_MESH_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_node.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_node.c Fri Apr 24 14:22:09 2009 (r191466) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #include Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Fri Apr 24 14:22:09 2009 (r191466) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #ifdef INET #include @@ -2331,6 +2332,8 @@ ieee80211_beacon_construct(struct mbuf * * XXX Vendor-specific OIDs (e.g. Atheros) * [tlv] WPA parameters * [tlv] WME parameters + * [tlv] MESH ID + * [tlv] MESH configuration * [tlv] Vendor OUI HT capabilities (optional) * [tlv] Vendor OUI HT information (optional) * [tlv] Atheros capabilities (optional) @@ -2441,6 +2444,9 @@ ieee80211_beacon_construct(struct mbuf * bo->bo_appie_len = vap->iv_appie_beacon->ie_len; frm = add_appie(frm, vap->iv_appie_beacon); } + if (vap->iv_opmode == IEEE80211_M_MBSS) { + frm = ieee80211_add_meshid(frm, vap); + } bo->bo_tim_trailer_len = frm - bo->bo_tim_trailer; bo->bo_csa_trailer_len = frm - bo->bo_csa; m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); @@ -2642,6 +2648,9 @@ ieee80211_beacon_update(struct ieee80211 ieee80211_tdma_update_beacon(vap, bo); } #endif + if (vap->iv_opmode == IEEE80211_M_MBSS) { + /*ieee80211_mesh_update_beacon(vap, bo);*/ + } if (vap->iv_opmode == IEEE80211_M_HOSTAP) { /* NB: no IBSS support*/ struct ieee80211_tim_ie *tie = (struct ieee80211_tim_ie *) bo->bo_tim; Modified: projects/mesh11s/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 13:28:25 2009 (r191465) +++ projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Apr 24 14:22:09 2009 (r191466) @@ -992,13 +992,14 @@ match_bss(struct ieee80211vap *vap, #endif /* IEEE80211_SUPPORT_TDMA */ } else if (vap->iv_opmode == IEEE80211_M_MBSS) { /* - * We are only interested in finding non IBSS/ESS nodes. + * Mesh nodes have IBSS & ESS bits in capinfo turned off. */ if (se->se_capinfo & (IEEE80211_CAPINFO_IBSS|IEEE80211_CAPINFO_ESS)) fail |= MATCH_CAPINFO; if (vap->iv_caps & IEEE80211_C_MBSS) { - /* TBD */ + /*const struct ieee80211_meshid_ie *meshid = + (const struct ieee80211_meshid_ie *)se->se_ies.meshid_ie;*/ } } else { if ((se->se_capinfo & IEEE80211_CAPINFO_ESS) == 0) From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 18:39:11 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 B9EEE106566B; Fri, 24 Apr 2009 18:39:11 +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 A91AB8FC24; Fri, 24 Apr 2009 18:39:11 +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 n3OIdBiP029388; Fri, 24 Apr 2009 18:39:11 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIdBAp029387; Fri, 24 Apr 2009 18:39:11 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241839.n3OIdBAp029387@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 18:39:11 +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: r191470 - 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: Fri, 24 Apr 2009 18:39:12 -0000 Author: rpaulo Date: Fri Apr 24 18:39:11 2009 New Revision: 191470 URL: http://svn.freebsd.org/changeset/base/191470 Log: Simplify add_meshid(). Discussed with: sam Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 17:28:12 2009 (r191469) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 18:39:11 2009 (r191470) @@ -395,17 +395,12 @@ ieee80211_parse_meshid(struct ieee80211_ uint8_t * ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap) { - struct ieee80211_meshid_ie ie = { - .id_ie = IEEE80211_ELEMID_MESHID, - .id_len = sizeof(struct ieee80211_meshid_ie) + - vap->iv_meshidlen, - }; KASSERT(vap->iv_caps & IEEE80211_C_MBSS, ("not a mbss vap, caps 0x%x", vap->iv_caps)); - memcpy(frm, &ie, sizeof(ie)); - frm += sizeof(struct ieee80211_meshid_ie); + *frm++ = IEEE80211_ELEMID_MESHID; + *frm++ = sizeof(struct ieee80211_meshid_ie) + vap->iv_meshidlen; memcpy(frm, vap->iv_meshid, vap->iv_meshidlen); frm += vap->iv_meshidlen; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 18:47: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 AE9F71065687; Fri, 24 Apr 2009 18:47: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 9DC198FC13; Fri, 24 Apr 2009 18:47:18 +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 n3OIlIwC029575; Fri, 24 Apr 2009 18:47:18 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIlI6D029573; Fri, 24 Apr 2009 18:47:18 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241847.n3OIlI6D029573@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 18:47:18 +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: r191471 - 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: Fri, 24 Apr 2009 18:47:19 -0000 Author: rpaulo Date: Fri Apr 24 18:47:18 2009 New Revision: 191471 URL: http://svn.freebsd.org/changeset/base/191471 Log: Use IEEE80211_MESHID_LEN for consistency. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_scan.h projects/mesh11s/sys/net80211/ieee80211_var.h Modified: projects/mesh11s/sys/net80211/ieee80211_scan.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan.h Fri Apr 24 18:39:11 2009 (r191470) +++ projects/mesh11s/sys/net80211/ieee80211_scan.h Fri Apr 24 18:47:18 2009 (r191471) @@ -242,7 +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]; + uint8_t se_meshid[2+IEEE80211_MESHID_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_var.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_var.h Fri Apr 24 18:39:11 2009 (r191470) +++ projects/mesh11s/sys/net80211/ieee80211_var.h Fri Apr 24 18:47:18 2009 (r191471) @@ -372,7 +372,7 @@ struct ieee80211vap { /* set/unset aid pwrsav state */ int iv_csa_count; /* count for doing CSA */ int iv_meshidlen; - uint8_t iv_meshid[IEEE80211_NWID_LEN]; + uint8_t iv_meshid[IEEE80211_MESHID_LEN]; struct ieee80211_node *iv_bss; /* information for this node */ struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX]; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 18:48:39 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 D4E05106564A; Fri, 24 Apr 2009 18:48:39 +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 C3F898FC16; Fri, 24 Apr 2009 18:48:39 +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 n3OImdio029633; Fri, 24 Apr 2009 18:48:39 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OImdDf029631; Fri, 24 Apr 2009 18:48:39 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241848.n3OImdDf029631@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 18:48: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: r191472 - 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: Fri, 24 Apr 2009 18:48:40 -0000 Author: rpaulo Date: Fri Apr 24 18:48:39 2009 New Revision: 191472 URL: http://svn.freebsd.org/changeset/base/191472 Log: Add prototype for create_mbss(). 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 Fri Apr 24 18:47:18 2009 (r191471) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 18:48:39 2009 (r191472) @@ -407,6 +407,18 @@ ieee80211_add_meshid(uint8_t *frm, struc return frm; } +void +ieee80211_create_mbss(struct ieee80211vap *vap, struct ieee80211_channel *chan) +{ + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: creating mbss on channel %u\n", __func__, + ieee80211_chan2ieee(ic, chan)); + +} + static int mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 18:47:18 2009 (r191471) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Apr 24 18:48:39 2009 (r191472) @@ -293,5 +293,7 @@ void ieee80211_mesh_attach(struct ieee8 void ieee80211_mesh_detach(struct ieee80211com *); void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *); uint8_t * ieee80211_add_meshid(uint8_t *, struct ieee80211vap *); +void ieee80211_create_mbss(struct ieee80211vap *, struct + ieee80211_channel *); #endif /* !_NET80211_IEEE80211_MESH_H_ */ From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 18:50:49 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 CE742106566C; Fri, 24 Apr 2009 18:50:49 +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 BD7FD8FC15; Fri, 24 Apr 2009 18:50:49 +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 n3OIon94029711; Fri, 24 Apr 2009 18:50:49 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIonZR029710; Fri, 24 Apr 2009 18:50:49 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241850.n3OIonZR029710@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 18:50:49 +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: r191473 - 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: Fri, 24 Apr 2009 18:50:50 -0000 Author: rpaulo Date: Fri Apr 24 18:50:49 2009 New Revision: 191473 URL: http://svn.freebsd.org/changeset/base/191473 Log: ieee80211_add_meshid(): actually, what we want to assert is that it's a MBSS vap. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 18:48:39 2009 (r191472) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Apr 24 18:50:49 2009 (r191473) @@ -396,8 +396,7 @@ uint8_t * ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap) { - KASSERT(vap->iv_caps & IEEE80211_C_MBSS, - ("not a mbss vap, caps 0x%x", vap->iv_caps)); + KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a mbss vap")); *frm++ = IEEE80211_ELEMID_MESHID; *frm++ = sizeof(struct ieee80211_meshid_ie) + vap->iv_meshidlen; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 18:51: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 DFC7F1065679; Fri, 24 Apr 2009 18:51: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 CF2AA8FC18; Fri, 24 Apr 2009 18:51: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 n3OIpOkQ029760; Fri, 24 Apr 2009 18:51:24 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIpOtJ029759; Fri, 24 Apr 2009 18:51:24 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241851.n3OIpOtJ029759@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 18:51: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: r191474 - 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: Fri, 24 Apr 2009 18:51:25 -0000 Author: rpaulo Date: Fri Apr 24 18:51:24 2009 New Revision: 191474 URL: http://svn.freebsd.org/changeset/base/191474 Log: Add meshid information to struct ieee80211node. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_node.h Modified: projects/mesh11s/sys/net80211/ieee80211_node.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 18:50:49 2009 (r191473) +++ projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 18:51:24 2009 (r191474) @@ -163,6 +163,8 @@ struct ieee80211_node { uint16_t ni_capinfo; /* capabilities */ uint8_t ni_esslen; uint8_t ni_essid[IEEE80211_NWID_LEN]; + uint8_t ni_meshidlen; + uint8_t ni_meshid[IEEE80211_MESHID_LEN]; struct ieee80211_rateset ni_rates; /* negotiated rate set */ struct ieee80211_channel *ni_chan; uint16_t ni_fhdwell; /* FH only */ From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 19:05: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 3DB78106566C; Fri, 24 Apr 2009 19:05:23 +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 2CDBB8FC16; Fri, 24 Apr 2009 19:05:23 +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 n3OJ5NpN030068; Fri, 24 Apr 2009 19:05:23 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OJ5NFR030067; Fri, 24 Apr 2009 19:05:23 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904241905.n3OJ5NFR030067@svn.freebsd.org> From: Rui Paulo Date: Fri, 24 Apr 2009 19:05: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: r191475 - 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: Fri, 24 Apr 2009 19:05:23 -0000 Author: rpaulo Date: Fri Apr 24 19:05:22 2009 New Revision: 191475 URL: http://svn.freebsd.org/changeset/base/191475 Log: Need to include ieee80211_mesh.h for this to work. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_node.h Modified: projects/mesh11s/sys/net80211/ieee80211_node.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 18:51:24 2009 (r191474) +++ projects/mesh11s/sys/net80211/ieee80211_node.h Fri Apr 24 19:05:22 2009 (r191475) @@ -30,6 +30,7 @@ #include /* for ieee80211_nodestats */ #include /* for aggregation state */ +#include /* for mesh defines */ /* * Each ieee80211com instance has a single timer that fires every From owner-svn-src-projects@FreeBSD.ORG Sat Apr 25 10:19: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 9CB03106566C; Sat, 25 Apr 2009 10:19:36 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A2CB8FC1A; Sat, 25 Apr 2009 10:19:36 +0000 (UTC) (envelope-from pho@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 n3PAJaI0050452; Sat, 25 Apr 2009 10:19:36 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3PAJa32050449; Sat, 25 Apr 2009 10:19:36 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200904251019.n3PAJa32050449@svn.freebsd.org> From: Peter Holm Date: Sat, 25 Apr 2009 10:19:36 +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: r191485 - projects/stress2/misc 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: Sat, 25 Apr 2009 10:19:36 -0000 Author: pho Date: Sat Apr 25 10:19:36 2009 New Revision: 191485 URL: http://svn.freebsd.org/changeset/base/191485 Log: Added test scenarios by tegge, used in connection with the r191315 fix. Added: projects/stress2/misc/rename.sh (contents, props changed) projects/stress2/misc/rename2.sh (contents, props changed) projects/stress2/misc/rename3.sh (contents, props changed) Added: projects/stress2/misc/rename.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/rename.sh Sat Apr 25 10:19:36 2009 (r191485) @@ -0,0 +1,121 @@ +#!/bin/sh + +# +# Copyright (c) 2009 Peter Holm +# 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$ +# + +# Test race between ISDOTDOT lookups and directory removal/rename + +# With lookup_shared=1 rename() will fail from time to time with ENOENT and +# the following stat() will succed. + +# Test scenario by tegge + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > rename.c +cc -o rename -Wall rename.c +rm -f rename.c +cd $here + +rm -rf /tmp/rename.dir.* +for i in `jot 10`; do + for j in `jot 10`; do + /tmp/rename & + done + for j in `jot 10`; do + wait + done +done +rm -rf /tmp/rename.dir.* +exit 0 +EOF +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static char dir1[128]; +static char dir2[128]; + +int +main(int argc, char **argv) +{ + int i, status; + struct stat sb; + pid_t p; + + sprintf(dir1, "/tmp/rename.dir.%d", getpid()); + sprintf(dir2, "/tmp/rename.dir.2.%d", getpid()); + if (mkdir(dir1, 0700) == -1) + err(1, "mkdir(%s)", dir1); + + if (chdir(dir1) == -1) + err(1, "chdir(%s)", dir1); + if ((p = fork()) == -1) + err(1, "fork()"); + if (p == 0) { + if (chdir("..") == -1) + err(1, "chdir(%s)", ".."); + for (i = 0; i < 100000; i++) { + if (rename(dir1, dir2) == -1) { + warn("rename(%s, %s)", dir1, dir2); + stat(dir1, &sb); + if (stat(dir1, &sb) == -1) + err(1, "stat(%s)", dir1); + else + errx(1, "stat(%s) succeeded!", dir1); + } + if (rename(dir2, dir1) == -1) { + warn("rename(%s, %s)", dir2, dir1); + stat(dir2, &sb); + if (stat(dir2, &sb) == -1) + err(1, "stat(%s)", dir2); + else + errx(1, "stat(%s) succeeded!", dir2); + } + } + exit(0); + } else { + for (i = 0; i < 100000; i++) { + if (stat("..", &sb) == -1) + err(1, "stat(..)"); + } + } + if (waitpid(p, &status, 0) == -1) + err(1, "waitpid()"); + if (rmdir(dir1) == -1) + err(1, "rmdir(%s)", dir1); + + return (0); +} Added: projects/stress2/misc/rename2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/rename2.sh Sat Apr 25 10:19:36 2009 (r191485) @@ -0,0 +1,102 @@ +#!/bin/sh + +# +# Copyright (c) 2009 Peter Holm +# 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$ +# + +# With lookup_shared=1 rename() will fail from time to time with ENOENT and +# the following stat() will succeed. (Variation of rename.sh) + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > rename.c +cc -o rename -Wall rename.c +rm -f rename.c +cd $here + +rm -rf /tmp/rename.dir.* +for i in `jot 10`; do + for j in `jot 10`; do + /tmp/rename & + done + for j in `jot 10`; do + wait + done +done +rm -rf /tmp/rename.dir.* +exit 0 +EOF +#include +#include +#include +#include +#include +#include +#include +#include + +static char dir1[128]; +static char dir2[128]; + +int +main(int argc, char **argv) +{ + int i; + struct stat sb; + + sprintf(dir1, "/tmp/rename.dir.%d", getpid()); + sprintf(dir2, "/tmp/rename.dir.2.%d", getpid()); + if (mkdir(dir1, 0700) == -1) + err(1, "mkdir(%s)", dir1); + + if (chdir(dir1) == -1) + err(1, "chdir(%s)", dir1); + if (chdir("..") == -1) + err(1, "chdir(%s)", ".."); + + for (i = 0; i < 100000; i++) { + if (rename(dir1, dir2) == -1) { + warn("rename(%s, %s)", dir1, dir2); + if (stat(dir1, &sb) == -1) + err(1, "stat(%s)", dir1); + else + errx(1, "stat(%s) succeeded!", dir1); + } + if (rename(dir2, dir1) == -1) { + warn("rename(%s, %s)", dir2, dir1); + if (stat(dir2, &sb) == -1) + err(1, "stat(%s)", dir2); + else + errx(1, "stat(%s) succeeded!", dir2); + } + } + + if (rmdir(dir1) == -1) + err(1, "rmdir(%s)", dir1); + + return (0); +} Added: projects/stress2/misc/rename3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/rename3.sh Sat Apr 25 10:19:36 2009 (r191485) @@ -0,0 +1,49 @@ +#!/bin/sh + +# +# Copyright (c) 2009 Peter Holm +# 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$ +# + +# Test vulnerability to transient failures when a directory closer +# to the root directory is renamed + +# Test scenario by Tor Egge + +root=/tmp +for i in `jot 10000`; do + rm -rf ${root}/a + mkdir -p ${root}/a/b/c/d/e/f/g + mkdir -p ${root}/a/b/c/d/e/f/z + cd ${root}/a/b/c/d/e/f + ( mv ${root}/a/b/c ${root}/a/c ) & + if ! mv z g/z; then + echo "FAILURE at loop $i" + break + fi + wait +done +rm -rf ${root}/a