From owner-p4-projects@FreeBSD.ORG Sun Nov 7 02:35:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1396A16A4D0; Sun, 7 Nov 2004 02:35:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98DDC16A4D7 for ; Sun, 7 Nov 2004 02:35:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01A9A43D45 for ; Sun, 7 Nov 2004 02:35:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA72ZDgi047489 for ; Sun, 7 Nov 2004 02:35:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA72ZD8q047486 for perforce@freebsd.org; Sun, 7 Nov 2004 02:35:13 GMT (envelope-from marcel@freebsd.org) Date: Sun, 7 Nov 2004 02:35:13 GMT Message-Id: <200411070235.iA72ZD8q047486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 02:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=64478 Change 64478 by marcel@marcel_nfs on 2004/11/07 02:34:54 Define the modes as a bit set so that they can be used as a feature set of the SCC class. We can use ffs(3) to iterate over the set (destructively of course, but still)... Affected files ... .. //depot/projects/uart/dev/scc/scc_bus.h#3 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bus.h#3 (text+ko) ==== @@ -40,8 +40,8 @@ #define SCC_CLASS_Z8530 1 /* The possible modes supported by the SCC. */ -#define SCC_MODE_ASYNC 0 -#define SCC_MODE_BISYNC 1 -#define SCC_MODE_HDLC 2 +#define SCC_MODE_ASYNC 0x01 +#define SCC_MODE_BISYNC 0x02 +#define SCC_MODE_HDLC 0x04 #endif /* _DEV_SCC_BUS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Nov 7 02:42:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A917816A4D0; Sun, 7 Nov 2004 02:42:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DB0516A4CE for ; Sun, 7 Nov 2004 02:42:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C64143D5C for ; Sun, 7 Nov 2004 02:42:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA72gN8W047706 for ; Sun, 7 Nov 2004 02:42:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA72gMJ4047703 for perforce@freebsd.org; Sun, 7 Nov 2004 02:42:22 GMT (envelope-from marcel@freebsd.org) Date: Sun, 7 Nov 2004 02:42:22 GMT Message-Id: <200411070242.iA72gMJ4047703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 02:42:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64479 Change 64479 by marcel@marcel_nfs on 2004/11/07 02:42:00 o define structures to represent the SCC channels and modes. o have scc_bfe_attach() create the channels and modes and associate an unnamed device_t to each node. o s/sc/cl/g for the prefix of fields of struct scc_class. o add cl_class and cl_modes to struct scc_class. o implement scc_bus_read_ivar(). Affected files ... .. //depot/projects/uart/dev/scc/scc_bfe.h#5 edit .. //depot/projects/uart/dev/scc/scc_core.c#3 edit .. //depot/projects/uart/dev/scc/scc_dev_sab82532.c#2 edit .. //depot/projects/uart/dev/scc/scc_dev_z8530.c#2 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bfe.h#5 (text+ko) ==== @@ -45,14 +45,46 @@ #define SCC_IPEND_SIGMASK 0x00ffff /* + * SCC mode (child) and channel control structures. + */ +struct scc_chan; + +struct scc_mode { + STAILQ_ENTRY(scc_mode) m_link; + struct scc_chan *m_chan; + device_t m_dev; + + int m_mode; + int m_alloc_rres:1; + + driver_intr_t *ih; + driver_intr_t *ih_ovrrun; + driver_intr_t *ih_break; + driver_intr_t *ih_rxready; + driver_intr_t *ih_sigchg; + driver_intr_t *ih_txidle; +}; + +struct scc_chan { + STAILQ_ENTRY(scc_chan) ch_link; + struct resource_list ch_rlist; + + STAILQ_HEAD(, scc_mode) ch_mode; + + u_int ch_nr; +}; + +/* * SCC class & instance (=softc) */ struct scc_class { KOBJ_CLASS_FIELDS; - u_int sc_channels; - u_int sc_range; - u_int sc_rclk; - u_int sc_regshft; + int cl_channels; /* Number of independent channels. */ + int cl_class; /* SCC bus class ID. */ + int cl_modes; /* Supported modes (bitset). */ + int cl_range; + int cl_rclk; + int cl_regshft; }; extern struct scc_class scc_sab82532_class; @@ -71,6 +103,11 @@ struct resource *sc_ires; /* Interrupt resource. */ void *sc_icookie; int sc_irid; + + STAILQ_HEAD(, scc_chan) sc_chan; + + int sc_fastintr:1; + int sc_polled:1; }; extern devclass_t scc_devclass; ==== //depot/projects/uart/dev/scc/scc_core.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -44,18 +45,90 @@ devclass_t scc_devclass; char scc_driver_name[] = "scc"; +MALLOC_DEFINE(M_SCC, "SCC", "SCC driver"); + +static void +scc_bfe_intr(void *arg) +{ +} + int scc_bfe_attach(device_t dev) { + struct scc_chan *ch; + struct scc_class *cl; + struct scc_mode *m; struct scc_softc *sc; + u_long size, start; + int c, error, i, mode; sc = device_get_softc(dev); + cl = sc->sc_class; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + 0, ~0, cl->cl_range, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); - return (ENXIO); + sc->sc_irid = 0; + sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, + RF_ACTIVE); + if (sc->sc_ires != NULL) { + error = BUS_SETUP_INTR(device_get_parent(dev), dev, + sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, + sc, &sc->sc_icookie); + if (error) + error = BUS_SETUP_INTR(device_get_parent(dev), dev, + sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, + scc_bfe_intr, sc, &sc->sc_icookie); + else + sc->sc_fastintr = 1; + + if (error) { + device_printf(dev, "could not activate interrupt\n"); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, + sc->sc_ires); + sc->sc_ires = NULL; + } + } + if (sc->sc_ires == NULL) { + /* XXX no interrupt resource. Force polled mode. */ + sc->sc_polled = 1; + } + + STAILQ_INIT(&sc->sc_chan); + size = cl->cl_range / cl->cl_channels; + start = rman_get_start(sc->sc_rres); + for (c = 1; c <= cl->cl_channels; c++) { + ch = malloc(sizeof(struct scc_chan), M_SCC, M_WAITOK | M_ZERO); + STAILQ_INSERT_TAIL(&sc->sc_chan, ch, ch_link); + ch->ch_nr = c; + + resource_list_init(&ch->ch_rlist); + resource_list_add(&ch->ch_rlist, sc->sc_rtype, sc->sc_rrid, + start, start + size - 1, size); + resource_list_add(&ch->ch_rlist, SYS_RES_IRQ, sc->sc_irid, + rman_get_start(sc->sc_ires), rman_get_end(sc->sc_ires), 1); + + STAILQ_INIT(&ch->ch_mode); + mode = cl->cl_modes; + while (mode != 0) { + m = malloc(sizeof(struct scc_mode), M_SCC, + M_WAITOK | M_ZERO); + STAILQ_INSERT_TAIL(&ch->ch_mode, m, m_link); + m->m_chan = ch; + m->m_dev = device_add_child(dev, NULL, -1); + device_set_ivars(m->m_dev, (void *)m); + i = ffs(mode) - 1; + m->m_mode = 1 << i; + mode &= ~m->m_mode; + device_probe_and_attach(m->m_dev); + } + + start += size >> cl->cl_regshft; + } + + return (0); } int @@ -93,12 +166,12 @@ sc->sc_rrid = 0; sc->sc_rtype = SYS_RES_IOPORT; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, - 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + 0, ~0, sc->sc_class->cl_range, RF_ACTIVE); if (sc->sc_rres == NULL) { sc->sc_rrid = 0; sc->sc_rtype = SYS_RES_MEMORY; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, - &sc->sc_rrid, 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + &sc->sc_rrid, 0, ~0, sc->sc_class->cl_range, RF_ACTIVE); if (sc->sc_rres == NULL) return (ENXIO); } @@ -111,7 +184,7 @@ scc_bus_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - + device_printf(dev, "%s\n", __func__); return (NULL); } @@ -126,20 +199,36 @@ int scc_bus_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { + struct scc_chan *ch; + struct scc_class *cl; + struct scc_mode *m; + struct scc_softc *sc; + sc = device_get_softc(dev); + cl = sc->sc_class; + m = device_get_ivars(child); + ch = m->m_chan; + switch (index) { case SCC_IVAR_CHANNEL: + *result = ch->ch_nr; break; case SCC_IVAR_CLASS: + *result = cl->cl_class; break; case SCC_IVAR_CLOCK: + *result = cl->cl_rclk; break; + case SCC_IVAR_MODE: + *result = m->m_mode; + break; case SCC_IVAR_REGSHFT: + *result = cl->cl_regshft; break; default: return (EINVAL); } - return (ENXIO); + return (0); } int ==== //depot/projects/uart/dev/scc/scc_dev_sab82532.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #define DEFAULT_RCLK 29491200 @@ -45,8 +46,10 @@ "sab82532 class", sab82532_methods, sizeof(struct scc_softc), - .sc_channels = 2, - .sc_range = 64, - .sc_rclk = DEFAULT_RCLK, - .sc_regshft = 0 + .cl_channels = 2, + .cl_class = SCC_CLASS_SAB82532, + .cl_modes = SCC_MODE_ASYNC | SCC_MODE_BISYNC | SCC_MODE_HDLC, + .cl_range = 64, + .cl_rclk = DEFAULT_RCLK, + .cl_regshft = 0 }; ==== //depot/projects/uart/dev/scc/scc_dev_z8530.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #define DEFAULT_RCLK 307200 @@ -45,8 +46,10 @@ "z8530 class", z8530_methods, sizeof(struct scc_softc), - .sc_channels = 2, - .sc_range = 2, - .sc_rclk = DEFAULT_RCLK, - .sc_regshft = 1, + .cl_channels = 2, + .cl_class = SCC_CLASS_Z8530, + .cl_modes = SCC_MODE_ASYNC | SCC_MODE_BISYNC | SCC_MODE_HDLC, + .cl_range = 2, + .cl_rclk = DEFAULT_RCLK, + .cl_regshft = 1, }; From owner-p4-projects@FreeBSD.ORG Sun Nov 7 05:50:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A369716A4D2; Sun, 7 Nov 2004 05:50:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D89216A4CE for ; Sun, 7 Nov 2004 05:50:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 000F343D31 for ; Sun, 7 Nov 2004 05:50:08 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA75o850060245 for ; Sun, 7 Nov 2004 05:50:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA75o8Uq060242 for perforce@freebsd.org; Sun, 7 Nov 2004 05:50:08 GMT (envelope-from marcel@freebsd.org) Date: Sun, 7 Nov 2004 05:50:08 GMT Message-Id: <200411070550.iA75o8Uq060242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 05:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=64481 Change 64481 by marcel@marcel_nfs on 2004/11/07 05:49:23 Add resource allocation and release related code. With this, uart(4) probes as a child of scc(4). Next, IRQ handling so that we can do something other than wait for the interrupt storm to pass over... Affected files ... .. //depot/projects/uart/dev/scc/scc_core.c#4 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_core.c#4 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#define __RMAN_RESOURCE_VISIBLE /* XXX shouldn't be needed. */ + #include #include #include @@ -55,10 +57,12 @@ int scc_bfe_attach(device_t dev) { + struct resource_list_entry *rle; struct scc_chan *ch; struct scc_class *cl; struct scc_mode *m; struct scc_softc *sc; + bus_space_handle_t bh; u_long size, start; int c, error, i, mode; @@ -102,14 +106,29 @@ for (c = 1; c <= cl->cl_channels; c++) { ch = malloc(sizeof(struct scc_chan), M_SCC, M_WAITOK | M_ZERO); STAILQ_INSERT_TAIL(&sc->sc_chan, ch, ch_link); + resource_list_init(&ch->ch_rlist); ch->ch_nr = c; - resource_list_init(&ch->ch_rlist); resource_list_add(&ch->ch_rlist, sc->sc_rtype, sc->sc_rrid, start, start + size - 1, size); + rle = resource_list_find(&ch->ch_rlist, sc->sc_rtype, + sc->sc_rrid); + rle->res = malloc(sizeof(struct resource), M_SCC, + M_WAITOK | M_ZERO); + rman_set_start(rle->res, rle->start); + rman_set_end(rle->res, rle->end); + bus_space_subregion(rman_get_bustag(sc->sc_rres), + rman_get_bushandle(sc->sc_rres), + start - rman_get_start(sc->sc_rres), size, &bh); + rman_set_bushandle(rle->res, bh); + rman_set_bustag(rle->res, rman_get_bustag(sc->sc_rres)); + resource_list_add(&ch->ch_rlist, SYS_RES_IRQ, sc->sc_irid, rman_get_start(sc->sc_ires), rman_get_end(sc->sc_ires), 1); - + rle = resource_list_find(&ch->ch_rlist, SYS_RES_IRQ, + sc->sc_irid); + rle->res = sc->sc_ires; + STAILQ_INIT(&ch->ch_mode); mode = cl->cl_modes; while (mode != 0) { @@ -184,16 +203,49 @@ scc_bus_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - device_printf(dev, "%s\n", __func__); - return (NULL); + struct resource_list_entry *rle; + struct scc_chan *ch; + struct scc_mode *m; + + /* We only support default allocations. */ + if (start != 0UL || end != ~0UL) + return (NULL); + + /* We don't support any grandchildren or children thereof. */ + if (device_get_parent(child) != dev) + return (NULL); + + m = device_get_ivars(child); + ch = m->m_chan; + rle = resource_list_find(&ch->ch_rlist, type, *rid); + if (rle == NULL) + return (NULL); + return (rle->res); } int scc_bus_get_resource(device_t dev, device_t child, int type, int rid, u_long *startp, u_long *countp) { + struct resource_list_entry *rle; + struct scc_chan *ch; + struct scc_mode *m; + + /* We don't support any grandchildren or children thereof. */ + if (device_get_parent(child) != dev) + return (EINVAL); + + m = device_get_ivars(child); + ch = m->m_chan; + rle = resource_list_find(&ch->ch_rlist, type, rid); + if (rle == NULL) + return (EINVAL); - return (ENXIO); + if (startp != NULL) + *startp = rle->start; + if (countp != NULL) + *countp = rle->count; + return (0); } int @@ -235,8 +287,18 @@ scc_bus_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { + struct resource_list_entry *rle; + struct scc_chan *ch; + struct scc_mode *m; - return (ENXIO); + /* We don't support any grandchildren or children thereof. */ + if (device_get_parent(child) != dev) + return (EINVAL); + + m = device_get_ivars(child); + ch = m->m_chan; + rle = resource_list_find(&ch->ch_rlist, type, rid); + return ((rle == NULL) ? EINVAL : 0); } int From owner-p4-projects@FreeBSD.ORG Sun Nov 7 06:08:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3CF716A4D0; Sun, 7 Nov 2004 06:08:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D8D816A4CE for ; Sun, 7 Nov 2004 06:08:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81D5643D3F for ; Sun, 7 Nov 2004 06:08:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA768Vb3060790 for ; Sun, 7 Nov 2004 06:08:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA768VZo060787 for perforce@freebsd.org; Sun, 7 Nov 2004 06:08:31 GMT (envelope-from sam@freebsd.org) Date: Sun, 7 Nov 2004 06:08:31 GMT Message-Id: <200411070608.iA768VZo060787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 06:08:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64482 Change 64482 by sam@sam_ebb on 2004/11/07 06:08:18 add programs to futz with debug flags symbolically Affected files ... .. //depot/projects/wifi/tools/tools/ath/80211debug.c#1 add .. //depot/projects/wifi/tools/tools/ath/Makefile#2 edit .. //depot/projects/wifi/tools/tools/ath/athdebug.c#1 add Differences ... ==== //depot/projects/wifi/tools/tools/ath/Makefile#2 (text+ko) ==== @@ -26,16 +26,20 @@ # BINDIR= /usr/local/bin -ALL= athstats 80211stats 80211watch +ALL= athstats 80211stats 80211watch athdebug 80211debug all: ${ALL} athstats: athstats.c ${CC} -o athstats athstats.c -lkvm +athdebug: athdebug.c + ${CC} -o athdebug athdebug.c 80211stats: 80211stats.c ${CC} -o 80211stats 80211stats.c 80211watch: 80211watch.c ${CC} -o 80211watch 80211watch.c +80211debug: 80211debug.c + ${CC} -o 80211debug 80211debug.c install: ${ALL} install -g kmem -m 2755 athstats ${DESTDIR}${BINDIR} install 80211stats ${DESTDIR}${BINDIR} From owner-p4-projects@FreeBSD.ORG Sun Nov 7 06:11:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C1816A4D0; Sun, 7 Nov 2004 06:11:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6A8716A4CE for ; Sun, 7 Nov 2004 06:11:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9577843D2F for ; Sun, 7 Nov 2004 06:11:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA76BZd9060905 for ; Sun, 7 Nov 2004 06:11:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA76BZJL060902 for perforce@freebsd.org; Sun, 7 Nov 2004 06:11:35 GMT (envelope-from sam@freebsd.org) Date: Sun, 7 Nov 2004 06:11:35 GMT Message-Id: <200411070611.iA76BZJL060902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Nov 2004 06:11:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=64483 Change 64483 by sam@sam_ebb on 2004/11/07 06:11:04 install debug tools Affected files ... .. //depot/projects/wifi/tools/tools/ath/Makefile#3 edit Differences ... ==== //depot/projects/wifi/tools/tools/ath/Makefile#3 (text+ko) ==== @@ -44,6 +44,8 @@ install -g kmem -m 2755 athstats ${DESTDIR}${BINDIR} install 80211stats ${DESTDIR}${BINDIR} install 80211watch ${DESTDIR}${BINDIR} + install 80211debug ${DESTDIR}${BINDIR} + install athdebug ${DESTDIR}${BINDIR} clean: rm -f ${ALL} core a.out From owner-p4-projects@FreeBSD.ORG Mon Nov 8 06:50:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 859C216A4D0; Mon, 8 Nov 2004 06:50:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60FC216A4CE for ; Mon, 8 Nov 2004 06:50:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B0FE43D49 for ; Mon, 8 Nov 2004 06:50:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA86og32085566 for ; Mon, 8 Nov 2004 06:50:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA86ofW2085563 for perforce@freebsd.org; Mon, 8 Nov 2004 06:50:41 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Nov 2004 06:50:41 GMT Message-Id: <200411080650.iA86ofW2085563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 06:50:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=64563 Change 64563 by sam@sam_ebb on 2004/11/08 06:49:47 use the routing socket to wait for a scan to complete Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#5 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#5 (text+ko) ==== @@ -546,6 +546,43 @@ } } +#include + +static void +scan_and_wait(int s) +{ + struct ieee80211req ireq; + int sroute; + + sroute = socket(PF_ROUTE, SOCK_RAW, 0); + if (sroute < 0) { + perror("socket(PF_ROUTE,SOCK_RAW)"); + return; + } + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_SCAN_REQ; + /* NB: only root can trigger a scan so ignore errors */ + if (ioctl(s, SIOCS80211, &ireq) >= 0) { + char buf[2048]; + struct if_announcemsghdr *ifan; + struct rt_msghdr *rtm; + + do { + if (read(sroute, buf, sizeof(buf)) < 0) { + perror("read(PF_ROUTE)"); + break; + } + rtm = (struct rt_msghdr *) buf; + if (rtm->rtm_version != RTM_VERSION) + break; + ifan = (struct if_announcemsghdr *) rtm; + } while (rtm->rtm_type != RTM_IEEE80211 || + ifan->ifan_what != RTM_IEEE80211_SCAN); + } + close(sroute); +} + static void set80211scan(const char *val, int d, int s, const struct afswtch *rafp) { @@ -554,20 +591,15 @@ uint8_t *cp; int len; + scan_and_wait(s); + (void) memset(&ireq, 0, sizeof(ireq)); (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_SCAN_REQ; - /* NB: only root can trigger a scan so ignore errors */ - (void) ioctl(s, SIOCS80211, &ireq); - ireq.i_type = IEEE80211_IOC_SCAN_RESULTS; ireq.i_data = buf; ireq.i_len = sizeof(buf); - while (ioctl(s, SIOCG80211, &ireq) < 0) { - if (errno != EINPROGRESS) - errx(1, "unable to get scan results"); - sleep(1); - } + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get scan results"); len = ireq.i_len; if (len >= sizeof(struct ieee80211req_scan_result)) printf("%-14.14s %-17.17s %4s %4s %-5s %3s %4s\n" From owner-p4-projects@FreeBSD.ORG Mon Nov 8 16:19:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41D9C16A4D0; Mon, 8 Nov 2004 16:19:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0548016A4CE for ; Mon, 8 Nov 2004 16:19:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA36E43D1D for ; Mon, 8 Nov 2004 16:19:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8GJRId027878 for ; Mon, 8 Nov 2004 16:19:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8GJRSw027875 for perforce@freebsd.org; Mon, 8 Nov 2004 16:19:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Nov 2004 16:19:27 GMT Message-Id: <200411081619.iA8GJRSw027875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 16:19:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=64599 Change 64599 by rwatson@rwatson_tislabs on 2004/11/08 16:19:10 Missing close parens on debugging macros. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#27 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#30 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#27 (text+ko) ==== @@ -569,7 +569,7 @@ error = mac_check_sysv_msqget(cred, msqkptr); if (error != 0) { MPRINTF(("mac_check_sysv_msqget returned %d\n", - error); + error)); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#30 (text+ko) ==== @@ -841,7 +841,7 @@ error = mac_check_sysv_semget(cred, &sema[semid]); if (error != 0) { MPRINTF(("mac_check_sysv_semget returned %d\n", - error); + error)); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#27 (text+ko) ==== @@ -357,7 +357,7 @@ #ifdef MAC error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg); if (error != 0) { - MPRINTF(("mac_check_sysv_shmat returned %d\n", error); + MPRINTF(("mac_check_sysv_shmat returned %d\n", error)); goto done2; } #endif @@ -477,7 +477,7 @@ #ifdef MAC error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_shmctl returned %d\n", error); + MPRINTF(("mac_check_sysv_shmctl returned %d\n", error)); goto done2; } #endif From owner-p4-projects@FreeBSD.ORG Mon Nov 8 16:46:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA42116A4D0; Mon, 8 Nov 2004 16:46:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9445716A4CE for ; Mon, 8 Nov 2004 16:46:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87D0B43D45 for ; Mon, 8 Nov 2004 16:46:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8Gk1LS029122 for ; Mon, 8 Nov 2004 16:46:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8Gk1lY029119 for perforce@freebsd.org; Mon, 8 Nov 2004 16:46:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Nov 2004 16:46:01 GMT Message-Id: <200411081646.iA8Gk1lY029119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 16:46:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=64605 Change 64605 by rwatson@rwatson_tislabs on 2004/11/08 16:45:11 Remove parens that are confusing MPRINTF() and preventing it from passing multiple arguments to printf(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#28 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#28 (text+ko) ==== @@ -51,7 +51,7 @@ #define DPRINTF(a) #endif #ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) +#define MPRINTF(a) printf a #else #define MPRINTF(a) #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#31 (text+ko) ==== @@ -37,7 +37,7 @@ #define DPRINTF(a) #endif #ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) +#define MPRINTF(a) printf a #else #define MPRINTF(a) #endif From owner-p4-projects@FreeBSD.ORG Mon Nov 8 17:18:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29D8016A4D0; Mon, 8 Nov 2004 17:18:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC9D316A4CE for ; Mon, 8 Nov 2004 17:18:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF40043D31 for ; Mon, 8 Nov 2004 17:18:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8HIhkS037181 for ; Mon, 8 Nov 2004 17:18:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8HIhYR037178 for perforce@freebsd.org; Mon, 8 Nov 2004 17:18:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Nov 2004 17:18:43 GMT Message-Id: <200411081718.iA8HIhYR037178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 17:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=64611 Change 64611 by rwatson@rwatson_tislabs on 2004/11/08 17:18:17 Remove comment from branch, now merged to HEAD. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#13 (text+ko) ==== @@ -74,14 +74,6 @@ * implementation of each primitive. Those entry point calls complement the * ipcperm() discertionary checks. */ - -/* - * Note: The MAC Framework does not require any modifications to the ipcperm() - * function, as access control checks are performed throughout the - * implementation of each primitive. Those entry point calls complement the - * ipcperm() discertionary checks. - */ - int ipcperm(td, perm, mode) struct thread *td; From owner-p4-projects@FreeBSD.ORG Mon Nov 8 17:24:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC76F16A4D0; Mon, 8 Nov 2004 17:24:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A388016A4CE for ; Mon, 8 Nov 2004 17:24:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 956DA43D4C for ; Mon, 8 Nov 2004 17:24:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8HOqDD037381 for ; Mon, 8 Nov 2004 17:24:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8HOqHc037378 for perforce@freebsd.org; Mon, 8 Nov 2004 17:24:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Nov 2004 17:24:52 GMT Message-Id: <200411081724.iA8HOqHc037378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 17:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=64613 Change 64613 by rwatson@rwatson_tislabs on 2004/11/08 17:24:02 Synchronize copyright format, $FreeBSD$ to head (somewhat). Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /*- - * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001, 2002, 2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.1 2004/02/26 03:51:04 rwatson Exp $"); #include "opt_mac.h" From owner-p4-projects@FreeBSD.ORG Mon Nov 8 17:25:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8423416A4D0; Mon, 8 Nov 2004 17:25:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 608B616A4CE for ; Mon, 8 Nov 2004 17:25:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 538EE43D1D for ; Mon, 8 Nov 2004 17:25:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8HPsp0037456 for ; Mon, 8 Nov 2004 17:25:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8HPsXw037453 for perforce@freebsd.org; Mon, 8 Nov 2004 17:25:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Nov 2004 17:25:54 GMT Message-Id: <200411081725.iA8HPsXw037453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 17:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=64614 Change 64614 by rwatson@rwatson_tislabs on 2004/11/08 17:24:58 Synchronize copyright format. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_socket.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /*- - * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin - * Copyright (c) 2001, 2002, 2003, 2004 Networks Associates Technology, Inc. + * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the From owner-p4-projects@FreeBSD.ORG Mon Nov 8 19:05:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5968816A522; Mon, 8 Nov 2004 19:05:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2E7116A5D4 for ; Mon, 8 Nov 2004 19:05:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF8B543D4C for ; Mon, 8 Nov 2004 19:05:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8J5I7w044772 for ; Mon, 8 Nov 2004 19:05:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8J5IpR044769 for perforce@freebsd.org; Mon, 8 Nov 2004 19:05:18 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Nov 2004 19:05:18 GMT Message-Id: <200411081905.iA8J5IpR044769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 19:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=64624 Change 64624 by sam@sam_ebb on 2004/11/08 19:04:27 s/inline/__inline/ Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#3 (text+ko) ==== @@ -175,7 +175,7 @@ /* * Check and remove any MIC. */ -static inline int +static __inline int ieee80211_crypto_demic(struct ieee80211com *ic, struct ieee80211_key *k, struct mbuf *m) { @@ -186,7 +186,7 @@ /* * Add any MIC. */ -static inline int +static __inline int ieee80211_crypto_enmic(struct ieee80211com *ic, struct ieee80211_key *k, struct mbuf *m) { @@ -199,7 +199,7 @@ * key allocation mechanism insures other state (e.g. * key data) is properly setup before a key is used. */ -static inline void +static __inline void ieee80211_crypto_resetkey(struct ieee80211com *ic, struct ieee80211_key *k, u_int16_t ix) { From owner-p4-projects@FreeBSD.ORG Mon Nov 8 19:05:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B62F416A526; Mon, 8 Nov 2004 19:05:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02E2B16A4F1 for ; Mon, 8 Nov 2004 19:05:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4983343D54 for ; Mon, 8 Nov 2004 19:05:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8J5JKN044778 for ; Mon, 8 Nov 2004 19:05:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8J5IuU044775 for perforce@freebsd.org; Mon, 8 Nov 2004 19:05:18 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Nov 2004 19:05:18 GMT Message-Id: <200411081905.iA8J5IuU044775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 19:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=64625 Change 64625 by sam@sam_ebb on 2004/11/08 19:04:48 s/inline/__inline/ Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#3 (text+ko) ==== @@ -80,13 +80,13 @@ /* * Write-arounds for common operations. */ -static inline void +static __inline void cipher_detach(struct ieee80211_key *key) { key->wk_cipher->ic_detach(key); } -static inline void * +static __inline void * cipher_attach(struct ieee80211com *ic, struct ieee80211_key *key) { return key->wk_cipher->ic_attach(ic, key); @@ -95,21 +95,21 @@ /* * Wrappers for driver key management methods. */ -static inline int +static __inline int dev_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *key) { return ic->ic_crypto.cs_key_alloc(ic, key); } -static inline int +static __inline int dev_key_delete(struct ieee80211com *ic, const struct ieee80211_key *key) { return ic->ic_crypto.cs_key_delete(ic, key); } -static inline int +static __inline int dev_key_set(struct ieee80211com *ic, const struct ieee80211_key *key, const u_int8_t mac[IEEE80211_ADDR_LEN]) { From owner-p4-projects@FreeBSD.ORG Mon Nov 8 19:07:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A382D16A4D0; Mon, 8 Nov 2004 19:07:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7AAEF16A4CE for ; Mon, 8 Nov 2004 19:07:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A8B143D2F for ; Mon, 8 Nov 2004 19:07:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA8J7NYc045147 for ; Mon, 8 Nov 2004 19:07:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA8J7MMM045141 for perforce@freebsd.org; Mon, 8 Nov 2004 19:07:22 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Nov 2004 19:07:22 GMT Message-Id: <200411081907.iA8J7MMM045141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2004 19:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64628 Change 64628 by sam@sam_ebb on 2004/11/08 19:07:05 checkpoint node table rewrite; works for station mode Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#13 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#5 edit .. //depot/projects/wifi/sys/dev/awi/awi.c#3 edit .. //depot/projects/wifi/sys/dev/wi/if_wi.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#13 (text+ko) ==== @@ -124,12 +124,9 @@ static void ath_beacon_config(struct ath_softc *); static int ath_desc_alloc(struct ath_softc *); static void ath_desc_free(struct ath_softc *); -static struct ieee80211_node *ath_node_alloc(struct ieee80211com *); -static void ath_node_cleanup(struct ieee80211com *, struct ieee80211_node*); -static void ath_node_copy(struct ieee80211com *, - struct ieee80211_node *, const struct ieee80211_node *); -static u_int8_t ath_node_getrssi(struct ieee80211com *, - struct ieee80211_node *); +static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *); +static void ath_node_free(struct ieee80211_node *); +static u_int8_t ath_node_getrssi(const struct ieee80211_node *); static int ath_rxbuf_init(struct ath_softc *, struct ath_buf *); static void ath_recv_mgmt(struct ieee80211com *ic, struct mbuf *m, struct ieee80211_node *ni, @@ -509,10 +506,8 @@ ieee80211_ifattach(ic); /* override default methods */ ic->ic_node_alloc = ath_node_alloc; - sc->sc_node_cleanup = ic->ic_node_cleanup; - ic->ic_node_cleanup = ath_node_cleanup; - sc->sc_node_copy = ic->ic_node_copy; - ic->ic_node_copy = ath_node_copy; + sc->sc_node_free = ic->ic_node_free; + ic->ic_node_free = ath_node_free; ic->ic_node_getrssi = ath_node_getrssi; sc->sc_recv_mgmt = ic->ic_recv_mgmt; ic->ic_recv_mgmt = ath_recv_mgmt; @@ -1087,8 +1082,8 @@ STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); ifp->if_oerrors++; - if (ni && ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + if (ni != NULL) + ieee80211_free_node(ni); continue; } @@ -2038,8 +2033,9 @@ } static struct ieee80211_node * -ath_node_alloc(struct ieee80211com *ic) +ath_node_alloc(struct ieee80211_node_table *nt) { + struct ieee80211com *ic = nt->nt_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space; struct ath_node *an; @@ -2072,57 +2068,39 @@ ATH_TXQ_LOCK(txq); STAILQ_FOREACH(bf, &txq->axq_q, bf_list) { if (bf->bf_node == ni) { - bf->bf_node = NULL; - if (ni != ic->ic_bss) - /* NB: cannot use ieee80211_unref_node */ - ieee80211_node_decref(ni); + /* NB: this clears the pointer too */ + ieee80211_unref_node(&bf->bf_node); } } ATH_TXQ_UNLOCK(txq); } static void -ath_node_cleanup(struct ieee80211com *ic, struct ieee80211_node *ni) +ath_node_free(struct ieee80211_node *ni) { + struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; int i; DPRINTF(sc, ATH_DEBUG_NODE, "%s: ni %p\n", __func__, ni); + /* XXX can this happen since refcnt must be zero for us to be called? */ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i)) ath_tx_cleanq(ic, &sc->sc_txq[i], ni); ath_rate_node_cleanup(sc, ATH_NODE(ni)); - sc->sc_node_cleanup(ic, ni); + sc->sc_node_free(ni); } -static void -ath_node_copy(struct ieee80211com *ic, - struct ieee80211_node *dst, const struct ieee80211_node *src) -{ - struct ath_softc *sc = ic->ic_ifp->if_softc; - const struct ath_node *an = (const struct ath_node *)src; - - DPRINTF(sc, ATH_DEBUG_NODE, "%s: dst %p src %p\n", __func__, dst, src); - - /* - * NB: Must copy first so the cleanup done by node_copy is - * done before we copy bits around below. - */ - sc->sc_node_copy(ic, dst, src); - memcpy(&dst[1], &src[1], - sizeof(struct ath_node) - sizeof(struct ieee80211_node)); - ath_rate_node_copy(sc, ATH_NODE(dst), an); -} - static u_int8_t -ath_node_getrssi(struct ieee80211com *ic, struct ieee80211_node *ni) +ath_node_getrssi(const struct ieee80211_node *ni) { #define HAL_EP_RND(x, mul) \ ((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul)) + u_int32_t avgrssi = ATH_NODE_CONST(ni)->an_avgrssi; int32_t rssi; - rssi = HAL_EP_RND(ATH_NODE(ni)->an_avgrssi, HAL_RSSI_EP_MULTIPLIER); + rssi = HAL_EP_RND(avgrssi, HAL_RSSI_EP_MULTIPLIER); /* NB: theoretically we shouldn't need this, but be paranoid */ return rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; #undef HAL_EP_RND @@ -2245,8 +2223,6 @@ #define PA2DESC(_sc, _pa) \ ((struct ath_desc *)((caddr_t)(_sc)->sc_desc + \ ((_pa) - (_sc)->sc_desc_paddr))) -#define IS_CTL(wh) \ - ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) struct ath_softc *sc = arg; struct ath_buf *bf; struct ieee80211com *ic = &sc->sc_ic; @@ -2432,24 +2408,10 @@ /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer - * for its use. We are required to pass some node so - * we fall back to ic_bss when this frame is from an - * unknown sender. The 802.11 layer knows this means the - * sender wasn't in the node table and acts accordingly. - * Note also that by convention we do not reference - * count ic_bss, only other nodes (ic_bss is never free'd). + * for its use. */ - if (ic->ic_opmode != IEEE80211_M_STA) { - struct ieee80211_frame_min *wh = - mtod(m, struct ieee80211_frame_min *); - if (IS_CTL(wh)) - ni = ieee80211_find_node(ic, wh->i_addr1); - else - ni = ieee80211_find_node(ic, wh->i_addr2); - if (ni == NULL) - ni = ic->ic_bss; - } else - ni = ic->ic_bss; + ni = ieee80211_find_rxnode(ic, + mtod(m, const struct ieee80211_frame_min *)); /* * Track rx rssi and do any rx antenna management. @@ -2479,8 +2441,7 @@ /* * Reclaim node reference. */ - if (ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); rx_next: STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); } while (ath_rxbuf_init(sc, bf) == 0); @@ -2489,7 +2450,6 @@ ath_hal_rxmonitor(ah, &ATH_NODE(ic->ic_bss)->an_halstats); NET_UNLOCK_GIANT(); /* XXX */ -#undef IS_CTL #undef PA2DESC } @@ -2980,7 +2940,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) { - struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; struct ath_buf *bf; struct ath_desc *ds; @@ -3050,8 +3009,7 @@ * this is a DEAUTH message that was sent and the * node was timed out due to inactivity. */ - if (ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTWRITE); @@ -3135,7 +3093,6 @@ ath_tx_draintxq(struct ath_softc *sc, struct ath_txq *txq) { struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; struct ath_buf *bf; @@ -3163,11 +3120,11 @@ bf->bf_m = NULL; ni = bf->bf_node; bf->bf_node = NULL; - if (ni != NULL && ni != ic->ic_bss) { + if (ni != NULL) { /* * Reclaim node reference. */ - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); } ATH_TXBUF_LOCK(sc); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#5 (text+ko) ==== @@ -67,6 +67,7 @@ /* variable-length rate control state follows */ }; #define ATH_NODE(ni) ((struct ath_node *)(ni)) +#define ATH_NODE_CONST(ni) ((const struct ath_node *)(ni)) #define ATH_RSSI_LPF_LEN 10 #define ATH_RSSI_DUMMY_MARKER 0x127 @@ -140,11 +141,7 @@ int, int, u_int32_t); int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int); - void (*sc_node_cleanup)(struct ieee80211com *, - struct ieee80211_node *); - void (*sc_node_copy)(struct ieee80211com *, - struct ieee80211_node *, - const struct ieee80211_node *); + void (*sc_node_free)(struct ieee80211_node *); device_t sc_dev; bus_space_tag_t sc_st; /* bus space tag */ bus_space_handle_t sc_sh; /* bus space handle */ ==== //depot/projects/wifi/sys/dev/awi/awi.c#3 (text+ko) ==== @@ -663,7 +663,7 @@ ni->ni_intval = ic->ic_lintval; ni->ni_rssi = 0; ni->ni_rstamp = 0; - memset(ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); + memset(&ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); ni->ni_rates = ic->ic_sup_rates[ieee80211_chan2mode(ic, ni->ni_chan)]; IEEE80211_ADDR_COPY(ni->ni_macaddr, ic->ic_myaddr); @@ -802,7 +802,7 @@ ifp->if_oerrors++; continue; } - if (ni != NULL && ni != ic->ic_bss) + if (ni != NULL) ieee80211_free_node(ic, ni); wh = mtod(m0, struct ieee80211_frame *); if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && @@ -826,7 +826,7 @@ k = ieee80211_crypto_encap(ic, ni, m0); if (k == NULL) { - if (ni && ni != ic->ic_bss) + if (ni != NULL) ieee80211_free_node(ic, ni); continue; } @@ -1175,7 +1175,6 @@ { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &sc->sc_if; - struct ieee80211_frame *wh; struct ieee80211_node *ni; u_int8_t state, rate, rssi; u_int16_t len; @@ -1220,33 +1219,16 @@ sc->sc_adhoc_ap) m = awi_ether_modcap(sc, m); else - m = m_pullup(m, sizeof(*wh)); + m = m_pullup(m, + sizeof(struct ieee80211_frame_min)); if (m == NULL) { ifp->if_ierrors++; goto rx_next; } - wh = mtod(m, struct ieee80211_frame *); -#ifdef __NetBSD__ - ni = ieee80211_find_rxnode(ic, wh); -#else - if (ic->ic_opmode != IEEE80211_M_STA) { - ni = ieee80211_find_node(ic, - wh->i_addr2); - if (ni == NULL) - ni = ic->ic_bss; - } else - ni = ic->ic_bss; -#endif + ni = ieee80211_find_rxnode(ic, + mtod(m, struct ieee80211_frame_min *)); ieee80211_input(ic, m, ni, rssi, rstamp); - /* - * The frame may have caused the - * node to be marked for reclamation - * (e.g. in response to a DEAUTH - * message) so use free_node here - * instead of unref_node. - */ - if (ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + ieee80211_free_node(ic, ni); } else sc->sc_rxpend = m; rx_next: @@ -2048,14 +2030,14 @@ awi_write_2(sc, AWI_CA_SYNC_DWELL, 0); } if (ic->ic_flags & IEEE80211_F_SIBSS) { - memset(ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); + memset(&ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); ni->ni_rstamp = 0; awi_write_1(sc, AWI_CA_SYNC_STARTBSS, 1); } else awi_write_1(sc, AWI_CA_SYNC_STARTBSS, 0); awi_write_2(sc, AWI_CA_SYNC_MBZ, 0); awi_write_bytes(sc, AWI_CA_SYNC_TIMESTAMP, - ni->ni_tstamp, 8); + ni->ni_tstamp.data, 8); awi_write_4(sc, AWI_CA_SYNC_REFTIME, ni->ni_rstamp); sc->sc_cur_chan = ieee80211_chan2ieee(ic, ni->ni_chan); if ((error = awi_cmd(sc, AWI_CMD_SYNC, AWI_NOWAIT)) ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#4 (text+ko) ==== @@ -941,8 +941,8 @@ k = ieee80211_crypto_encap(ic, ni, m0); if (k == NULL) { - if (ni && ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + if (ni != NULL) + ieee80211_free_node(ni); continue; } if (k->wk_flags & IEEE80211_KEY_SWCRYPT) @@ -967,8 +967,8 @@ error = wi_write_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) != 0 || wi_mwrite_bap(sc, fid, off, m0, m0->m_pkthdr.len) != 0; m_freem(m0); - if (ni && ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + if (ni != NULL) + ieee80211_free_node(ni); if (error) { ifp->if_oerrors++; continue; @@ -1513,16 +1513,9 @@ /* * Locate the node for sender, track state, and * then pass this node (referenced) up to the 802.11 - * layer for its use. We are required to pass - * something so we fallback to ic_bss when this frame - * is from an unknown sender. + * layer for its use. */ - if (ic->ic_opmode != IEEE80211_M_STA) { - ni = ieee80211_find_node(ic, wh->i_addr2); - if (ni == NULL) - ni = ic->ic_bss; - } else - ni = ic->ic_bss; + ni = ieee80211_find_rxnode(ic, wh); /* * Send frame up for processing. */ @@ -1532,8 +1525,7 @@ * reclamation (e.g. in response to a DEAUTH message) * so use free_node here instead of unref_node. */ - if (ni != ic->ic_bss) - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); } static void ==== //depot/projects/wifi/sys/net80211/ieee80211.c#3 (text+ko) ==== @@ -653,15 +653,26 @@ void ieee80211_watchdog(struct ieee80211com *ic) { + struct ieee80211_node_table *nt; + int need_inact_timer = 0; if (ic->ic_state != IEEE80211_S_INIT) { if (ic->ic_mgt_timer && --ic->ic_mgt_timer == 0) ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); - if (ic->ic_inact_timer && --ic->ic_inact_timer == 0) - ieee80211_timeout_nodes(ic); + nt = &ic->ic_scan; + if (nt->nt_inact_timer) { + if (--nt->nt_inact_timer == 0) + nt->nt_timeout(nt); + need_inact_timer += nt->nt_inact_timer; + } + nt = ic->ic_sta; + if (nt != NULL && nt->nt_inact_timer) { + if (--nt->nt_inact_timer == 0) + nt->nt_timeout(nt); + need_inact_timer += nt->nt_inact_timer; + } } - - if (ic->ic_mgt_timer != 0 || ic->ic_inact_timer != 0) + if (ic->ic_mgt_timer != 0 || need_inact_timer) ic->ic_ifp->if_timer = 1; } ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#3 (text+ko) ==== @@ -33,13 +33,13 @@ * Node locking definitions. */ typedef struct mtx ieee80211_node_lock_t; -#define IEEE80211_NODE_LOCK_INIT(_ic, _name) \ - mtx_init(&(_ic)->ic_nodelock, _name, "802.11 node table", MTX_DEF) -#define IEEE80211_NODE_LOCK_DESTROY(_ic) mtx_destroy(&(_ic)->ic_nodelock) -#define IEEE80211_NODE_LOCK(_ic) mtx_lock(&(_ic)->ic_nodelock) -#define IEEE80211_NODE_UNLOCK(_ic) mtx_unlock(&(_ic)->ic_nodelock) -#define IEEE80211_NODE_LOCK_ASSERT(_ic) \ - mtx_assert(&(_ic)->ic_nodelock, MA_OWNED) +#define IEEE80211_NODE_LOCK_INIT(_nt, _name) \ + mtx_init(&(_nt)->nt_nodelock, _name, "802.11 node table", MTX_DEF) +#define IEEE80211_NODE_LOCK_DESTROY(_nt) mtx_destroy(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_LOCK(_nt) mtx_lock(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_UNLOCK(_nt) mtx_unlock(&(_nt)->nt_nodelock) +#define IEEE80211_NODE_LOCK_ASSERT(_nt) \ + mtx_assert(&(_nt)->nt_nodelock, MA_OWNED) /* * 802.1x MAC ACL database locking definitions. ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#10 (text+ko) ==== @@ -246,7 +246,7 @@ if ((wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) == 0) { /* turn off power save mode, dequeue stored packets */ ni->ni_flags &= ~IEEE80211_NODE_PWR_MGT; - (*ic->ic_set_tim)(ic, ni->ni_associd, 0); + ic->ic_set_tim(ic, ni->ni_associd, 0); while (!_IF_QLEN(&ni->ni_savedq) != 0) { struct mbuf *m0; _IF_DEQUEUE(&ni->ni_savedq, m0); @@ -351,12 +351,12 @@ "[%s] discard data from unknown src\n", ether_sprintf(wh->i_addr2)); /* NB: caller deals with reference */ - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, IEEE80211_REASON_NOT_AUTHED); - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); } ic->ic_stats.is_rx_notassoc++; goto err; @@ -502,14 +502,16 @@ /* XXX this dups work done in ieee80211_encap */ /* check if destination is associated */ struct ieee80211_node *ni1 = - ieee80211_find_node(ic, eh->ether_dhost); + ieee80211_find_node(ic->ic_sta, + eh->ether_dhost); if (ni1 != NULL) { + /* XXX check if authorized */ if (ni1->ni_associd != 0) { m1 = m; m = NULL; } /* XXX statistic? */ - ieee80211_free_node(ic, ni1); + ieee80211_free_node(ni1); } } if (m1 != NULL) { @@ -648,10 +650,23 @@ /* * Remove frag to insure it doesn't get reaped by timer. */ - IEEE80211_NODE_LOCK(ic); + if (ni->ni_table == NULL) { + /* + * Should never happen. If the node is orphaned (not in + * the table) then input packets should not reach here. + * Otherwise, a concurrent request that yanks the table + * should be blocked by other interlocking and/or by first + * shutting the driver down. Regardless, be defensive + * here and just bail + */ + /* XXX need msg+stat */ + m_freem(m); + return NULL; + } + IEEE80211_NODE_LOCK(ni->ni_table); mfrag = ni->ni_rxfrag[0]; ni->ni_rxfrag[0] = NULL; - IEEE80211_NODE_UNLOCK(ic); + IEEE80211_NODE_UNLOCK(ni->ni_table); /* * Validate new fragment is in order and @@ -860,7 +875,7 @@ } /* always accept open authentication requests */ if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) return; allocbs = 1; @@ -1006,7 +1021,7 @@ switch (seq) { case IEEE80211_AUTH_SHARED_REQUEST: if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) { /* NB: no way to return an error */ return; @@ -1583,7 +1598,7 @@ #define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) struct ieee80211_frame *wh; u_int8_t *frm, *efrm; - u_int8_t *ssid, *rates, *xrates, *wpa; + u_int8_t *ssid, *rates, *xrates, *wpa, *wme; int reassoc, resp, allocbs; wh = mtod(m0, struct ieee80211_frame *); @@ -1592,7 +1607,7 @@ switch (subtype) { case IEEE80211_FC0_SUBTYPE_PROBE_RESP: case IEEE80211_FC0_SUBTYPE_BEACON: { - u_int8_t *tstamp, *country, *wpa, *wme; + u_int8_t *tstamp, *country; u_int8_t chan, bchan, fhindex, erp; u_int16_t capinfo, bintval, timoff; u_int16_t fhdwell; @@ -1779,57 +1794,51 @@ ni->ni_capinfo = capinfo; /* XXX statistic */ } + ni->ni_inact = ic->ic_inact_run; return; } - /* - * Use mac and channel for lookup so we collect all - * potential AP's when scanning. Otherwise we may - * see the same AP on multiple channels and will only - * record the last one. We could filter APs here based - * on rssi, etc. but leave that to the end of the scan - * so we can keep the selection criteria in one spot. - * This may result in a bloat of the scanned AP list but - * it shouldn't be too much. - */ - ni = ieee80211_find_node_with_channel(ic, wh->i_addr2, - &ic->ic_channels[chan]); - if (ni == NULL) { + if (ni == ic->ic_bss) { #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(ic)) dump_probe_beacon(subtype, 1, wh->i_addr2, chan, bchan, capinfo, bintval, erp, ssid, country); #endif - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_scan, wh->i_addr2); if (ni == NULL) return; ni->ni_esslen = ssid[1]; memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); memcpy(ni->ni_essid, ssid + 2, ssid[1]); - } else if (ssid[1] != 0 && - (ISPROBE(subtype) || ni->ni_esslen == 0)) { - /* - * Update ESSID at probe response to adopt hidden AP by - * Lucent/Cisco, which announces null ESSID in beacon. - */ - ni->ni_esslen = ssid[1]; - memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); - memcpy(ni->ni_essid, ssid + 2, ssid[1]); + } else { + ni->ni_inact = ic->ic_inact_run; /* XXX? */ + if (ssid[1] != 0 && + (ISPROBE(subtype) || ni->ni_esslen == 0)) { + /* + * Update ESSID at probe response to adopt + * hidden AP by Lucent/Cisco, which announces + * null ESSID in beacon. + */ #ifdef IEEE80211_DEBUG - if (ieee80211_msg_scan(ic) || ieee80211_msg_debug(ic)) - dump_probe_beacon(subtype, 0, - wh->i_addr2, chan, bchan, capinfo, - bintval, erp, ssid, country); + if (ieee80211_msg_scan(ic) || + ieee80211_msg_debug(ic)) + dump_probe_beacon(subtype, 0, + wh->i_addr2, chan, bchan, capinfo, + bintval, erp, ssid, country); #endif + ni->ni_esslen = ssid[1]; + memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); + memcpy(ni->ni_essid, ssid + 2, ssid[1]); + } } + ni->ni_scangen = ic->ic_scan.nt_scangen; IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3); ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; memcpy(ni->ni_tstamp.data, tstamp, sizeof(ni->ni_tstamp)); ni->ni_intval = bintval; ni->ni_capinfo = capinfo; - /* XXX validate channel # */ ni->ni_chan = &ic->ic_channels[chan]; ni->ni_fhdwell = fhdwell; ni->ni_fhindex = fhindex; @@ -1851,25 +1860,6 @@ ieee80211_saveie(&ni->ni_wpa_ie, wpa); /* NB: must be after ni_chan is setup */ ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT); - ieee80211_unref_node(&ni); /* NB: do not free */ -#if 0 - if (ic->ic_state == IEEE80211_S_SCAN) - ieee80211_unref_node(&ni); /* NB: do not free */ - else if (ic->ic_opmode == IEEE80211_M_IBSS && - allocbs && isprobe) { - /* - * Fake an association so the driver can setup it's - * private state. The rate set has been setup above; - * there is no handshake as in ap/station operation. - */ - if (ic->ic_newassoc) - (*ic->ic_newassoc)(ic, ni, 1); - /* NB: hold reference */ - } else { - /* XXX optimize to avoid work done above */ - ieee80211_free_node(ic, ni); - } -#endif break; } @@ -1908,7 +1898,7 @@ IEEE80211_VERIFY_SSID(ic->ic_bss, ssid, "probe"); if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) return; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, @@ -1926,21 +1916,12 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, "%s: rate negotiation failed: %s\n", __func__,ether_sprintf(wh->i_addr2)); + if (allocbs) /* reclaim immediately */ + ieee80211_free_node(ni); } else { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); } - if (allocbs) { - /* - * When operating in ibss mode we hold the node but - * with a zero reference count; this is the current - * convention (XXX). For other cases we do nothing - * as the node is created with a short inactivity - * timer (may want to shorten it further here). - */ - if (ic->ic_opmode == IEEE80211_M_IBSS) - ieee80211_unref_node(&ni); - } break; } @@ -2050,7 +2031,7 @@ bintval = le16toh(*(u_int16_t *)frm); frm += 2; if (reassoc) frm += 6; /* ignore current AP info */ - ssid = rates = xrates = wpa = NULL; + ssid = rates = xrates = wpa = wme = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_SSID: @@ -2070,7 +2051,8 @@ if (iswpaoui(frm)) { if (ic->ic_flags & IEEE80211_F_WPA1) wpa = frm; - } + } else if (iswmeoui(frm)) + wme = frm; /* XXX Atheros OUI support */ break; } @@ -2086,12 +2068,12 @@ "%s: deny %sassoc from %s, not authenticated\n", __func__, reassoc ? "reassoc" : "assoc", ether_sprintf(wh->i_addr2)); - ni = ieee80211_dup_bss(ic, wh->i_addr2); + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, IEEE80211_REASON_ASSOC_NOT_AUTHED); - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); } ic->ic_stats.is_rx_assoc_notauth++; return; @@ -2180,6 +2162,28 @@ */ ni->ni_rsn = rsn; ieee80211_saveie(&ni->ni_wpa_ie, wpa); + } else if (ni->ni_wpa_ie != NULL) { + /* + * Flush any state from a previous association. + */ + FREE(ni->ni_wpa_ie, M_DEVBUF); + ni->ni_wpa_ie = NULL; + } + if (wme != NULL) { + /* + * Record WME parameters for station, mark node + * as capable of QoS and record information + * element for applications that require it. + */ + ieee80211_saveie(&ni->ni_wpa_ie, wpa); + ni->ni_flags |= IEEE80211_NODE_QOS; + } else if (ni->ni_wme_ie != NULL) { + /* + * Flush any state from a previous association. + */ + FREE(ni->ni_wme_ie, M_DEVBUF); + ni->ni_wme_ie = NULL; + ni->ni_flags &= ~IEEE80211_NODE_QOS; } ieee80211_node_join(ic, ni, resp); break; @@ -2187,7 +2191,6 @@ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: { - u_int8_t *wme; u_int16_t capinfo, associd; u_int16_t status; @@ -2225,7 +2228,7 @@ associd = le16toh(*(u_int16_t *)frm); frm += 2; - rates = xrates = wme = NULL; + rates = xrates = wpa = wme = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_RATES: @@ -2300,6 +2303,7 @@ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "" ); + ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_RUN, subtype); break; } @@ -2321,6 +2325,7 @@ IEEE80211_NODE_STAT(ni, rx_deauth); switch (ic->ic_opmode) { case IEEE80211_M_STA: + ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_AUTH, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -2358,6 +2363,7 @@ IEEE80211_NODE_STAT(ni, rx_disassoc); switch (ic->ic_opmode) { case IEEE80211_M_STA: + ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_ASSOC, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -2423,6 +2429,7 @@ /* XXX statistic */ return; } + ni->ni_inact = ic->ic_inact_run; /* Okay, take the first queued packet and put it out... */ _IF_DEQUEUE(&ni->ni_savedq, m); @@ -2439,7 +2446,7 @@ */ if (_IF_QLEN(&ni->ni_savedq) == 0) { if (ic->ic_set_tim) - (*ic->ic_set_tim)(ic, ni->ni_associd, 0); + ic->ic_set_tim(ic, ni->ni_associd, 0); } else { wh = mtod(m, struct ieee80211_frame_min *); wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#10 (text+ko) ==== @@ -87,6 +87,7 @@ struct wi_req wreq; struct wi_ltv_keys *keys; struct wi_apinfo *ap; + struct ieee80211_node_table *nt; struct ieee80211_node *ni; struct ieee80211_rateset *rs; struct wi_sigcache wsc; @@ -158,7 +159,7 @@ break; case WI_RID_COMMS_QUALITY: wreq.wi_val[0] = 0; /* quality */ - wreq.wi_val[1] = htole16(ic->ic_node_getrssi(ic, ic->ic_bss)); + wreq.wi_val[1] = htole16(ic->ic_node_getrssi(ic->ic_bss)); wreq.wi_val[2] = 0; /* noise */ wreq.wi_len = 3; break; @@ -266,19 +267,18 @@ /* XXX: should be implemented in lower drivers */ break; case WI_RID_READ_APS: - if (ic->ic_opmode != IEEE80211_M_HOSTAP) { - /* - * Don't return results until active scan completes. - */ - if (ic->ic_state == IEEE80211_S_SCAN && - (ic->ic_flags & IEEE80211_F_ASCAN)) { - error = EINPROGRESS; - break; - } + /* + * Don't return results until active scan completes. + */ + if (ic->ic_state == IEEE80211_S_SCAN && + (ic->ic_flags & IEEE80211_F_ASCAN)) { + error = EINPROGRESS; + break; } i = 0; ap = (void *)((char *)wreq.wi_val + sizeof(i)); - TAILQ_FOREACH(ni, &ic->ic_node, ni_list) { + nt = &ic->ic_scan; + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if ((caddr_t)(ap + 1) > (caddr_t)(&wreq + 1)) break; memset(ap, 0, sizeof(*ap)); @@ -296,7 +296,7 @@ ni->ni_esslen); } ap->channel = ieee80211_chan2ieee(ic, ni->ni_chan); - ap->signal = ic->ic_node_getrssi(ic, ni); + ap->signal = ic->ic_node_getrssi(ni); ap->capinfo = ni->ni_capinfo; ap->interval = ni->ni_intval; rs = &ni->ni_rates; @@ -317,8 +317,7 @@ wreq.wi_len = sizeof(u_int16_t) / 2; break; case WI_RID_SCAN_RES: /* compatibility interface */ - if (ic->ic_opmode != IEEE80211_M_HOSTAP && - ic->ic_state == IEEE80211_S_SCAN && + if (ic->ic_state == IEEE80211_S_SCAN && (ic->ic_flags & IEEE80211_F_ASCAN)) { error = EINPROGRESS; break; @@ -327,12 +326,13 @@ p2 = (struct wi_scan_p2_hdr *)wreq.wi_val; res = (void *)&p2[1]; i = 0; - TAILQ_FOREACH(ni, &ic->ic_node, ni_list) { + nt = &ic->ic_scan; + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if ((caddr_t)(res + 1) > (caddr_t)(&wreq + 1)) break; res->wi_chan = ieee80211_chan2ieee(ic, ni->ni_chan); res->wi_noise = 0; - res->wi_signal = ic->ic_node_getrssi(ic, ni); + res->wi_signal = ic->ic_node_getrssi(ni); IEEE80211_ADDR_COPY(res->wi_bssid, ni->ni_bssid); res->wi_interval = ni->ni_intval; res->wi_capinfo = ni->ni_capinfo; @@ -353,12 +353,13 @@ break; case WI_RID_READ_CACHE: i = 0; - TAILQ_FOREACH(ni, &ic->ic_node, ni_list) { + nt = &ic->ic_scan; + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (i == (WI_MAX_DATALEN/sizeof(struct wi_sigcache))-1) break; IEEE80211_ADDR_COPY(wsc.macsrc, ni->ni_macaddr); memset(&wsc.ipsrc, 0, sizeof(wsc.ipsrc)); - wsc.signal = ic->ic_node_getrssi(ic, ni); + wsc.signal = ic->ic_node_getrssi(ni); wsc.noise = 0; wsc.quality = 0; memcpy((caddr_t)wreq.wi_val + sizeof(wsc) * i, @@ -827,7 +828,9 @@ return error; kid = ik.ik_keyix; if (kid == IEEE80211_KEYIX_NONE) { - ni = ieee80211_find_node(ic, ik.ik_macaddr); + if (ic->ic_sta == NULL) + return EINVAL; + ni = ieee80211_find_node(ic->ic_sta, ik.ik_macaddr); if (ni == NULL) return EINVAL; /* XXX */ wk = &ni->ni_ucastkey; @@ -861,7 +864,7 @@ memset(ik.ik_keydata, 0, sizeof(ik.ik_keydata)); } if (ni != NULL) - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); return copyout(&ik, ireq->i_data, sizeof(ik)); } @@ -900,7 +903,9 @@ error = copyin(ireq->i_data, wpaie.wpa_macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - ni = ieee80211_find_node(ic, wpaie.wpa_macaddr); + if (ic->ic_sta == NULL) + return EINVAL; + ni = ieee80211_find_node(ic->ic_sta, wpaie.wpa_macaddr); if (ni == NULL) return EINVAL; /* XXX */ memset(wpaie.wpa_ie, 0, sizeof(wpaie.wpa_ie)); @@ -910,7 +915,7 @@ ielen = sizeof(wpaie.wpa_ie); memcpy(wpaie.wpa_ie, ni->ni_wpa_ie, ielen); } - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); if (ireq->i_len > sizeof(wpaie)) ireq->i_len = sizeof(wpaie); return copyout(&wpaie, ireq->i_data, ireq->i_len); @@ -929,7 +934,9 @@ error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - ni = ieee80211_find_node(ic, macaddr); + if (ic->ic_sta == NULL) + return EINVAL; + ni = ieee80211_find_node(ic->ic_sta, macaddr); if (ni == NULL) return EINVAL; /* XXX */ if (ireq->i_len > sizeof(struct ieee80211req_sta_stats)) @@ -937,7 +944,7 @@ /* NB: copy out only the statistics */ error = copyout(&ni->ni_stats, (u_int8_t *) ireq->i_data + off, ireq->i_len - off); - ieee80211_free_node(ic, ni); + ieee80211_free_node(ni); return error; } @@ -949,18 +956,17 @@ char data[512]; } u; struct ieee80211req_scan_result *sr = &u.res; + struct ieee80211_node_table *nt; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:03:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57F8016A4D0; Tue, 9 Nov 2004 01:03:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F43A16A4CE for ; Tue, 9 Nov 2004 01:03:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D114443D3F for ; Tue, 9 Nov 2004 01:03:02 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9132VW071792 for ; Tue, 9 Nov 2004 01:03:02 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9132eZ071789 for perforce@freebsd.org; Tue, 9 Nov 2004 01:03:02 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:03:02 GMT Message-Id: <200411090103.iA9132eZ071789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=64654 Change 64654 by peter@peter_daintree on 2004/11/09 01:02:02 IFC @64653 Affected files ... .. //depot/projects/hammer/bin/stty/key.c#4 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#15 integrate .. //depot/projects/hammer/etc/devd.conf#15 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#8 integrate .. //depot/projects/hammer/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#83 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#15 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#14 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#7 integrate .. //depot/projects/hammer/sbin/devfs/rule.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#18 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#16 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#13 integrate .. //depot/projects/hammer/share/man/man4/Makefile#55 integrate .. //depot/projects/hammer/share/man/man4/ath.4#17 integrate .. //depot/projects/hammer/share/man/man4/em.4#5 integrate .. //depot/projects/hammer/share/man/man4/gx.4#6 delete .. //depot/projects/hammer/share/man/man4/ixgb.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#5 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#9 integrate .. //depot/projects/hammer/share/man/man4/ste.4#6 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#7 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#10 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#4 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#21 integrate .. //depot/projects/hammer/sys/arm/arm/mem.c#1 branch .. //depot/projects/hammer/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/hammer/sys/arm/include/memdev.h#1 branch .. //depot/projects/hammer/sys/arm/include/pmap.h#5 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf.5#6 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#9 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#10 integrate .. //depot/projects/hammer/sys/conf/NOTES#72 integrate .. //depot/projects/hammer/sys/conf/files#90 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#23 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#12 delete .. //depot/projects/hammer/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/hammer/sys/dev/gx/if_gxvar.h#4 delete .. //depot/projects/hammer/sys/dev/lge/if_lge.c#19 integrate .. //depot/projects/hammer/sys/dev/md/md.c#43 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#23 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#23 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_mount.h#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#21 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#15 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_panasonic.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#33 integrate .. //depot/projects/hammer/sys/kern/init_main.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#35 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#11 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#38 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/hammer/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#58 integrate .. //depot/projects/hammer/sys/modules/gx/Makefile#2 delete .. //depot/projects/hammer/sys/net/if_ppp.c#17 integrate .. //depot/projects/hammer/sys/net/if_pppvar.h#2 integrate .. //depot/projects/hammer/sys/net/if_sl.c#20 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#9 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/hammer/sys/net/rtsock.c#19 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#12 integrate .. //depot/projects/hammer/sys/netatm/atm_aal5.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_usrreq.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#30 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#39 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#21 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#27 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#8 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#7 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#7 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#12 integrate .. //depot/projects/hammer/sys/netkey/key.c#19 integrate .. //depot/projects/hammer/sys/netkey/key.h#3 integrate .. //depot/projects/hammer/sys/netkey/keydb.h#5 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#11 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#14 integrate .. //depot/projects/hammer/sys/pci/if_de.c#21 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#45 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/sys/_types.h#12 integrate .. //depot/projects/hammer/sys/sys/file.h#9 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#10 integrate .. //depot/projects/hammer/sys/sys/kernel.h#12 integrate .. //depot/projects/hammer/sys/sys/ktr.h#8 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#8 integrate .. //depot/projects/hammer/sys/sys/protosw.h#8 integrate .. //depot/projects/hammer/sys/sys/resource.h#8 integrate .. //depot/projects/hammer/sys/sys/sf_buf.h#5 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#34 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#44 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#19 integrate .. //depot/projects/hammer/sys/vm/vm_param.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#18 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#23 integrate .. //depot/projects/hammer/tools/tools/genericize/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/raidtest/README#2 integrate .. //depot/projects/hammer/tools/tools/raidtest/raidtest.c#2 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#11 integrate .. //depot/projects/hammer/usr.bin/limits/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/hammer/usr.sbin/mrouted/defs.h#2 integrate .. //depot/projects/hammer/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/nfsd/nfsd.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.8#3 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#29 integrate Differences ... ==== //depot/projects/hammer/bin/stty/key.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.20 2004/11/06 13:56:18 ache Exp $"); #include @@ -263,7 +263,7 @@ ip->t.c_iflag |= ICRNL; /* preserve user-preference flags in lflag */ #define LKEEP (ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH) - ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP); + ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP); ip->t.c_oflag = TTYDEF_OFLAG; ip->set = 1; } ==== //depot/projects/hammer/etc/defaults/pccard.conf#15 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -505,8 +505,8 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# COREGA FEther PCC-TXD -card "corega K.K." "corega FEther PCC-TXD" +# COREGA FEther PCC-TXD and COREGA FEtherII PCC-TXD +card "corega K.K." "corega FEther(II)? PCC-TXD" config auto "ed" ? 0x30000 insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop ==== //depot/projects/hammer/etc/devd.conf#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.17 2004/09/10 20:57:44 wpaul Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -19,7 +19,7 @@ # Setup some shorthand for regex that we use later in the file. set ethernet-nic-regex "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ + ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\ xl)[0-9]+"; set scsi-controller-regex ==== //depot/projects/hammer/gnu/usr.bin/cc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.36 2004/07/28 05:27:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.38 2004/11/07 22:49:20 kan Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. @@ -10,7 +10,7 @@ .endif .if !defined(NO_CXX) -SUBDIR+= cc1plus c++ +SUBDIR+= cc1plus c++ c++filt .if !defined(NO_COLLECT2) #SUBDIR+= collect2 .endif ==== //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#6 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.18 2004/10/24 15:32:26 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.19 2004/11/07 13:46:16 kan Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR} PROG= c++filt -SRCS= cp-demangle.c cplus-dem+%DIKED.c +SRCS= cp-demangle.c NOMAN= CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" @@ -13,11 +13,4 @@ DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} -cplus-dem+%DIKED.c: cplus-dem.c - sed -e 's/^xmalloc[ ]/_DONT_xmalloc /g' \ - -e 's/^xrealloc[ ]/_DONT_xrealloc /g' \ - ${.ALLSRC} > ${.TARGET} - -CLEANFILES= cplus-dem+%DIKED.c - .include ==== //depot/projects/hammer/lib/libarchive/archive_private.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libarchive/archive_private.h,v 1.15 2004/08/14 03:45:45 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.16 2004/11/06 05:25:53 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ /* Don't compile this if we don't have bzlib. */ #if HAVE_BZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.7 2004/11/06 05:25:53 kientzle Exp $"); #include #include ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ /* Don't compile this if we don't have zlib. */ #if HAVE_ZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.8 2004/11/05 05:26:30 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.9 2004/11/06 05:25:53 kientzle Exp $"); #include #include ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.7 2004/11/06 05:25:53 kientzle Exp $"); #include #include ==== //depot/projects/hammer/lib/libc/arm/string/ffs.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.2 2004/11/07 16:54:54 cognet Exp $"); /* * ffs - find first set bit, this algorithm isolates the first set @@ -49,6 +49,7 @@ /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ rsb r1, r0, #0 ands r0, r0, r1 +#ifndef __XSCALE__ /* * now r0 has at most one set bit, call this X * if X = 0, all further instructions are skipped @@ -74,3 +75,8 @@ .byte 10, 0, 0, 25, 0, 0, 21, 27 /* 40-47 */ .byte 31, 0, 0, 0, 0, 24, 0, 20 /* 48-55 */ .byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */ +#else + clzne r0, r0 + rsbne r0, r0, #32 + mov pc, lr +#endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.260 2004/11/02 22:31:29 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.261 2004/11/08 19:50:44 brueffer Exp $ Supported Devices @@ -332,8 +332,6 @@ &hwlist.em; - &hwlist.gx; - &hwlist.hme; &hwlist.gem; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#83 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.781 2004/10/11 13:07:04 den Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.782 2004/11/07 18:17:38 hrs Exp $ 2000 @@ -16,14 +16,7 @@ The release notes for &os; &release.current; contain a summary - of - - + of the changes made to the &os; base system since &release.branch; is created. This document lists applicable security advisories that were issued since the last release, as well as significant changes to the &os; kernel and userland. @@ -108,409 +101,17 @@ Security Advisories - A bug in &man.mksnap.ffs.8; has been fixed; it caused the creation of a - file system snapshot to reset the flags on the file system to - their default values. The possible consequences depended on local - usage, but could include disabling extended access control lists - or enabling the use of setuid executables stored on an untrusted - file system. This bug also affected the &man.dump.8; - option, which uses &man.mksnap.ffs.8;. Note - that &man.mksnap.ffs.8; is normally only available to the - superuser and members of the operator - group. For more information, see security advisory FreeBSD-SA-04:01. - - A bug with the System V Shared Memory interface - (specifically the &man.shmat.2; system call) has been fixed. - This bug can cause a shared memory segment to reference - unallocated kernel memory. In turn, this can permit a local - attacker to gain unauthorized access to parts of kernel memory, - possibly resulting in disclosure of sensitive information, - bypass of access control mechanisms, or privilege escalation. - More details can be found in security advisory FreeBSD-SA-04:02. - &merged; - - A programming error in the &man.jail.attach.2; system call - has been fixed. This error could allow a process with superuser - privileges inside a &man.jail.8; environment to change its root - directory to that of a different jail, and thus gain full read - and write access to files and directories within the target - jail. More information can be found in security advisory FreeBSD-SA-04:03. - - A potential low-bandwidth denial-of-service attack against - the &os; TCP stack has been prevented by limiting the number of - out-of-sequence TCP segments that can be held at one time. More - details can be found in security advisory FreeBSD-SA-04:04. - &merged; - - A bug in OpenSSL's SSL/TLS - ChangeCipherSpec message processing could result in - a null pointer dereference, has been fixed. - This could allow a remote attacker to crash an - OpenSSL-using - application and cause a denial-of-service on the system. - More details can be found in security advisory FreeBSD-SA-04:05. - &merged; - - A programming error in the handling of some IPv6 - socket options within the &man.setsockopt.2; system call - has been fixed. This allows a local attacker to cause a - system panic, and may allow to gain unauthorized access to - parts of kernel memory, possibly resulting in disclosure - of sensitive information, bypass of access control - mechanisms, or privilege escalation. - More details can be found in security advisory FreeBSD-SA-04:06. - - Two programming errors in CVS - have been fixed. They allow a server to overwrite arbitrary - files on the client, and a client to read arbitrary files - on the server when accessing remote CVS repositories. - More details can be found in security advisory FreeBSD-SA-04:07. &merged; - - A bugfix for Heimdal rectifies a - problem in which it would not perform adequate checking of - authentication across autonomous realms. For more information, - see security advisory FreeBSD-SA-04:08. &merged; - - A programming error in CVS which - allow the malicious client to overwrite arbitrary portions of - the server's memory has been fixed. For more information, - see security advisory FreeBSD-SA-04:10. &merged; - - A potential cache consistency problem of - the implementation of the &man.msync.2; system call - involving the MS_INVALIDATE - operation has been fixed. However, as a side effect of closing - this security problem, the MS_INVALIDATE - flag no longer guarantees that all pages in the range are invalidated. - Users who require the old semantics of MS_INVALIDATE - and are not concerned with the security issue being fixed can set the - vm.old_msync sysctl to 1 which will revert to - the old (insecure) behavior. For more information, - see security advisory FreeBSD-SA-04:11. &merged; - - A programming error in the &man.jail.2; system call - which results in a failure to verify that an attempt - to manipulate routing tables originated from a non-jailed process - has been fixed. - For more information, see security advisory FreeBSD-SA-04:12. &merged; - - A programming error in the handling of some Linux system calls which - may result in memory locations being accessed without proper validation - has been fixed. - For more information, see security advisory FreeBSD-SA-04:13. &merged; - - A number of programming errors in CVS - which allow information disclosure, denial-of-service, or - possibly arbitrary code execution, have been fixed - via an upgrade to CVS 1.11.17. - For more information, see security advisory FreeBSD-SA-04:14. &merged; - - A bug in CONS_SCRSHOT &man.ioctl.2; - has been fixed; it may allow to gain unauthorized access to - parts of kernel memory, possibly resulting in disclosure - of sensitive information, bypass of access control - mechanisms, or privilege escalation. - For more information, see security advisory FreeBSD-SA-04:15. &merged; - + Kernel Changes - ADAPTIVE_MUTEXES has been added - and enabled by default. This changes the behavior - of blocking mutexes to spin if the thread that currently - owns the mutex is executing on another CPU. - This feature can be disabled explicitly by setting - a kernel option NO_ADAPTIVE_MUTEXES. - - A kernel option ADAPTIVE_GIANT, which - causes the Giant lock to also be treated in - an adaptive fashion when adaptive mutexes are enabled, - has been added. This improves the performance of SMP machines - and is enabled by default on the i386. - - The &man.bus.dma.9; interface now supports transparently honoring - the alignment and boundary constraints in the DMA tag - when loading buffers, and bus_dmamap_load() - will automatically use bounce buffers when needed. - In addition, a set of sysctls hw.busdma.* - for &man.bus.dma.9; statistics has been added. - - The &man.contigmalloc.9; function has been reimplemented - with an algorithm which stands a greatly-improved chance of working - despite pressure from running programs. The old algorithm can be used - by setting a sysctl vm.old_contigmalloc. More details - can be found in the &man.contigmalloc.9; manual page. - - The &man.devfs.5; path rules now work correctly on - directories. - - The &man.getvfsent.3; API has been removed. - - The hw.pci.allow_unsupported_io_range - loader tunable has been removed. - - &man.jail.2; now supports the use of raw sockets from within a jail. - This feature is disabled by default, and controlled by using the - security.jail.allow_raw_sockets sysctl. - - &man.kqueue.2; now supports a new filter - EVFILT_FS to be used to signal generic file system - events to the user space. Currently, mount, unmount, and up/down - status of NFS are signaled. - - KDB, a new debugger framework, has been added. - This consists of a new GDB backend, which has been rewritten to support - threading, run-length encoding compression, and so on, and - the frontend that provides a framework in which multiple, different - debugger backends can be configured and which provides - basic services to those backends. - The following options has been changed: - - - - KDB is enabled by default - via the kernel options options KDB, - options GDB, and options DDB. - Both DDB and - GDB specify which KDB backends to include. - - - - WITNESS_DDB has been renamed to - WITNESS_KDB. - - - - DDB_TRACE has been renamed to - KDB_TRACE. - - - - DDB_UNATTENDED has been renamed to - KDB_UNATTENDED. - - - - SC_HISTORY_DDBKEY has been renamed to - SC_HISTORY_KDBKEY. - - - - DDB_NOKLDSYM has been removed. - The new DDB backend supports pre-linker symbol - lookups as well as KLD symbol lookups at the same time. - - - - GDB_REMOTE_CHAT has been removed. - The GDB protocol hacks to allow this are &os; specific. - At the same time, the GDB protocol has packets for console - output. - - - - KDB also serves as the single point of contact for any and - all code that wants to make use of the debugger functions, - such as entering the debugger or handling of the - alternate break sequence. - For this purpose, the frontend has been made non-optional. - All debugger requests are forwarded or handed over to the current - backend, if applicable. - Selection of the current backend is done by the - debug.kdb.current sysctl. - A list of configured backends can be obtained with the - debug.kdb.available sysctl. - One can enter the debugger by writing to the - debug.kdb.enter sysctl. - - A new sysctl debug.kdb.stop_cpus has been - added. This controls whether or not IPI (Inter Processor Interrupts) - to other CPUs will be delivered when entering the debugger, - in order to stop them while in the debugger. - - Loadable kernel modules now work and are - enabled in the amd64 build. - - Preliminary support for running 32-bit - Linux binaries on amd64 has been added. This feature is enabled with the - COMPAT_LINUX32 kernel option. - - A new kernel option MAC_STATIC which - disables internal MAC Framework synchronization protecting against - dynamic load and unload of MAC policies, has been added. - - The &man.mac.bsdextended.4; policy now supports to match and - apply on a first rule only in place of all rules match. - This feature can be enabled by setting a new sysctl - mac_bsdextended_firstmatch_enabled. - - The &man.mac.bsdextended.4; policy can now log - failed attempts to syslog's AUTHPRIV facility. - This feature can be enabled by setting a new sysctl - mac_bsdextended_logging. - - mballoc has been replaced with mbuma, an Mbuf and Cluster - allocator built on top of a number of extensions to the UMA framework. - Due to this change, the NMBCLUSTERS kernel option - is no longer used. The maximum number of the clusters is still - capped off according to maxusers, - but it can be made unlimited by setting the - kern.ipc.nmbclusters loader tunable to zero. - - /dev/kmem, /dev/mem, - and /dev/io are also provided as kernel - loadable modules now. - - A bug in &man.mmap.2; that pages marked as PROT_NONE - may become readable under certain circumstances, has been fixed. &merged; - - A new kernel option MP_WATCHDOG - has been added; it - allows one of the logical CPUs on a system to be used as a dedicated - watchdog to cause a drop to the debugger and/or generate an NMI - to the boot processor if the kernel ceases to respond. - Several sysctls are available to enable the watchdog running out of the - processor's idle thread; a callout is launched to reset a timer - in the watchdog. If the callout fails to reset the timer for ten seconds, - the timeout process will take place. The debug.watchdog_cpu - sysctl allows to select which CPU will run the watchdog. - - A sysctl debug.leak_schedlock - has been added. This causes a sysctl handler that incorrectly leaks - the holding sched lock, to spin the lock - in order to trigger the watchdog provided by the - MP_WATCHDOG option. - - A new loader tunable debug.mpsafenet has been - added and enabled by default. This causes the &os; network stack - to operate without the Giant lock, resulting in performance - improvement by increasing parallelism and decreasing latency - in network processing. Note that enabling one of the &man.ng.tty.4; - Netgraph node type, KAME IPsec, and IPX/SPX subsystem results in a boot-time - restoration of Giant-enabled network operation, or run-time - warning on dynamic load as these components require Giant lock - for correct operation. - - A new kernel option NET_WITH_GIANT has been - added. This restores the default value of debug.mpsafenet to - 0, and is intended for use on systems compiled with - known unsafe components, or where a more conservative configuration is - desired. - - A new loader tunable debug.mpsafevm has been - added. This currently results in almost - Giant-free execution of zero-fill page faults. - - A loader tunable debug.mpsafevm + The loader tunable debug.mpsafevm has been has been enabled by default. - A new kernel option - PREEMPTION has been added. - This allows the threads that are in the kernel to be preempted - by higher priority threads. It helps with interactivity and - allows interrupt threads to run sooner rather than waiting. - - A devclass level has been added to the dev sysctl tree, - in order to support per-class variables in addition to - per-device variables. This means that dev.foo0.bar - is now called dev.foo.0.bar, and it is - possible to to have dev.foo.bar as well. - - A new sysctl, kern.always_console_output, - has been added. It makes output from the kernel go to the console despite - the use of TIOCCONS. - - A sysctl kern.sched.name - which has the name of the scheduler currently in use, - has been added, and the kern.quantum sysctl - has been moved to kern.sched.quantum - for consistency. - - The &man.pci.4; bus resource and power management have - been updated. - - - Although the &man.pci.4; bus power state management - has been enabled by default, it may cause problems on some systems. - This can be disabled by setting the tunable - hw.pci.do_powerstate to - 0. - - - - The ULE scheduler has been added as an additional scheduler. - Note that the conventional one, which is called 4BSD, is still used - as the default scheduler in GENERIC kernel. - For the average user, - interactivity is reported to be better in many cases. This - means less skipping and jerking in - interactive applications while the machine is very busy. This - will not prevent problems due to overloaded disk subsystems, but - it does help with overloaded CPUs. On SMP machines, ULE has - per-CPU run queues which allow for CPU affinity, CPU binding, - and advanced HyperThreading support, as well as providing a - framework for more optimizations in the future. As fine-grained - kernel locking continues, the scheduler will be able to make - more efficient use of the available parallel resources. - - A linear search algorithm used in - &man.vm.map.findspace.9; has been replaced with - an O(log n) algorithm built into the map entry splay tree. - This significantly reduces the overhead in &man.vm.map.findspace.9; - for applications that &man.mmap.2; many hundreds or thousands - of regions. - - The loader tunables debug.witness_* - have been renamed to debug.witness.*. - - The &os; dynamic and static linker now support Thread Local Storage (TLS), - a GCC feature which supports - a __thread modifier - to the declaration of global and static variables. - This extra modifier means that the variable's value is - thread-local; one thread changing its value will not - affect the value of the variable in any other thread. - - The kernel's file descriptor allocation code has been - updated, and is now derived from similar code in OpenBSD. - - On &os;/sparc64, time_t - has been changed from a 32-bit value to a 64-bit value. - - - Since this change is not backward-compatible, - any programs which were built on an older system using - a 32-bit time_t and - call system routines for handling - time_t values, will have to be recompiled. - More detailed information and notice on upgrading from - the source can be found in - /usr/src/UPDATING.64BTT. - - - - It is now possible to compile the &os;/i386 - kernel with the Intel C/C++ Compiler (as in the lang/icc port). - Boot Loader Changes @@ -531,541 +132,29 @@ Hardware Support - The &man.acpi.asus.4; driver has been added - to use ACPI-controlled hardware features, such as hot keys and - LEDs on ASUSTek laptops. - - The &man.acpi.panasonic.4; driver has been added - to support hot keys of Panasonic laptops. It now supports - Let's note (or Toughbook, outside Japan) CF-R1N, CF-R2A, and - CF-R3. - - The &man.acpi.toshiba.4; driver has been added - to use Toshiba's Hardware Control Interface to manipulate - certain hardware features on Toshiba laptops, such as - video output switching. - - The &man.acpi.video.4; driver has been added to provide - control display switching and backlight brightness using the - ACPI Video Extensions. - - The &man.acpi.4; driver now supports - per-device sysctls (dev.root0.nexus0.acpi0.acpi_lid0.wake, - for instance) to allow users to set whether or not a given - device can wake the system. - - The &man.acpi.4; driver will now - be disabled automatically when the machine has a well-known broken BIOS. - This behavior can be overridden by setting the loader tunable - hint.acpi.0.disabled to 0. - - The &man.agp.4; driver now supports the AMD64 graphics - aperture relocation table (GART). - - The &man.ctau.4; driver has been added for Cronyx Tau - synchronous serial adapters. This driver was known for a long time as - ct in its previous life outside the &os; source tree. &merged; - - - The driver name has changed, but the network interface still - has the ct name. - - - - The &man.cp.4; driver has been added for Cronyx Tau-PCI - synchronous serial adapters. - - The dgb - (DigiBoard intelligent serial card) driver has been - removed due to breakage. Its replacement is the &man.digi.4; driver, - which supports all the hardware of the dgb - driver. - - The &man.nmdm.4; driver has been rewritten to improve its reliability. - - The raid(4) driver - (RAIDframe disk driver from NetBSD) has been removed. - It is currently non-functional, and would require some amount of work - to make it work under the &man.geom.4; API in 5-CURRENT. - - An entry of the &man.pcic.4; driver has been removed from a - kernel configuration file for GENERIC kernel because - this is no longer maintained. The entry had actually - been commented out for a long time. - - The &man.psm.4; driver and &man.moused.8; - now support the Synaptics TouchPad. - - The entropy device &man.random.4; now - supports a hardware random number generator (RNG) - in the VIA C3 Nehemiah (Stepping 3 and above) CPU. - - The &man.sab.4; driver now supports the - BREAK_TO_DEBUGGER kernel option. - - The sx driver, - which supports Specialix I/O8+ and I/O4+ - intelligent multiport serial controllers, has been added. - - For the &man.uart.4; device, - the hw.uart.console and - hw.uart.dbgport kernel environment variables - have been added. They can be used to select a serial console and - debug port respectively, as well as the attributes. - - The &man.ubser.4; device driver has been added to support - BWCT console management serial adapters. - - &man.ucycom.4; driver has been added for - the Cypress CY7C637xx and CY7C640/1xx families of USB to RS232 bridges, - such as the one found in the DeLorme Earthmate USB GPS - receiver (which is the only device currently supported by this driver). - This driver is not complete because there is no support yet for flow - control and output. - - Several old drivers for ISA cards have been removed, - including - the asc driver for GI1904-based hand scanners, - the ctx driver for CORTEX-I Frame Grabber, - the gp driver for National Instruments AT-GPIB and AT-GPIB/TNT boards, - the gsc driver for the Genius GS-4500 hand scanner, - the le driver for DEC EtherWORKS II and III Ethernet controllers, - the rdp driver for RealTek RTL 8002-based pocket Ethernet adapters, - the spigot driver for the Creative Labs Video Spigot video-acquisition board, - the stl and - stli drivers for Stallion Technologies multiport serial - controllers, and the wt driver for Archive/Wangtek cartridge tapes. - They are currently non-functional, and would require a considerable - amount of work to make them work under the new API in 5-CURRENT. - The userland support such as related ioctls and utilities including - sasc and sgsc - has also been removed. - - The device driver infrastructure (as well as many drivers) - have been updated. Among the changes: Many more drivers now use - automatically-assigned major numbers (instead of the old static - major numbers). Enhanced functions to support cloning of - pseudo-devices. Several changes to the driver API, including a - new d_version field in struct - cdevsw. Note that third-party device drivers will - require recompiling after this change. - Multimedia Support - The meteor (video capture) - driver has been removed due to - breakage and lack of maintainership. - - The Direct Rendering Manager (DRM) code has been updated - from the DRI Project CVS tree as of 26 May, 2004. This update - includes new PCI IDs and a new packet for Radeon. - - The drivers for various sound cards has been reorganized; - device sound is the generic sound driver, - and device snd_* are device-specific sound drivers now. - The midi driver, which supports serial port - and several sound cards, has been removed. - More details can be found in related manual pages: - &man.sound.4;, &man.snd.ad1816.4;, &man.snd.als4000.4;, &man.snd.cmi.4;, - &man.snd.cs4281.4;, &man.snd.csa.4;, &man.snd.ds1.4;, &man.snd.emu10k1.4;, - &man.snd.es137x.4;, &man.snd.gusc.4;, &man.snd.maestro3.4;, - &man.snd.sbc.4;, &man.snd.solo.4;, and &man.snd.uaudio.4;. - - The &man.sound.4; (formerly &man.pcm.4;) driver has been modified to read - /boot/device.hints on startup, to allow setting - of default values for mixer channels. - Note that currently the device driver's name used in - /boot/device.hints is still pcm. - More detailed information and examples can be found in the &man.sound.4; - manual page. + Network Interface Support - The &man.arl.4; driver, which supports - Aironet Arlan 655 wireless adapters has been added. &merged; - - The &man.dc.4; driver now supports sparc64 - Davicom cards that store their MAC address in - Open Firmware. - - A short hiccup in the &man.em.4; driver during parameter - reconfiguration, has been fixed. &merged; - - The &man.fwip.4; driver, which supports IP over FireWire has been added. - Note that currently the broadcast channel number is hardwired and - MCAP for multicast channel allocation is not supported. - This driver is intended to conform to the RFC 2734 and RFC 3146 - standard for IP over FireWire and eventually replace - the &man.fwe.4; driver. - - &man.fxp.4; now uses the device sysctl tree such as - dev.fxp0, and those sysctls can be set - on a per-device basis. - - &man.fxp.4; now provides actual control over its capability - to receive extended Ethernet frames, indicated by the - VLAN_MTU interface capability. - It can be toggled from userland with the aid of the - and options - to &man.ifconfig.8;. - - The hea - (Efficient Networks, Inc. ENI-155p ATM adapter) - driver has been removed due to breakage. Its functionality - has been subsumed into the &man.en.4; driver. - - The &man.hme.4; driver now natively supports - long frames, so it can be used for &man.vlan.4; with full Ethernet - MTU size. - - The &man.hme.4; driver now supports - TCP/UDP Transmit/Receive checksum offload. - Since &man.hme.4; does not compensate the checksum - for UDP datagram which can yield to 0x0, - UDP transmit checksum offload is disabled by default. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:06:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BF1116A4D0; Tue, 9 Nov 2004 01:06:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2839A16A4CE for ; Tue, 9 Nov 2004 01:06:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 067B943D54 for ; Tue, 9 Nov 2004 01:06:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9166JN071922 for ; Tue, 9 Nov 2004 01:06:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9166Xl071919 for perforce@freebsd.org; Tue, 9 Nov 2004 01:06:06 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:06:06 GMT Message-Id: <200411090106.iA9166Xl071919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:06:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64655 Change 64655 by peter@peter_daintree on 2004/11/09 01:06:02 kill pbio addition Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#59 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#59 (text+ko) ==== @@ -102,7 +102,6 @@ amd64/isa/isa.c standard amd64/isa/isa_dma.c standard amd64/isa/nmi.c standard -amd64/isa/pbio.c optional pbio amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:10:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F09416A4D0; Tue, 9 Nov 2004 01:10:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A71816A4CE for ; Tue, 9 Nov 2004 01:10:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6636743D3F for ; Tue, 9 Nov 2004 01:10:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA91AC0d071981 for ; Tue, 9 Nov 2004 01:10:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA91ACxx071978 for perforce@freebsd.org; Tue, 9 Nov 2004 01:10:12 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:10:12 GMT Message-Id: <200411090110.iA91ACxx071978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=64656 Change 64656 by peter@peter_daintree on 2004/11/09 01:09:38 unspam headers Affected files ... .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#3 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#3 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#3 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_fsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); #include #include ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_gsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); #include #include ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_set_fsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); #include ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_set_gsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); #include From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:50:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5026F16A4D0; Tue, 9 Nov 2004 01:50:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEB8B16A4CE for ; Tue, 9 Nov 2004 01:50:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C45A143D46 for ; Tue, 9 Nov 2004 01:50:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA91o1qO073153 for ; Tue, 9 Nov 2004 01:50:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA91o13g073150 for perforce@freebsd.org; Tue, 9 Nov 2004 01:50:01 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:50:01 GMT Message-Id: <200411090150.iA91o13g073150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64659 Change 64659 by peter@peter_daintree on 2004/11/09 01:49:57 converge towards i386. I don't understand this stuff. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -47,40 +48,45 @@ void * gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); - /* XXX this stuff is mighty suspicious */ if (kdb_thread == curthread) { switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rcx); - case 2: return (&tf->tf_rdx); + case 0: return (&kdb_frame->tf_rax); + case 1: return (&kdb_frame->tf_rcx); + case 2: return (&kdb_frame->tf_rdx); } } - /* i386 uses kdb_thrctx, a pcb for these */ switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rbx); - case 2: return (&tf->tf_rcx); - case 3: return (&tf->tf_rdx); - case 4: return (&tf->tf_rsi); - case 5: return (&tf->tf_rdi); - case 6: return (&tf->tf_rbp); - case 7: return (&tf->tf_rsp); - case 8: return (&tf->tf_r8); - case 9: return (&tf->tf_r9); - case 10: return (&tf->tf_r10); - case 11: return (&tf->tf_r11); - case 12: return (&tf->tf_r12); - case 13: return (&tf->tf_r13); - case 14: return (&tf->tf_r14); - case 15: return (&tf->tf_r15); - case 16: return (&tf->tf_rip); - case 17: return (&tf->tf_rflags); - case 18: return (&tf->tf_cs); - case 19: return (&tf->tf_ss); +#if 0 + case 0: return (&kdb_thrctx->pcb_rax); +#endif + case 1: return (&kdb_thrctx->pcb_rbx); +#if 0 + case 2: return (&kdb_thrctx->pcb_rcx); + case 3: return (&kdb_thrctx->pcb_rdx); + case 4: return (&kdb_thrctx->pcb_rsi); + case 5: return (&kdb_thrctx->pcb_rdi); +#endif + case 6: return (&kdb_thrctx->pcb_rbp); + case 7: return (&kdb_thrctx->pcb_rsp); +#if 0 + case 8: return (&kdb_thrctx->pcb_r8); + case 9: return (&kdb_thrctx->pcb_r9); + case 10: return (&kdb_thrctx->pcb_r10); + case 11: return (&kdb_thrctx->pcb_r11); +#endif + case 12: return (&kdb_thrctx->pcb_r12); + case 13: return (&kdb_thrctx->pcb_r13); + case 14: return (&kdb_thrctx->pcb_r14); + case 15: return (&kdb_thrctx->pcb_r15); + case 16: return (&kdb_thrctx->pcb_rip); + case 17: return (&kdb_thrctx->pcb_rflags); +#if 0 + case 18: return (&kdb_thrctx->pcb_cs); + case 19: return (&kdb_thrctx->pcb_ss); +#endif } return (NULL); } @@ -88,12 +94,12 @@ void gdb_cpu_setreg(int regnum, register_t val) { - struct trapframe *tf = kdb_frame; val = __bswap64(val); switch (regnum) { case GDB_REG_PC: + kdb_thrctx->pcb_rip = val; if (kdb_thread == curthread) - tf->tf_rip = val; + kdb_frame->tf_rip = val; } } From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:55:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B794C16A4D0; Tue, 9 Nov 2004 01:55:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D14F16A4CE for ; Tue, 9 Nov 2004 01:55:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8217843D31 for ; Tue, 9 Nov 2004 01:55:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA91t8GN073362 for ; Tue, 9 Nov 2004 01:55:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA91t8W9073358 for perforce@freebsd.org; Tue, 9 Nov 2004 01:55:08 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:55:08 GMT Message-Id: <200411090155.iA91t8W9073358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:55:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=64660 Change 64660 by peter@peter_daintree on 2004/11/09 01:54:34 IFC @64658 Affected files ... .. //depot/projects/hammer/sys/sys/resource.h#9 integrate Differences ... ==== //depot/projects/hammer/sys/sys/resource.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)resource.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/resource.h,v 1.26 2004/11/09 00:55:23 des Exp $ + * $FreeBSD: src/sys/sys/resource.h,v 1.27 2004/11/09 01:33:58 des Exp $ */ #ifndef _SYS_RESOURCE_H_ @@ -98,7 +98,7 @@ #define RLIM_NLIMITS 11 /* number of resource limits */ -#define RLIM_INFINITY ((rlim_t)(((int64_t)1 << 63) - 1)) +#define RLIM_INFINITY ((rlim_t)(((uint64_t)1 << 63) - 1)) /* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */ From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:56:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB15316A4DA; Tue, 9 Nov 2004 01:56:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56EEB16A4CE for ; Tue, 9 Nov 2004 01:56:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4053343D3F for ; Tue, 9 Nov 2004 01:56:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA91uAQ6073438 for ; Tue, 9 Nov 2004 01:56:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA91u9Up073435 for perforce@freebsd.org; Tue, 9 Nov 2004 01:56:09 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:56:09 GMT Message-Id: <200411090156.iA91u9Up073435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=64661 Change 64661 by peter@peter_daintree on 2004/11/09 01:55:30 IFC @64658 Affected files ... .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#4 integrate Differences ... ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 9 02:17:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 943C616A4D0; Tue, 9 Nov 2004 02:17:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DC5216A4CE; Tue, 9 Nov 2004 02:17:28 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01B8F43D3F; Tue, 9 Nov 2004 02:17:28 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.4.250] (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.13.1/8.13.1) with ESMTP id iA92HRFH033720; Mon, 8 Nov 2004 18:17:27 -0800 (PST) (envelope-from marcel@xcllnt.net) In-Reply-To: <200411090150.iA91o13g073150@repoman.freebsd.org> References: <200411090150.iA91o13g073150@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v619) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <7F404A8C-31F5-11D9-AB55-000D93C47836@xcllnt.net> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Mon, 8 Nov 2004 18:17:25 -0800 To: Peter Wemm X-Mailer: Apple Mail (2.619) cc: Perforce Change Reviews Subject: Re: PERFORCE change 64659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 02:17:29 -0000 On Nov 8, 2004, at 5:50 PM, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=64659 > > Change 64659 by peter@peter_daintree on 2004/11/09 01:49:57 > > converge towards i386. I don't understand this stuff. ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#4 (text+ko) ==== gdb_cpu_getreg() returns the storage location of the value for the requested register and FOR THE CURRENT THREAD. The storage location can be NULL, meaning that the register is not accessable (when not saved for example). This fact is passed on to kgdb(1) so that "info registers" shows values for registers that were saved and "*not available*" or something along those lines for registers that weren't saved (rather than a bogus value). In any case, the storage location is the PCB by default, but can be the trapframe when the thread that the user is looking at in kgdb(1) and represented by kdb_thread happens to be the thread that entered the debugger. One should not have to worry about it in (hopefully) most cases, because a PCB is constructed from the trapframe, but this doesn't always pan out so nicely. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Tue Nov 9 14:43:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 690F216A4D0; Tue, 9 Nov 2004 14:43:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1240E16A4CE for ; Tue, 9 Nov 2004 14:43:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB96343D39 for ; Tue, 9 Nov 2004 14:43:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9Eh72B020155 for ; Tue, 9 Nov 2004 14:43:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9Eh7OJ020152 for perforce@freebsd.org; Tue, 9 Nov 2004 14:43:07 GMT (envelope-from jhb@freebsd.org) Date: Tue, 9 Nov 2004 14:43:07 GMT Message-Id: <200411091443.iA9Eh7OJ020152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 14:43:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=64688 Change 64688 by jhb@jhb_slimer on 2004/11/09 14:42:52 Revert most of the changes here to get a much simpler overall diff that uses the 386 versions with no membars for all UP kernels and only uses hard barriers for SMP kernels. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#17 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#17 (text+ko) ==== @@ -69,7 +69,7 @@ int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); -#define ATOMIC_STORE_LOAD(TYPE, LOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -172,15 +172,16 @@ #if defined(__GNUC__) || defined(__INTEL_COMPILER) -#if defined(I386_CPU) +#if !defined(SMP) /* * We assume that a = b will do atomic loads and stores. However, on a * PentiumPro or higher, reads may pass writes, so for that case we have - * to use a serializing instruction (i.e. with LOCK) to do the load. For - * the 386 case we can use a simple read since 386s don't support SMP. + * to use a serializing instruction (i.e. with LOCK) to do the load in + * SMP kernels. For UP kernels, however, the cache of the single processor + * is always consistent, so we don't need any memory barriers. */ -#define ATOMIC_STORE_LOAD(TYPE, LOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -195,9 +196,9 @@ } \ struct __hack -#else /* !defined(I386_CPU) */ +#else /* defined(SMP) */ -#define ATOMIC_STORE_LOAD(TYPE, LOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -211,21 +212,26 @@ return (res); \ } \ \ +/* \ + * The XCHG instruction asserts LOCK automagically. \ + */ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile("" : : : "memory"); \ - *p = v; \ + __asm __volatile(SOP \ + : "+m" (*p), /* 0 */ \ + "+r" (v) /* 1 */ \ + : : "memory"); \ } \ struct __hack -#endif /* defined(I386_CPU) */ +#endif /* !defined(SMP) */ #else /* !(defined(__GNUC__) || defined(__INTEL_COMPILER)) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); -#define ATOMIC_STORE_LOAD(TYPE, LOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -253,10 +259,10 @@ ATOMIC_ASM(add, long, "addl %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subl %1,%0", "ir", v); -ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1"); -ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1"); -ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1"); -ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1"); +ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "xchgb %b1,%0"); +ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "xchgw %w1,%0"); +ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "xchgl %1,%0"); +ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1", "xchgl %1,%0"); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD From owner-p4-projects@FreeBSD.ORG Tue Nov 9 14:51:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D990716A4D0; Tue, 9 Nov 2004 14:51:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C30B16A4CF for ; Tue, 9 Nov 2004 14:51:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7363A43D46 for ; Tue, 9 Nov 2004 14:51:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9EpIp9020428 for ; Tue, 9 Nov 2004 14:51:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9EpIGV020425 for perforce@freebsd.org; Tue, 9 Nov 2004 14:51:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 9 Nov 2004 14:51:18 GMT Message-Id: <200411091451.iA9EpIGV020425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 14:51:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=64689 Change 64689 by jhb@jhb_slimer on 2004/11/09 14:50:33 Update. Affected files ... .. //depot/projects/smpng/sys/notes#25 edit Differences ... ==== //depot/projects/smpng/sys/notes#25 (text+ko) ==== @@ -51,6 +51,8 @@ a fast interrupt context - "Optimize" atomic_store_rel() on i386 (it actually seems to be slower, go figure) + + It is faster on UP, but slower on SMP, so tweak the patch so that we use + the non-MP safe 386 versions on all UP kernels. - Optimize spin locks on UP such that they don't do atomic operations - Untested - Unbenchmarked From owner-p4-projects@FreeBSD.ORG Tue Nov 9 20:25:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16DD216A4D0; Tue, 9 Nov 2004 20:25:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E01AE16A4CE for ; Tue, 9 Nov 2004 20:25:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDE5543D39 for ; Tue, 9 Nov 2004 20:25:15 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9KPFdf042455 for ; Tue, 9 Nov 2004 20:25:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9KPFEL042452 for perforce@freebsd.org; Tue, 9 Nov 2004 20:25:15 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 20:25:15 GMT Message-Id: <200411092025.iA9KPFEL042452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 20:25:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=64712 Change 64712 by sam@sam_ebb on 2004/11/09 20:24:29 add start of list support; can list station and scan tables Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#6 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#6 (text+ko) ==== @@ -546,6 +546,113 @@ } } +/* + * Copy the ssid string contents into buf, truncating to fit. If the + * ssid is entirely printable then just copy intact. Otherwise convert + * to hexadecimal. If the result is truncated then replace the last + * three characters with "...". + */ +static size_t +copy_essid(char buf[], size_t bufsize, const u_int8_t *essid, size_t essid_len) +{ + const u_int8_t *p; + size_t maxlen; + int i; + + if (essid_len > bufsize) + maxlen = bufsize; + else + maxlen = essid_len; + /* determine printable or not */ + for (i = 0, p = essid; i < maxlen; i++, p++) { + if (*p < ' ' || *p > 0x7e) + break; + } + if (i != maxlen) { /* not printable, print as hex */ + if (bufsize < 3) + return 0; + strlcpy(buf, "0x", bufsize); + bufsize -= 2; + p = essid; + for (i = 0; i < maxlen && bufsize >= 2; i++) { + sprintf(&buf[2+2*i], "%02x", *p++); + bufsize -= 2; + } + maxlen = 2+2*i; + } else { /* printable, truncate as needed */ + memcpy(buf, essid, maxlen); + } + if (maxlen != essid_len) + memcpy(buf+maxlen-3, "...", 3); + return maxlen; +} + +static void +list_scan(int s) +{ + uint8_t buf[24*1024]; + struct ieee80211req ireq; + char ssid[14]; + uint8_t *cp; + int len; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_SCAN_RESULTS; + ireq.i_data = buf; + ireq.i_len = sizeof(buf); + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get scan results"); + len = ireq.i_len; + if (len < sizeof(struct ieee80211req_scan_result)) + return; + + printf("%-14.14s %-17.17s %4s %4s %-5s %3s %4s\n" + , "SSID" + , "BSSID" + , "CHAN" + , "RATE" + , "S:N" + , "INT" + , "CAPS" + ); + cp = buf; + do { + struct ieee80211req_scan_result *sr; + uint8_t *vp; + + sr = (struct ieee80211req_scan_result *) cp; + vp = (u_int8_t *)(sr+1); + printf("%-14.*s %s %3d %3dM %2d:%-2d %3d %-4.4s" + , copy_essid(ssid, sizeof(ssid), vp, sr->isr_ssid_len) + , ssid + , ether_ntoa((const struct ether_addr *) sr->isr_bssid) + , ieee80211_mhz2ieee(sr->isr_freq) + , getmaxrate(sr->isr_rates, sr->isr_nrates) + , sr->isr_rssi, sr->isr_noise + , sr->isr_intval + , getcaps(sr->isr_capinfo) + ); + + if (sr->isr_ie_len > 0) { + vp += sr->isr_ssid_len; + switch (vp[0]) { + case IEEE80211_ELEMID_VENDOR: + if (vp[1] < 2 + 4 || + memcmp(&vp[2], "\x00\x50\xf2\x01", 4) != 0) + break; + printie("WPA", vp, 2+vp[1], 24); + break; + case IEEE80211_ELEMID_RSN: + printie("RSN", vp, 2+vp[1], 24); + break; + } + } + printf("\n"); + cp += sr->isr_len, len -= sr->isr_len; + } while (len >= sizeof(struct ieee80211req_scan_result)); +} + #include static void @@ -586,51 +693,62 @@ static void set80211scan(const char *val, int d, int s, const struct afswtch *rafp) { + scan_and_wait(s); + list_scan(s); +} + +static void +list_stations(int s) +{ uint8_t buf[24*1024]; struct ieee80211req ireq; uint8_t *cp; int len; - scan_and_wait(s); - (void) memset(&ireq, 0, sizeof(ireq)); (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_SCAN_RESULTS; + ireq.i_type = IEEE80211_IOC_STA_INFO; ireq.i_data = buf; ireq.i_len = sizeof(buf); if (ioctl(s, SIOCG80211, &ireq) < 0) - errx(1, "unable to get scan results"); + errx(1, "unable to get station information"); len = ireq.i_len; - if (len >= sizeof(struct ieee80211req_scan_result)) - printf("%-14.14s %-17.17s %4s %4s %-5s %3s %4s\n" - , "SSID" - , "BSSID" - , "CHAN" - , "RATE" - , "S:N" - , "INT" - , "CAPS" - ); + if (len < sizeof(struct ieee80211req_sta_info)) + return; + + printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %4s\n" + , "ADDR" + , "AID" + , "CHAN" + , "RATE" + , "RSSI" + , "IDLE" + , "TXSEQ" + , "RXSEQ" + , "CAPS" + , "ERP" + ); cp = buf; - while (len >= sizeof(struct ieee80211req_scan_result)) { - struct ieee80211req_scan_result *sr; + do { + struct ieee80211req_sta_info *si; uint8_t *vp; - sr = (struct ieee80211req_scan_result *) cp; - /* XXX clean ssid string */ - vp = (u_int8_t *)(sr+1); - printf("%-14.*s %s %3d %3dM %2d:%-2d %3d %-4.4s" - , sr->isr_ssid_len, vp - , ether_ntoa((const struct ether_addr *) sr->isr_bssid) - , ieee80211_mhz2ieee(sr->isr_freq) - , getmaxrate(sr->isr_rates, sr->isr_nrates) - , sr->isr_rssi, sr->isr_noise - , sr->isr_intval - , getcaps(sr->isr_capinfo) + si = (struct ieee80211req_sta_info *) cp; + vp = (u_int8_t *)(si+1); + printf("%s %4u %4d %3dM %4d %4d %6d %6d %-4.4s %3x" + , ether_ntoa((const struct ether_addr*) si->isi_macaddr) + , IEEE80211_AID(si->isi_associd) + , ieee80211_mhz2ieee(si->isi_freq) + , (si->isi_rates[si->isi_txrate] & IEEE80211_RATE_VAL)/2 + , si->isi_rssi + , si->isi_inact + , si->isi_txseq + , si->isi_rxseq + , getcaps(si->isi_capinfo) + , si->isi_erp ); - if (sr->isr_ie_len > 0) { - vp += sr->isr_ssid_len; + if (si->isi_ie_len > 0) { switch (vp[0]) { case IEEE80211_ELEMID_VENDOR: if (vp[1] < 2 + 4 || @@ -641,11 +759,47 @@ case IEEE80211_ELEMID_RSN: printie("RSN", vp, 2+vp[1], 24); break; + /* XXX WME */ } } printf("\n"); - cp += sr->isr_len, len -= sr->isr_len; - } + cp += si->isi_len, len -= si->isi_len; + } while (len >= sizeof(struct ieee80211req_sta_info)); +} + +static void +list_channels(int s) +{ +} + +static void +list_keys(int s) +{ +} + +static void +list_capabilities(int s) +{ +} + +static void +set80211list(const char *arg, int d, int s, const struct afswtch *rafp) +{ +#define iseq(a,b) (strncasecmp(a,b,sizeof(b)-1) == 0) + + if (iseq(arg, "sta")) + list_stations(s); + else if (iseq(arg, "scan") || iseq(arg, "ap")) + list_scan(s); + else if (iseq(arg, "chan") || iseq(arg, "freq")) + list_channels(s); + else if (iseq(arg, "keys")) + list_keys(s); + else if (iseq(arg, "caps")) + list_capabilities(s); + else + errx(1, "Don't know how to list %s for %s", arg, name); +#undef iseq } enum ieee80211_opmode { @@ -1277,6 +1431,7 @@ { "bssid", NEXTARG, set80211bssid }, { "ap", NEXTARG, set80211bssid }, { "scan", 0, set80211scan }, + { "list", NEXTARG, set80211list }, }; static struct afswtch af_ieee80211 = { .af_name = "ieee80211", From owner-p4-projects@FreeBSD.ORG Tue Nov 9 20:28:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65F9516A4D0; Tue, 9 Nov 2004 20:28:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4215616A4CE for ; Tue, 9 Nov 2004 20:28:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1779343D2F for ; Tue, 9 Nov 2004 20:28:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9KSJxN042592 for ; Tue, 9 Nov 2004 20:28:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9KSJOv042589 for perforce@freebsd.org; Tue, 9 Nov 2004 20:28:19 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 20:28:19 GMT Message-Id: <200411092028.iA9KSJOv042589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64713 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 20:28:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=64713 Change 64713 by sam@sam_ebb on 2004/11/09 20:27:19 o incomplete get station info support o pad scan results structure o add ibss stats Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#11 (text+ko) ==== @@ -948,12 +948,41 @@ return error; } +static void +get_scan_result(struct ieee80211req_scan_result *sr, + const struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + + memset(sr, 0, sizeof(*sr)); + sr->isr_ssid_len = ni->ni_esslen; + if (ni->ni_wpa_ie != NULL) + sr->isr_ie_len += 2+ni->ni_wpa_ie[1]; + if (ni->ni_wme_ie != NULL) + sr->isr_ie_len += 2+ni->ni_wme_ie[1]; + sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len; + sr->isr_len = roundup(sr->isr_len, sizeof(u_int32_t)); + if (ni->ni_chan != IEEE80211_CHAN_ANYC) { + sr->isr_freq = ni->ni_chan->ic_freq; + sr->isr_flags = ni->ni_chan->ic_flags; + } + sr->isr_rssi = ic->ic_node_getrssi(ni); + sr->isr_intval = ni->ni_intval; + sr->isr_capinfo = ni->ni_capinfo; + sr->isr_erp = ni->ni_erp; + IEEE80211_ADDR_COPY(sr->isr_bssid, ni->ni_bssid); + sr->isr_nrates = ni->ni_rates.rs_nrates; + if (sr->isr_nrates > 15) + sr->isr_nrates = 15; + memcpy(sr->isr_rates, ni->ni_rates.rs_rates, sr->isr_nrates); +} + static int ieee80211_ioctl_getscanresults(struct ieee80211com *ic, struct ieee80211req *ireq) { union { struct ieee80211req_scan_result res; - char data[512]; + char data[512]; /* XXX shrink? */ } u; struct ieee80211req_scan_result *sr = &u.res; struct ieee80211_node_table *nt; @@ -967,30 +996,14 @@ /* XXX locking */ nt = &ic->ic_scan; TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - sr->isr_ssid_len = ni->ni_esslen; - sr->isr_ie_len = 0; - if (ni->ni_wpa_ie != NULL) - sr->isr_ie_len += 2+ni->ni_wpa_ie[1]; - if (ni->ni_wme_ie != NULL) - sr->isr_ie_len += 2+ni->ni_wme_ie[1]; - sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len; + /* NB: skip pre-scan node state */ + if (ni->ni_chan == IEEE80211_CHAN_ANYC) + continue; + get_scan_result(sr, ni); if (sr->isr_len > sizeof(u)) continue; /* XXX */ if (space < sr->isr_len) break; - sr->isr_freq = ni->ni_chan->ic_freq; - sr->isr_flags = ni->ni_chan->ic_flags; - sr->isr_noise = 0; - sr->isr_rssi = ic->ic_node_getrssi(ni); - sr->isr_intval = ni->ni_intval; - sr->isr_capinfo = ni->ni_capinfo; - sr->isr_erp = ni->ni_erp; - IEEE80211_ADDR_COPY(sr->isr_bssid, ni->ni_bssid); - sr->isr_nrates = ni->ni_rates.rs_nrates; - if (sr->isr_nrates > 15) - sr->isr_nrates = 15; - memcpy(sr->isr_rates, ni->ni_rates.rs_rates, sr->isr_nrates); - sr->isr_scangen = 0; /* XXX to be added */ cp = (u_int8_t *)(sr+1); memcpy(cp, ni->ni_essid, ni->ni_esslen); cp += ni->ni_esslen; @@ -1012,7 +1025,92 @@ return error; } +static void +get_sta_info(struct ieee80211req_sta_info *si, const struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + + si->isi_ie_len = 0; + if (ni->ni_wpa_ie != NULL) + si->isi_ie_len += 2+ni->ni_wpa_ie[1]; + if (ni->ni_wme_ie != NULL) + si->isi_ie_len += 2+ni->ni_wme_ie[1]; + si->isi_len = sizeof(*si) + si->isi_ie_len, sizeof(u_int32_t); + si->isi_len = roundup(si->isi_len, sizeof(u_int32_t)); + si->isi_freq = ni->ni_chan->ic_freq; + si->isi_flags = ni->ni_chan->ic_flags; + si->isi_state = ni->ni_flags; + si->isi_authmode = ni->ni_authmode; + si->isi_rssi = ic->ic_node_getrssi(ni); + si->isi_capinfo = ni->ni_capinfo; + si->isi_erp = ni->ni_erp; + IEEE80211_ADDR_COPY(si->isi_macaddr, ni->ni_macaddr); + si->isi_nrates = ni->ni_rates.rs_nrates; + if (si->isi_nrates > 15) + si->isi_nrates = 15; + memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates); + si->isi_txrate = ni->ni_txrate; + si->isi_associd = ni->ni_associd; + si->isi_txpower = ni->ni_txpower; + si->isi_vlan = ni->ni_vlan; + si->isi_txseq = ni->ni_txseq; + si->isi_rxseq = ni->ni_rxseq; + memcpy(si->isi_rxseqs, ni->ni_rxseqs, sizeof(ni->ni_rxseqs)); + if (ic->ic_opmode == IEEE80211_M_IBSS || ni->ni_associd != 0) + si->isi_inact = ic->ic_inact_run; + else if (ieee80211_node_is_authorized(ni)) + si->isi_inact = ic->ic_inact_auth; + else + si->isi_inact = ic->ic_inact_init; + si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT; +} + static int +ieee80211_ioctl_getstainfo(struct ieee80211com *ic, struct ieee80211req *ireq) +{ + union { + struct ieee80211req_sta_info info; + char data[512]; /* XXX shrink? */ + } u; + struct ieee80211req_sta_info *si = &u.info; + struct ieee80211_node_table *nt; + struct ieee80211_node *ni; + int error, space; + u_int8_t *p, *cp; + + nt = ic->ic_sta; + if (nt == NULL) + return EINVAL; + p = ireq->i_data; + space = ireq->i_len; + error = 0; + /* XXX locking */ + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { + get_sta_info(si, ni); + if (si->isi_len > sizeof(u)) + continue; /* XXX */ + if (space < si->isi_len) + break; + cp = (u_int8_t *)(si+1); + if (ni->ni_wpa_ie != NULL) { + memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); + cp += 2+ni->ni_wpa_ie[1]; + } + if (ni->ni_wme_ie != NULL) { + memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); + cp += 2+ni->ni_wme_ie[1]; + } + error = copyout(si, p, si->isi_len); + if (error) + break; + p += si->isi_len; + space -= si->isi_len; + } + ireq->i_len -= space; + return error; +} + +static int ieee80211_ioctl_get80211(struct ieee80211com *ic, u_long cmd, struct ieee80211req *ireq) { const struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn; @@ -1201,6 +1299,9 @@ case IEEE80211_IOC_INACT_INIT: ireq->i_val = ic->ic_inact_init * IEEE80211_INACT_WAIT; break; + case IEEE80211_IOC_STA_INFO: + error = ieee80211_ioctl_getstainfo(ic, ireq); + break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#5 (text+ko) ==== @@ -164,6 +164,8 @@ u_int32_t is_crypto_attachfail; /* cipher attach failed */ u_int32_t is_crypto_swfallback; /* cipher fallback to s/w */ u_int32_t is_crypto_keyfail; /* driver key alloc failed */ + u_int32_t is_ibss_capmismatch; /* merge failed-cap mismatch */ + u_int32_t is_ibss_norate; /* merge failed-rate mismatch */ }; /* @@ -264,6 +266,48 @@ struct ieee80211_nodestats is_stats; }; +/* + * Station information block; the mac address is used + * to retrieve other data like stats, unicast key, etc. + */ +struct ieee80211req_sta_info { + u_int16_t isi_len; /* length (mult of 4) */ + u_int16_t isi_freq; /* MHz */ + u_int16_t isi_flags; /* channel flags */ + u_int16_t isi_state; /* state flags */ + u_int8_t isi_authmode; /* authentication algorithm */ + u_int8_t isi_rssi; + u_int8_t isi_capinfo; /* capabilities */ + u_int8_t isi_erp; /* ERP element */ + u_int8_t isi_macaddr[IEEE80211_ADDR_LEN]; + u_int8_t isi_nrates; + u_int8_t isi_rates[15]; /* negotiated rates */ + u_int8_t isi_txrate; /* index to isi_rates[] */ + u_int8_t isi_ie_len; /* IE length */ + u_int16_t isi_associd; /* assoc response */ + u_int16_t isi_txpower; /* current tx power */ + u_int16_t isi_vlan; /* vlan tag */ + u_int16_t isi_txseq; /* seq to be transmitted */ + u_int16_t isi_rxseq; /* seq previous received */ + u_int16_t isi_rxseqs[16]; /* seq previous for qos frames*/ + u_int16_t isi_inact; /* inactivity timer */ + /* XXX frag state? */ + /* variable length IE data */ +}; + +/* + * Retrieve per-station information; to retrieve all + * specify a mac address of ff:ff:ff:ff:ff:ff. + */ +struct ieee80211req_sta_req { + union { + /* NB: explicitly force 64-bit alignment */ + u_int8_t macaddr[IEEE80211_ADDR_LEN]; + u_int64_t pad; + } is_u; + struct ieee80211req_sta_info info[1]; /* variable length */ +}; + #ifdef __FreeBSD__ /* * FreeBSD-style ioctls. @@ -336,26 +380,30 @@ #define IEEE80211_IOC_INACT 42 /* station inactivity timeout */ #define IEEE80211_IOC_INACT_AUTH 43 /* station auth inact timeout */ #define IEEE80211_IOC_INACT_INIT 44 /* station init inact timeout */ +#define IEEE80211_IOC_STA_INFO 45 /* station/neighbor info */ #ifndef IEEE80211_CHAN_ANY #define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */ #endif +/* + * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. + */ struct ieee80211req_scan_result { - u_int16_t isr_len; /* length (mult of 4) */ - u_int16_t isr_freq; /* MHz */ - u_int16_t isr_flags; /* channel flags */ + u_int16_t isr_len; /* length (mult of 4) */ + u_int16_t isr_freq; /* MHz */ + u_int16_t isr_flags; /* channel flags */ u_int8_t isr_noise; u_int8_t isr_rssi; - u_int8_t isr_intval; /* beacon interval */ - u_int8_t isr_capinfo; /* capabilities */ - u_int8_t isr_erp; /* ERP element */ + u_int8_t isr_intval; /* beacon interval */ + u_int8_t isr_capinfo; /* capabilities */ + u_int8_t isr_erp; /* ERP element */ u_int8_t isr_bssid[IEEE80211_ADDR_LEN]; u_int8_t isr_nrates; - u_int8_t isr_rates[15]; /* XXX */ - u_int8_t isr_ssid_len; /* SSID length */ - u_int8_t isr_ie_len; /* IE length */ - u_int8_t isr_scangen; /* scan generation # */ + u_int8_t isr_rates[15]; /* XXX */ + u_int8_t isr_ssid_len; /* SSID length */ + u_int8_t isr_ie_len; /* IE length */ + u_int8_t isr_pad[5]; /* variable length SSID followed by IE data */ }; From owner-p4-projects@FreeBSD.ORG Tue Nov 9 20:29:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3760F16A4D1; Tue, 9 Nov 2004 20:29:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB6BE16A4CE for ; Tue, 9 Nov 2004 20:29:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B792943D3F for ; Tue, 9 Nov 2004 20:29:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9KTLcO042639 for ; Tue, 9 Nov 2004 20:29:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9KTL8a042636 for perforce@freebsd.org; Tue, 9 Nov 2004 20:29:21 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 20:29:21 GMT Message-Id: <200411092029.iA9KTL8a042636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 20:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=64714 Change 64714 by sam@sam_ebb on 2004/11/09 20:28:25 checkpoint ibss support Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#11 (text+ko) ==== @@ -190,8 +190,12 @@ } bssid = wh->i_addr3; } - if (type == IEEE80211_FC0_TYPE_DATA && - !IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && + if (type != IEEE80211_FC0_TYPE_DATA) + break; + /* + * Data frame, validate the bssid. + */ + if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { /* not interested in */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, @@ -200,6 +204,24 @@ ic->ic_stats.is_rx_wrongbss++; goto out; } + /* + * For adhoc mode we cons up a node when it doesn't + * exist. This should probably done after an ACL check. + */ + if (ni == ic->ic_bss && + ic->ic_opmode != IEEE80211_M_HOSTAP) { + /* + * Fake up a node for this newly + * discovered member of the IBSS. + */ + ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + type == IEEE80211_FC0_TYPE_CTL ? + wh->i_addr1 : wh->i_addr2); + if (ni == NULL) { + /* NB: stat kept for alloc failure */ + goto err; + } + } break; default: goto out; @@ -1805,7 +1827,20 @@ wh->i_addr2, chan, bchan, capinfo, bintval, erp, ssid, country); #endif - ni = ieee80211_dup_bss(&ic->ic_scan, wh->i_addr2); + /* + * Create a new entry. If scanning the entry goes + * in the scan cache. Otherwise, be particular when + * operating in adhoc mode--only take nodes marked + * as ibss participants so we don't populate our + * neighbor table with unintersting sta's. + */ + if (ic->ic_state != IEEE80211_S_SCAN) { + if ((capinfo & IEEE80211_CAPINFO_IBSS) == 0) + return; + ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + wh->i_addr2); + } else + ni = ieee80211_dup_bss(&ic->ic_scan, wh->i_addr2); if (ni == NULL) return; ni->ni_esslen = ssid[1]; @@ -1898,7 +1933,17 @@ IEEE80211_VERIFY_SSID(ic->ic_bss, ssid, "probe"); if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + if (ic->ic_opmode == IEEE80211_M_IBSS) { + /* + * XXX Cannot tell if the sender is operating + * in ibss mode. But we need a new node to + * send the response so blindly add them to the + * neighbor table. + */ + ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + wh->i_addr2); + } else + ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) return; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#9 (text+ko) ==== @@ -63,10 +63,10 @@ static void ieee80211_timeout_stations(struct ieee80211_node_table *); static void ieee80211_node_table_init(struct ieee80211com *ic, - struct ieee80211_node_table *nt, int inact, + struct ieee80211_node_table *nt, const char *name, int inact, void (*timeout)(struct ieee80211_node_table *)); static struct ieee80211_node_table *ieee80211_node_table_alloc( - struct ieee80211com *ic, int inact, + struct ieee80211com *ic, const char *name, int inact, void (*timeout)(struct ieee80211_node_table *)); static void ieee80211_node_table_cleanup(struct ieee80211_node_table *nt); @@ -77,7 +77,7 @@ { ic->ic_sta = NULL; /* defer to when we need it */ - ieee80211_node_table_init(ic, &ic->ic_scan, + ieee80211_node_table_init(ic, &ic->ic_scan, "scan", IEEE80211_INACT_SCAN, ieee80211_timeout_scan_candidates); ic->ic_node_alloc = node_alloc; @@ -327,21 +327,34 @@ { struct ieee80211_node *ni; - ni = ic->ic_bss; IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "%s: creating ibss\n", __func__); - ic->ic_sta = ieee80211_node_table_alloc(ic, - ic->ic_inact_init, ieee80211_timeout_stations); + /* + * Create the station/neighbor table. Note that for adhoc + * mode we make the initial inactivity timer longer since + * we create nodes only through discovery and they typically + * are long-lived associations. + */ + if (ic->ic_opmode == IEEE80211_M_HOSTAP) + ic->ic_sta = ieee80211_node_table_alloc(ic, + "station", ic->ic_inact_init, + ieee80211_timeout_stations); + else + ic->ic_sta = ieee80211_node_table_alloc(ic, + "neighbor", ic->ic_inact_run, + ieee80211_timeout_stations); if (ic->ic_sta == NULL) { /* * Should remain in SCAN state and retry. */ + /* XXX stat+msg */ return; } + ni = ic->ic_bss; ic->ic_flags |= IEEE80211_F_SIBSS; - ieee80211_set_chan(ic, ic->ic_bss, chan); + ieee80211_set_chan(ic, ni, chan); IEEE80211_ADDR_COPY(ni->ni_macaddr, ic->ic_myaddr); IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_myaddr); if (ic->ic_opmode == IEEE80211_M_IBSS) @@ -612,7 +625,43 @@ goto notfound; } } + +/* + * Handle 802.11 ad hoc network merge. The + * convention, set by the Wireless Ethernet Compatibility Alliance + * (WECA), is that an 802.11 station will change its BSSID to match + * the "oldest" 802.11 ad hoc network, on the same channel, that + * has the station's desired SSID. The "oldest" 802.11 network + * sends beacons with the greatest TSF timestamp. + * + * The caller is assumed to validate TSF's before attempting a merge. + * + * Return !0 if the BSSID changed, 0 otherwise. + */ +int +ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + if (IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) { + /* unchanged, nothing to do */ + return 0; + } + if (ieee80211_match_bss(ic, ni) != 0) { /* capabilities mismatch */ + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + "%s: merge failed, capabilities mismatch\n", __func__); + ic->ic_stats.is_ibss_capmismatch++; + return 0; + } + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + "%s: new bssid %s: %s preamble, %s slot time%s\n", __func__, + ether_sprintf(ni->ni_bssid), + ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", + ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", + ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "" + ); + return ieee80211_sta_join(ic, ni); +} + /* * Join the specified IBSS/BSS network. The node is assumed to * be passed in with a held reference. @@ -630,6 +679,7 @@ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); if (selbs->ni_rates.rs_nrates == 0) { selbs->ni_fails++; + ic->ic_stats.is_ibss_norate++; return 0; } } @@ -742,7 +792,9 @@ int hash; IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, - "%s %s\n", __func__, ether_sprintf(macaddr)); + "%s %s in %s table\n", __func__, + ether_sprintf(macaddr), nt->nt_name); + IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); hash = IEEE80211_NODE_HASH(macaddr); ieee80211_node_initref(ni); /* mark referenced */ @@ -845,15 +897,16 @@ } /* - * Fake up a node; this handles node discovery in - * adhoc mode. Note that for the driver's benefit - * we we treat this like an association so the driver - * has an opportunity to setup it's private state. + * Fake up a node; this handles node discovery in adhoc mode. + * Note that for the driver's benefit we we treat this like + * an association so the driver has an opportunity to setup + * it's private state. */ -static __inline struct ieee80211_node * -fakeup_node(struct ieee80211com *ic, struct ieee80211_node_table *nt, +struct ieee80211_node * +ieee80211_fakeup_adhoc_node(struct ieee80211_node_table *nt, const u_int8_t macaddr[IEEE80211_ADDR_LEN]) { + struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; ni = ieee80211_dup_bss(nt, macaddr); @@ -862,21 +915,20 @@ ni->ni_rates = ic->ic_bss->ni_rates; if (ic->ic_newassoc) ic->ic_newassoc(ic, ni, 1); - /* XXX not sure how 802.1x works w/ IBSS */ + /* XXX not right for 802.1x/WPA */ ieee80211_node_authorize(ic, ni); + ieee80211_ref_node(ni); /* hold reference */ } return ni; } /* - * Locate the node for sender, track state, and then - * pass the (referenced) node up to the 802.11 layer - * for its use. We are required to pass some node so - * we fall back to ic_bss when this frame is from an - * unknown sender. The 802.11 layer knows this means the - * sender wasn't in the node table and acts accordingly. - * Note also that by convention we do not reference - * count ic_bss, only other nodes (ic_bss is never free'd). + * Locate the node for sender, track state, and then pass the + * (referenced) node up to the 802.11 layer for its use. We + * are required to pass some node so we fall back to ic_bss + * when this frame is from an unknown sender. The 802.11 layer + * knows this means the sender wasn't in the node table and + * acts accordingly. */ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT @@ -892,10 +944,13 @@ struct ieee80211_node_table *nt; struct ieee80211_node *ni; - if (ic->ic_opmode != IEEE80211_M_STA) + /* XXX may want scanned nodes in the neighbor table for adhoc */ + if (ic->ic_opmode == IEEE80211_M_STA || + ic->ic_opmode == IEEE80211_M_MONITOR || + ic->ic_state == IEEE80211_S_SCAN /*XXX*/) + nt = &ic->ic_scan; + else nt = ic->ic_sta; - else - nt = &ic->ic_scan; /* XXX check ic_bss first in station mode */ /* XXX 4-address frames? */ IEEE80211_NODE_LOCK(nt); @@ -905,10 +960,6 @@ ni = _ieee80211_find_node(nt, wh->i_addr2); IEEE80211_NODE_UNLOCK(nt); - if (ni == NULL && - (ic->ic_opmode == IEEE80211_M_IBSS || - ic->ic_opmode == IEEE80211_M_AHDEMO)) - ni = fakeup_node(ic, nt, wh->i_addr2); return (ni != NULL ? ni : ieee80211_ref_node(ic->ic_bss)); #undef IS_CTL } @@ -944,7 +995,7 @@ if (ni == NULL && (ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_AHDEMO)) - ni = fakeup_node(ic, nt, macaddr); + ni = ieee80211_fakeup_adhoc_node(nt, macaddr); return ni; } @@ -1029,14 +1080,14 @@ _ieee80211_free_node(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_node_table *nt = ni->ni_table; IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, - "%s %s\n", __func__, ether_sprintf(ni->ni_macaddr)); + "%s %s in %s table\n", __func__, ether_sprintf(ni->ni_macaddr), + nt != NULL ? nt->nt_name : ""); IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap); - if (ni->ni_table != NULL) { - struct ieee80211_node_table *nt = ni->ni_table; - + if (nt != NULL) { TAILQ_REMOVE(&nt->nt_node, ni, ni_list); LIST_REMOVE(ni, ni_hash); } @@ -1111,7 +1162,7 @@ struct ieee80211_node *ni; IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, - "%s: free all nodes\n", __func__); + "%s: free all nodes in %s table\n", __func__, nt->nt_name); while ((ni = TAILQ_FIRST(&nt->nt_node)) != NULL) { if (ni->ni_associd != 0) { @@ -1219,7 +1270,7 @@ * in LOR between the node lock and the driver lock. */ IEEE80211_NODE_UNLOCK(nt); - if (ieee80211_node_is_authorized(ni)) { + if (ni->ni_associd != 0) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, IEEE80211_REASON_AUTH_EXPIRE); @@ -1454,12 +1505,15 @@ "station %s with aid %d leaves\n", ether_sprintf(ni->ni_macaddr), IEEE80211_NODE_AID(ni)); - KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP, - ("not in ap mode, mode %u", ic->ic_opmode)); + KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP || + ic->ic_opmode == IEEE80211_M_IBSS || + ic->ic_opmode == IEEE80211_M_AHDEMO, + ("unexpected operating mode %u", ic->ic_opmode)); /* * If node wasn't previously associated all * we need to do is reclaim the reference. */ + /* XXX ibss mode bypasses 11g and notification */ if (ni->ni_associd == 0) goto done; /* @@ -1550,20 +1604,27 @@ static void ieee80211_node_table_init(struct ieee80211com *ic, - struct ieee80211_node_table *nt, int inact, + struct ieee80211_node_table *nt, + const char *name, int inact, void (*timeout)(struct ieee80211_node_table *)) { + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "%s %s table, inact %u\n", __func__, name, inact); + nt->nt_ic = ic; /* XXX need unit */ IEEE80211_NODE_LOCK_INIT(nt, ic->ic_ifp->if_xname); TAILQ_INIT(&nt->nt_node); + nt->nt_name = name; nt->nt_scangen = 1; nt->nt_inact_init = inact; nt->nt_timeout = timeout; } static struct ieee80211_node_table * -ieee80211_node_table_alloc(struct ieee80211com *ic, int inact, +ieee80211_node_table_alloc(struct ieee80211com *ic, + const char *name, int inact, void (*timeout)(struct ieee80211_node_table *)) { struct ieee80211_node_table *nt; @@ -1575,13 +1636,17 @@ printf("%s: no memory node table!\n", __func__); return NULL; } - ieee80211_node_table_init(ic, nt, inact, timeout); + ieee80211_node_table_init(ic, nt, name, inact, timeout); return nt; } void ieee80211_node_table_reset(struct ieee80211_node_table *nt) { + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "%s %s table\n", __func__, nt->nt_name); + IEEE80211_NODE_LOCK(nt); nt->nt_inact_timer = 0; ieee80211_free_allnodes_locked(nt); @@ -1591,6 +1656,10 @@ static void ieee80211_node_table_cleanup(struct ieee80211_node_table *nt) { + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "%s %s table\n", __func__, nt->nt_name); + ieee80211_free_allnodes_locked(nt); IEEE80211_NODE_LOCK_DESTROY(nt); } @@ -1601,6 +1670,10 @@ void ieee80211_node_table_free(struct ieee80211_node_table *nt) { + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "%s %s table\n", __func__, nt->nt_name); + IEEE80211_NODE_LOCK(nt); nt->nt_inact_timer = 0; ieee80211_node_table_cleanup(nt); ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#8 (text+ko) ==== @@ -191,7 +191,7 @@ extern void ieee80211_node_detach(struct ieee80211com *); static __inline int -ieee80211_node_is_authorized(struct ieee80211_node *ni) +ieee80211_node_is_authorized(const struct ieee80211_node *ni) { return (ni->ni_flags & IEEE80211_NODE_AUTH); } @@ -206,6 +206,8 @@ extern void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); extern void ieee80211_end_scan(struct ieee80211com *); +extern int ieee80211_ibss_merge(struct ieee80211com *, + struct ieee80211_node *); extern int ieee80211_sta_join(struct ieee80211com *, struct ieee80211_node *); extern void ieee80211_sta_leave(struct ieee80211com *, @@ -222,6 +224,7 @@ ieee80211_node_lock_t nt_nodelock; /* on node table */ TAILQ_HEAD(, ieee80211_node) nt_node; /* information of all nodes */ LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE]; + const char *nt_name; /* for debugging */ u_int nt_scangen; /* gen# for timeout scan */ int nt_inact_timer; /* inactivity timer */ int nt_inact_init; /* initial node inact setting */ @@ -290,6 +293,9 @@ struct ieee80211_node *); extern void ieee80211_dump_nodes(struct ieee80211_node_table *); +extern struct ieee80211_node *ieee80211_fakeup_adhoc_node( + struct ieee80211_node_table *nt, + const u_int8_t macaddr[]); extern void ieee80211_node_join(struct ieee80211com *, struct ieee80211_node *, int); extern void ieee80211_node_leave(struct ieee80211com *, From owner-p4-projects@FreeBSD.ORG Tue Nov 9 20:29:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C48516A4EC; Tue, 9 Nov 2004 20:29:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2557516A4CF for ; Tue, 9 Nov 2004 20:29:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17D0D43D2D for ; Tue, 9 Nov 2004 20:29:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9KTLaQ042645 for ; Tue, 9 Nov 2004 20:29:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9KTLhS042642 for perforce@freebsd.org; Tue, 9 Nov 2004 20:29:21 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 20:29:21 GMT Message-Id: <200411092029.iA9KTLhS042642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 20:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=64715 Change 64715 by sam@sam_ebb on 2004/11/09 20:28:57 add ibss merge; still need to fix beacons Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#14 (text+ko) ==== @@ -2200,6 +2200,23 @@ ATH_RSSI_LPF(ATH_NODE(ni)->an_halstats.ns_avgbrssi, rssi); /* fall thru... */ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: + if (ic->ic_opmode == IEEE80211_M_IBSS && + ic->ic_state == IEEE80211_S_RUN) { + struct ath_hal *ah = sc->sc_ah; + /* XXX extend rstamp */ + u_int64_t tsf = ath_hal_gettsf64(ah); + + /* + * Handle ibss merge as needed; check the tsf on the + * frame before attempting the merge. The 802.11 spec + * says the station should change it's bssid to match + * the oldest station with the same ssid, where oldest + * is determined by the tsf. + */ + if (le64toh(ni->ni_tstamp.tsf) >= tsf && + ieee80211_ibss_merge(ic, ni)) + ath_hal_setassocid(ah, ic->ic_bss->ni_bssid, 0); + } break; } } From owner-p4-projects@FreeBSD.ORG Tue Nov 9 20:36:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F90C16A4E6; Tue, 9 Nov 2004 20:36:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F09FB16A4CF for ; Tue, 9 Nov 2004 20:36:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FB2243D5C for ; Tue, 9 Nov 2004 20:36:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9KaWiJ042869 for ; Tue, 9 Nov 2004 20:36:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9KaUWR042866 for perforce@freebsd.org; Tue, 9 Nov 2004 20:36:30 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 20:36:30 GMT Message-Id: <200411092036.iA9KaUWR042866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 20:36:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=64716 Change 64716 by sam@sam_ebb on 2004/11/09 20:35:35 IFC @ 64715 Affected files ... .. //depot/projects/wifi/Makefile#2 integrate .. //depot/projects/wifi/Makefile.inc1#3 integrate .. //depot/projects/wifi/bin/rcp/Makefile#2 integrate .. //depot/projects/wifi/bin/stty/key.c#3 integrate .. //depot/projects/wifi/etc/defaults/pccard.conf#2 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#3 integrate .. //depot/projects/wifi/etc/devd.conf#2 integrate .. //depot/projects/wifi/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/wifi/etc/namedb/named.conf#2 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#3 integrate .. //depot/projects/wifi/etc/rc.d/initdiskless#2 integrate .. //depot/projects/wifi/etc/rc.d/swap1#2 integrate .. //depot/projects/wifi/etc/rc.d/tmp#2 integrate .. //depot/projects/wifi/etc/rc.d/var#2 integrate .. //depot/projects/wifi/etc/rc.d/vinum#2 delete .. //depot/projects/wifi/etc/rc.subr#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/wifi/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/wifi/lib/libbegemot/Makefile#2 integrate .. //depot/projects/wifi/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/wifi/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/_ctx_start.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/alloca.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/divsi3.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/makecontext.c#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/setjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/signalcontext.c#2 integrate .. //depot/projects/wifi/lib/libc/arm/gen/sigsetjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/memcmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/memmove.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/strcmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/brk.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/fork.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/getcontext.S#2 delete .. //depot/projects/wifi/lib/libc/arm/sys/pipe.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/wifi/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/wifi/lib/libc/i386/gen/_set_tp.c#2 integrate .. //depot/projects/wifi/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/i386/sys/_amd64_get_fsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/_amd64_get_gsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/_amd64_set_fsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/_amd64_set_gsbase.c#1 branch .. //depot/projects/wifi/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/wifi/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/arm/context.S#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#4 integrate .. //depot/projects/wifi/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/wifi/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/wifi/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#3 integrate .. //depot/projects/wifi/sbin/Makefile#3 integrate .. //depot/projects/wifi/sbin/devfs/devfs.8#2 integrate .. //depot/projects/wifi/sbin/devfs/rule.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/concat/gconcat.8#2 integrate .. //depot/projects/wifi/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/wifi/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#2 integrate .. //depot/projects/wifi/sbin/geom/core/geom.8#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/wifi/sbin/init/Makefile#2 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/wifi/sbin/route/route.8#2 integrate .. //depot/projects/wifi/sbin/vinum/Makefile#2 delete .. //depot/projects/wifi/sbin/vinum/commands.c#2 delete .. //depot/projects/wifi/sbin/vinum/list.c#2 delete .. //depot/projects/wifi/sbin/vinum/v.c#2 delete .. //depot/projects/wifi/sbin/vinum/vext.h#2 delete .. //depot/projects/wifi/sbin/vinum/vinum.8#2 delete .. //depot/projects/wifi/share/examples/etc/make.conf#3 integrate .. //depot/projects/wifi/share/man/man4/Makefile#3 integrate .. //depot/projects/wifi/share/man/man4/acpi_video.4#2 integrate .. //depot/projects/wifi/share/man/man4/ath.4#2 integrate .. //depot/projects/wifi/share/man/man4/em.4#2 integrate .. //depot/projects/wifi/share/man/man4/gdb.4#2 integrate .. //depot/projects/wifi/share/man/man4/gx.4#2 delete .. //depot/projects/wifi/share/man/man4/ixgb.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_asus.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate .. //depot/projects/wifi/share/man/man4/miibus.4#2 integrate .. //depot/projects/wifi/share/man/man4/route.4#2 integrate .. //depot/projects/wifi/share/man/man4/ste.4#2 integrate .. //depot/projects/wifi/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/wifi/share/man/man4/vlan.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/wifi/share/man/man7/tuning.7#2 integrate .. //depot/projects/wifi/share/man/man9/condvar.9#2 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#4 integrate .. //depot/projects/wifi/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/wifi/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/smp.h#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/critical.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/locore.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/mem.c#1 branch .. //depot/projects/wifi/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/support.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/wifi/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/wifi/sys/arm/include/asm.h#2 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#2 integrate .. //depot/projects/wifi/sys/arm/include/cpu.h#2 integrate .. //depot/projects/wifi/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/wifi/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/wifi/sys/arm/include/endian.h#2 integrate .. //depot/projects/wifi/sys/arm/include/memdev.h#1 branch .. //depot/projects/wifi/sys/arm/include/param.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#2 integrate .. //depot/projects/wifi/sys/arm/include/reg.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/wifi/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#4 integrate .. //depot/projects/wifi/sys/conf/files#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/wifi/sys/dev/gx/if_gx.c#2 delete .. //depot/projects/wifi/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/wifi/sys/dev/gx/if_gxvar.h#2 delete .. //depot/projects/wifi/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/wifi/sys/dev/md/md.c#2 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/wifi/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/wifi/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/wifi/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/wifi/sys/dev/vinum/request.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinum.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumconfig.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumdaemon.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumext.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumhdr.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinuminterrupt.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumio.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumio.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumioctl.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumkw.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumlock.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinummemory.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumobj.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumparser.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumraid5.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumrequest.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumrevive.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumstate.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumutil.c#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/wifi/sys/dev/vinum/vinumvar.h#2 delete .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/wifi/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/wifi/sys/geom/geom_slice.c#2 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_mount.h#3 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/include/sysarch.h#2 integrate .. //depot/projects/wifi/sys/isa/vga_isa.c#2 integrate .. //depot/projects/wifi/sys/kern/init_main.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_environment.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mac.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_physio.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_subr.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_switch.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_param.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#2 integrate .. //depot/projects/wifi/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/wifi/sys/kern/tty.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/wifi/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/wifi/sys/libkern/arm/divsi3.S#2 integrate .. //depot/projects/wifi/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/wifi/sys/modules/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/gx/Makefile#2 delete .. //depot/projects/wifi/sys/modules/vinum/Makefile#2 delete .. //depot/projects/wifi/sys/net/if_ppp.c#2 integrate .. //depot/projects/wifi/sys/net/if_pppvar.h#2 integrate .. //depot/projects/wifi/sys/net/if_sl.c#2 integrate .. //depot/projects/wifi/sys/net/ppp_tty.c#2 integrate .. //depot/projects/wifi/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/wifi/sys/net/rtsock.c#2 integrate .. //depot/projects/wifi/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/wifi/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netipsec/keysock.c#2 integrate .. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netkey/key.c#2 integrate .. //depot/projects/wifi/sys/netkey/key.h#2 integrate .. //depot/projects/wifi/sys/netkey/keydb.h#2 integrate .. //depot/projects/wifi/sys/netkey/keysock.c#2 integrate .. //depot/projects/wifi/sys/netnatm/natm.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/fd.c#2 integrate .. //depot/projects/wifi/sys/pci/if_de.c#2 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/wifi/sys/sys/_types.h#2 integrate .. //depot/projects/wifi/sys/sys/buf.h#4 integrate .. //depot/projects/wifi/sys/sys/fdcio.h#2 integrate .. //depot/projects/wifi/sys/sys/file.h#2 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#2 integrate .. //depot/projects/wifi/sys/sys/kernel.h#3 integrate .. //depot/projects/wifi/sys/sys/ktr.h#2 integrate .. //depot/projects/wifi/sys/sys/mac_policy.h#2 integrate .. //depot/projects/wifi/sys/sys/mdioctl.h#2 integrate .. //depot/projects/wifi/sys/sys/param.h#2 integrate .. //depot/projects/wifi/sys/sys/protosw.h#2 integrate .. //depot/projects/wifi/sys/sys/resource.h#2 integrate .. //depot/projects/wifi/sys/sys/sf_buf.h#2 integrate .. //depot/projects/wifi/sys/sys/syslog.h#2 integrate .. //depot/projects/wifi/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/wifi/sys/vm/swap_pager.c#3 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_glue.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_object.h#2 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#4 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_pager.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_pager.h#2 integrate .. //depot/projects/wifi/sys/vm/vm_param.h#2 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/wifi/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/wifi/tools/debugscripts/gdbinit.vinum#2 delete .. //depot/projects/wifi/tools/tools/genericize/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/wifi/tools/tools/raidtest/README#2 integrate .. //depot/projects/wifi/tools/tools/raidtest/raidtest.c#2 integrate .. //depot/projects/wifi/usr.bin/cut/cut.c#2 integrate .. //depot/projects/wifi/usr.bin/ee/ee.c#2 integrate .. //depot/projects/wifi/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/wifi/usr.bin/limits/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/login/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/make/config.h#2 integrate .. //depot/projects/wifi/usr.bin/make/job.c#2 integrate .. //depot/projects/wifi/usr.bin/make/job.h#2 integrate .. //depot/projects/wifi/usr.bin/make/main.c#2 integrate .. //depot/projects/wifi/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/opieinfo/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/opiepasswd/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/rlogin/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/rsh/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/su/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/tail/extern.h#2 integrate .. //depot/projects/wifi/usr.bin/tail/forward.c#2 integrate .. //depot/projects/wifi/usr.bin/tail/misc.c#2 integrate .. //depot/projects/wifi/usr.bin/tail/read.c#2 integrate .. //depot/projects/wifi/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/wifi/usr.bin/tail/tail.c#2 integrate .. //depot/projects/wifi/usr.bin/tar/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/wifi/usr.bin/tar/write.c#2 integrate .. //depot/projects/wifi/usr.sbin/ancontrol/ancontrol.c#2 integrate .. //depot/projects/wifi/usr.sbin/cron/crontab/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.8#2 integrate .. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.c#2 integrate .. //depot/projects/wifi/usr.sbin/fdread/fdutil.c#2 integrate .. //depot/projects/wifi/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/mrouted/defs.h#2 integrate .. //depot/projects/wifi/usr.sbin/nfsd/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/wifi/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/wifi/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ +# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ # # The user-driven targets are: # @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + build32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/wifi/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -201,6 +201,46 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +.if ${MACHINE_ARCH} == amd64 +# 32 bit world +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 + +LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ + -L${LIB32TMP}/usr/lib32 \ + -B${LIB32TMP}/usr/lib32 +LIB32CC= ${LIB32PREFLAGS} \ + ${LIB32POSTFLAGS} +LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ + ${LIB32POSTFLAGS} +LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ + ${LIB32POSTFLAGS} + +# Yes, the flags are redundant. +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE_ARCH=i386 \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 + +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 +.endif + # install stage .if empty(.MAKEFLAGS:M-n) IMAKEENV= ${CROSSENV} \ @@ -338,7 +378,54 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +.if ${MACHINE_ARCH} == amd64 +build32: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 5.1: building 32 bit shim libraries" + @echo "--------------------------------------------------------------" +.for _dir in \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ + usr/libexec usr/sbin usr/share/misc \ + usr/share/snmp/defs usr/share/snmp/mibs + mkdir -p ${LIB32TMP}/${_dir} +.endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${LIB32TMP}/usr/include >/dev/null + ln -sf ${.CURDIR}/sys ${WORLDTMP} +.for _t in obj includes + cd ${.CURDIR}/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/gnu/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif +.endfor +.for _dir in lib/libncurses lib/libmagic + cd ${.CURDIR}/${_dir}; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools +.endfor + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endfor +install32: + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + cd ${.CURDIR}/lib; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install +.endif + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif + WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) @@ -349,6 +436,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +WMAKE_TGTS+= build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -479,6 +569,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.endif redistribute: @echo "--------------------------------------------------------------" ==== //depot/projects/wifi/bin/rcp/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $ +# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $ PROG= rcp SRCS= rcp.c util.c @@ -7,6 +7,6 @@ BINOWN= root BINMODE=4555 -INSTALLFLAGS=-fschg +PRECIOUSPROG= .include ==== //depot/projects/wifi/bin/stty/key.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.20 2004/11/06 13:56:18 ache Exp $"); #include @@ -263,7 +263,7 @@ ip->t.c_iflag |= ICRNL; /* preserve user-preference flags in lflag */ #define LKEEP (ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH) - ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP); + ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP); ip->t.c_oflag = TTYDEF_OFLAG; ip->set = 1; } ==== //depot/projects/wifi/etc/defaults/pccard.conf#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -505,8 +505,8 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# COREGA FEther PCC-TXD -card "corega K.K." "corega FEther PCC-TXD" +# COREGA FEther PCC-TXD and COREGA FEtherII PCC-TXD +card "corega K.K." "corega FEther(II)? PCC-TXD" config auto "ed" ? 0x30000 insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop ==== //depot/projects/wifi/etc/defaults/rc.conf#3 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.230 2004/11/09 10:03:17 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,8 +40,10 @@ removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created +tmpmfs_flags="-S -o noexec,nosuid,nodev" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created +varmfs_flags="-S" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces @@ -449,7 +451,6 @@ kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure lomac_enable="NO" # start lomac(4) security module at boot update_motd="YES" # update version info in /etc/motd (or NO) -start_vinum="NO" # set to YES to start vinum unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy is preferred if / is not available. ==== //depot/projects/wifi/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.17 2004/09/10 20:57:44 wpaul Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -19,7 +19,7 @@ # Setup some shorthand for regex that we use later in the file. set ethernet-nic-regex "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ + ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\ xl)[0-9]+"; set scsi-controller-regex ==== //depot/projects/wifi/etc/mtree/BIND.chroot.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.5 2004/09/29 03:43:10 dougb Exp $ +# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,8 @@ .. etc namedb + dynamic uname=bind + .. master .. slave uname=bind ==== //depot/projects/wifi/etc/namedb/named.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.19 2004/09/30 09:57:36 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.20 2004/11/04 05:24:29 gshapiro Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -102,6 +102,20 @@ }; }; +// An example dynamic zone +key "exampleorgkey" { + algorithm hmac-md5; + secret "sf87HJqjkqh8ac87a02lla=="; +}; + +zone "example.org" { + type master; + allow-update { + key "exampleorgkey"; + }; + file "dynamic/example.org"; +}; + zone "0.168.192.in-addr.arpa" { type slave; file "slave/0.168.192.in-addr.arpa"; ==== //depot/projects/wifi/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -35,7 +35,7 @@ syscons sysctl syslogd \ timed tmp \ ugidfw usbd \ - var vinum virecover \ + var virecover \ watchdogd \ ypbind yppasswdd ypserv \ ypset ypupdated ypxfrd ==== //depot/projects/wifi/etc/rc.d/initdiskless#2 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.39 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ # +# PROVIDE: initdiskless # REQUIRE: preseedrandom -# PROVIDE: initdiskless +# BEFORE: rcconf # KEYWORD: nojail -# BEFORE: ipfw # On entry to this script the entire system consists of a read-only root ==== //depot/projects/wifi/etc/rc.d/swap1#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.8 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ # # PROVIDE: localswap @@ -12,7 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd='swapoff -a' +stop_cmd=':' load_rc_config swap run_rc_command "$1" ==== //depot/projects/wifi/etc/rc.d/tmp#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.34 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.35 2004/11/09 10:03:17 keramida Exp $ # # PROVIDE: tmp @@ -42,7 +42,7 @@ # case "${tmpmfs}" in [Yy][Ee][Ss]) - mount_md ${tmpsize} /tmp + mount_md ${tmpsize} /tmp "${tmpmfs_flags}" chmod 01777 /tmp ;; [Nn][Oo]) @@ -56,7 +56,7 @@ echo "dropping into shell, ^D to continue anyway." /bin/sh else - mount_md ${tmpsize} /tmp + mount_md ${tmpsize} /tmp "${tmpmfs_flags}" chmod 01777 /tmp fi fi ==== //depot/projects/wifi/etc/rc.d/var#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.34 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.35 2004/11/09 10:03:17 keramida Exp $ # # PROVIDE: var @@ -61,7 +61,7 @@ # case "${varmfs}" in [Yy][Ee][Ss]) - mount_md ${varsize} /var + mount_md ${varsize} /var "${varmfs_flags}" ;; [Nn][Oo]) ;; @@ -69,7 +69,7 @@ if (/bin/mkdir -p /var/.diskless 2> /dev/null); then rmdir /var/.diskless else - mount_md ${varsize} /var + mount_md ${varsize} /var "${varmfs_flags}" fi esac ==== //depot/projects/wifi/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.31 2004/07/30 17:19:35 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.32 2004/11/09 10:03:17 keramida Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1289,12 +1289,12 @@ # as close as possible between 5-current and 4-stable. # $1 = size # $2 = mount point -# $3 = (optional) bytes-per-inode +# $3 = (optional) extra mdmfs flags mount_md() { if [ -n "$3" ]; then - bpi="-i $3" + flags="$3" fi - /sbin/mdmfs $bpi -s $1 -M md $2 + /sbin/mdmfs $flags -s $1 -M md $2 } fi ==== //depot/projects/wifi/gnu/usr.bin/cc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.36 2004/07/28 05:27:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.38 2004/11/07 22:49:20 kan Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. @@ -10,7 +10,7 @@ .endif .if !defined(NO_CXX) -SUBDIR+= cc1plus c++ +SUBDIR+= cc1plus c++ c++filt .if !defined(NO_COLLECT2) #SUBDIR+= collect2 .endif ==== //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.18 2004/10/24 15:32:26 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.19 2004/11/07 13:46:16 kan Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR} PROG= c++filt -SRCS= cp-demangle.c cplus-dem+%DIKED.c +SRCS= cp-demangle.c NOMAN= CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" @@ -13,11 +13,4 @@ DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} -cplus-dem+%DIKED.c: cplus-dem.c - sed -e 's/^xmalloc[ ]/_DONT_xmalloc /g' \ - -e 's/^xrealloc[ ]/_DONT_xrealloc /g' \ - ${.ALLSRC} > ${.TARGET} - -CLEANFILES= cplus-dem+%DIKED.c - .include ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $ GENSRCS+= xm.h LIBSRCS+= fbsd-proc.c gcore.c LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ - i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c + i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#3 (text+ko) ==== @@ -1,42 +1,50 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $ LIB= gdb INTERNALLIB= -SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ - bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \ - c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ - cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \ - cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \ - coffread.c complaints.c completer.c copying.c corefile.c \ - corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \ - dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \ - dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ - dwarf2read.c dwarfread.c elfread.c environ.c eval.c \ - event-loop.c event-top.c exec.c expprint.c f-exp.y f-lang.c \ - f-typeprint.c f-valprint.c findvar.c fork-child.c frame-base.c \ - frame-unwind.c frame.c gdb-events.c gdbarch.c gdbtypes.c \ - gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c inf-loop.c infcall.c \ - infcmd.c inflow.c infptrace.c infrun.c inftarg.c init.c \ - interps.c jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ - kod-cisco.c kod.c language.c linespec.c m2-exp.y m2-lang.c \ - m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c macroscope.c \ - macrotab.c main.c maint.c mdebugread.c mem-break.c memattr.c \ - mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c mi-cmd-file.c \ - mi-cmd-stack.c mi-cmd-var.c mi-cmds.c mi-console.c mi-getopt.c \ - mi-interp.c mi-main.c mi-out.c mi-parse.c mi-symbol-cmds.c \ - minsyms.c mipsread.c nlmread.c objc-exp.y objc-lang.c \ - objfiles.c observer.c osabi.c p-exp.y p-lang.c p-typeprint.c \ - p-valprint.c parse.c printcmd.c regcache.c reggroups.c remote.c \ - remote-fileio.c remote-utils.c scm-exp.c scm-lang.c \ - scm-valprint.c sentinel-frame.c ser-pipe.c ser-tcp.c ser-unix.c \ - serial.c signals.c solib.c solib-svr4.c source.c stabsread.c \ - stack.c std-regs.c symfile.c symmisc.c symtab.c target.c \ - thread.c top.c tracepoint.c trad-frame.c tui.c tui-command.c \ - tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \ - tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \ - tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ - tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ - utils.c valarith.c valops.c valprint.c values.c varobj.c \ +SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \ + bcache.c bfd-target.c block.c blockframe.c breakpoint.c \ + buildsym.c \ + c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ + cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \ + cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \ + coffread.c complaints.c completer.c copying.c corefile.c \ + corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \ + dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \ + dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 9 21:39:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74D6316A4D0; Tue, 9 Nov 2004 21:39:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F1BF16A4CE for ; Tue, 9 Nov 2004 21:39:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4283C43D45 for ; Tue, 9 Nov 2004 21:39:56 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9Lduf0052784 for ; Tue, 9 Nov 2004 21:39:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9Ldtjb052781 for perforce@freebsd.org; Tue, 9 Nov 2004 21:39:55 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 21:39:55 GMT Message-Id: <200411092139.iA9Ldtjb052781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 21:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=64732 Change 64732 by sam@sam_ebb on 2004/11/09 21:39:26 fixup spacing Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#7 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#7 (text+ko) ==== @@ -716,7 +716,7 @@ if (len < sizeof(struct ieee80211req_sta_info)) return; - printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %4s\n" + printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %3s\n" , "ADDR" , "AID" , "CHAN" @@ -754,10 +754,10 @@ if (vp[1] < 2 + 4 || memcmp(&vp[2], "\x00\x50\xf2\x01", 4) != 0) break; - printie("WPA", vp, 2+vp[1], 24); + printie(" WPA", vp, 2+vp[1], 24); break; case IEEE80211_ELEMID_RSN: - printie("RSN", vp, 2+vp[1], 24); + printie(" RSN", vp, 2+vp[1], 24); break; /* XXX WME */ } From owner-p4-projects@FreeBSD.ORG Tue Nov 9 23:58:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5079C16A4D0; Tue, 9 Nov 2004 23:58:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28B8916A4CE for ; Tue, 9 Nov 2004 23:58:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E67F43D2F for ; Tue, 9 Nov 2004 23:58:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA9NwvkP063255 for ; Tue, 9 Nov 2004 23:58:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA9NwuRO063252 for perforce@freebsd.org; Tue, 9 Nov 2004 23:58:56 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Nov 2004 23:58:56 GMT Message-Id: <200411092358.iA9NwuRO063252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 23:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=64758 Change 64758 by sam@sam_ebb on 2004/11/09 23:58:56 create ibss neighbor table when adopting a station from the scan Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#10 (text+ko) ==== @@ -682,6 +682,19 @@ ic->ic_stats.is_ibss_norate++; return 0; } + /* + * Create the neighbor table. + */ + ic->ic_sta = ieee80211_node_table_alloc(ic, + "neighbor", ic->ic_inact_run, + ieee80211_timeout_stations); + if (ic->ic_sta == NULL) { + /* + * Should remain in SCAN state and retry. + */ + /* XXX stat+msg */ + return 0; + } } /* From owner-p4-projects@FreeBSD.ORG Wed Nov 10 01:18:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6281016A4D0; Wed, 10 Nov 2004 01:18:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D1F616A4CE for ; Wed, 10 Nov 2004 01:18:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F150343D2D for ; Wed, 10 Nov 2004 01:18:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAA1IcAL072931 for ; Wed, 10 Nov 2004 01:18:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAA1IcFF072928 for perforce@freebsd.org; Wed, 10 Nov 2004 01:18:38 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 01:18:38 GMT Message-Id: <200411100118.iAA1IcFF072928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 01:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64769 Change 64769 by sam@sam_ebb on 2004/11/10 01:17:43 switch ibss beacon generation from using swba to a self-linked descriptor marked with veol Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#15 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#15 (text+ko) ==== @@ -499,6 +499,12 @@ } sc->sc_defant = ath_hal_getdefantenna(ah); + /* + * Not all chips have the VEOL support we want to + * use with IBSS beacons; check here for it. + */ + sc->sc_hasveol = ath_hal_veolsupported(ah); + /* get mac address from hardware */ ath_hal_getmac(ah, ic->ic_myaddr); @@ -1577,7 +1583,7 @@ struct ath_node *an = ATH_NODE(ni); struct ath_desc *ds; u_int8_t rate; - int error; + int error, flags; DPRINTF(sc, ATH_DEBUG_BEACON, "%s: m %p len %u\n", __func__, m, m->m_len); @@ -1596,7 +1602,12 @@ /* setup descriptors */ ds = bf->bf_desc; - ds->ds_link = 0; + flags = HAL_TXDESC_NOACK; + if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) { + ds->ds_link = bf->bf_daddr; /* self-linked */ + flags = HAL_TXDESC_VEOL; + } else + ds->ds_link = 0; ds->ds_data = bf->bf_segs[0].ds_addr; /* * Calculate rate code. @@ -1614,7 +1625,7 @@ , rate, 1 /* series 0 rate/tries */ , HAL_TXKEYIX_INVALID /* no encryption */ , 0 /* antenna mode */ - , HAL_TXDESC_NOACK /* no ack for beacons */ + , flags /* no ack, veol for beacons */ , 0 /* rts/cts rate */ , 0 /* rts/cts duration */ ); @@ -1820,7 +1831,8 @@ nexttbtt = (LE_READ_4(ni->ni_tstamp.data + 4) << 22) | (LE_READ_4(ni->ni_tstamp.data) >> 10); - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt=%u\n", __func__, nexttbtt); + DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u intval %u\n", + __func__, nexttbtt, ni->ni_intval); nexttbtt += ni->ni_intval; intval = ni->ni_intval & HAL_BEACON_PERIOD; if (ic->ic_opmode == IEEE80211_M_STA) { @@ -1893,17 +1905,36 @@ sc->sc_imask |= HAL_INT_BMISS; ath_hal_intrset(ah, sc->sc_imask); } else { - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: intval %u nexttbtt %u\n", - __func__, ni->ni_intval, nexttbtt); ath_hal_intrset(ah, 0); if (nexttbtt == ni->ni_intval) intval |= HAL_BEACON_RESET_TSF; - if (ic->ic_opmode != IEEE80211_M_MONITOR) { + if (ic->ic_opmode == IEEE80211_M_IBSS) { + /* + * In IBSS mode enable the beacon timers but only + * enable SWBA interrupts if we need to manually + * prepare beacon frames. Otherwise we use a + * self-linked tx descriptor and let the hardware + * deal with things. + */ + intval |= HAL_BEACON_ENA; + if (!sc->sc_hasveol) + sc->sc_imask |= HAL_INT_SWBA; + } else if (ic->ic_opmode == IEEE80211_M_HOSTAP) { + /* + * In AP mode we enable the beacon timers and + * SWBA interrupts to prepare beacon frames. + */ intval |= HAL_BEACON_ENA; sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */ } ath_hal_beaconinit(ah, nexttbtt, intval); ath_hal_intrset(ah, sc->sc_imask); + /* + * When using a self-linked beacon descriptor in + * ibss mode load it once here. + */ + if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) + ath_beacon_proc(sc, 0); } } @@ -2143,9 +2174,8 @@ sc->sc_stats.ast_rx_busdma++; return error; } - KASSERT(bf->bf_nseg == 1, - ("ath_rxbuf_init: multi-segment packet; nseg %u", - bf->bf_nseg)); + KASSERT(bf->bf_nseg == 1, ("%s: multi-segment packet; nseg %u", + __func__, bf->bf_nseg)); } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREREAD); ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#6 (text+ko) ==== @@ -155,7 +155,8 @@ sc_splitmic: 1, /* split TKIP MIC keys */ sc_needmib : 1, /* enable MIB stats intr */ sc_hasdiversity : 1,/* rx diversity available */ - sc_diversity : 1;/* enable rx diversity */ + sc_diversity : 1,/* enable rx diversity */ + sc_hasveol : 1; /* tx VEOL support */ /* rate tables */ const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_currates; /* current rate table */ @@ -399,6 +400,8 @@ ath_hal_setcapability(_ah, HAL_CAP_DIAG, 0, _v, NULL) #define ath_hal_getnumtxqueues(_ah, _pv) \ (ath_hal_getcapability(_ah, HAL_CAP_NUM_TXQUEUES, 0, _pv) == HAL_OK) +#define ath_hal_veolsupported(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_VEOL, 0, NULL) == HAL_OK) #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) From owner-p4-projects@FreeBSD.ORG Wed Nov 10 01:19:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDD5A16A4D0; Wed, 10 Nov 2004 01:19:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B88FA16A4CE for ; Wed, 10 Nov 2004 01:19:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE98343D1D for ; Wed, 10 Nov 2004 01:19:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAA1Jeo2072952 for ; Wed, 10 Nov 2004 01:19:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAA1JeiQ072949 for perforce@freebsd.org; Wed, 10 Nov 2004 01:19:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 01:19:40 GMT Message-Id: <200411100119.iAA1JeiQ072949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 01:19:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=64770 Change 64770 by sam@sam_ebb on 2004/11/10 01:19:19 when the rssi is required for a node that's just been created there is no avgrssi in the driver-private area--so fallback on ni_rssi recordered by the 802.11 layer Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#16 (text+ko) ==== @@ -2132,6 +2132,8 @@ int32_t rssi; rssi = HAL_EP_RND(avgrssi, HAL_RSSI_EP_MULTIPLIER); + if (rssi == 0) + rssi = ni->ni_rssi; /* NB: theoretically we shouldn't need this, but be paranoid */ return rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; #undef HAL_EP_RND From owner-p4-projects@FreeBSD.ORG Wed Nov 10 04:47:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B5E216A4D0; Wed, 10 Nov 2004 04:47:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E814D16A4CE for ; Wed, 10 Nov 2004 04:47:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8985143D3F for ; Wed, 10 Nov 2004 04:47:53 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAA4lrKZ087254 for ; Wed, 10 Nov 2004 04:47:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAA4lqSg087251 for perforce@freebsd.org; Wed, 10 Nov 2004 04:47:52 GMT (envelope-from julian@freebsd.org) Date: Wed, 10 Nov 2004 04:47:52 GMT Message-Id: <200411100447.iAA4lqSg087251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 64775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 04:47:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=64775 Change 64775 by julian@julian_ref on 2004/11/10 04:47:08 IFC@64773 Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/nsched/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/nsched/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/nsched/sys/alpha/conf/GENERIC#10 integrate .. //depot/projects/nsched/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/nsched/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/nsched/sys/alpha/include/smp.h#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/nsched/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/nsched/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/nsched/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/nsched/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/critical.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/nsched/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/nsched/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/nsched/sys/arm/arm/locore.S#5 integrate .. //depot/projects/nsched/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/nsched/sys/arm/arm/mem.c#1 branch .. //depot/projects/nsched/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/nsched/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/support.S#4 integrate .. //depot/projects/nsched/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/nsched/sys/arm/arm/trap.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/nsched/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/nsched/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/nsched/sys/arm/include/asm.h#3 integrate .. //depot/projects/nsched/sys/arm/include/atomic.h#2 integrate .. //depot/projects/nsched/sys/arm/include/cpu.h#3 integrate .. //depot/projects/nsched/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/nsched/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/nsched/sys/arm/include/endian.h#5 integrate .. //depot/projects/nsched/sys/arm/include/memdev.h#1 branch .. //depot/projects/nsched/sys/arm/include/param.h#4 integrate .. //depot/projects/nsched/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/nsched/sys/arm/include/pmap.h#5 integrate .. //depot/projects/nsched/sys/arm/include/reg.h#2 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/nsched/sys/boot/alpha/libalpha/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/nsched/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf.5#4 integrate .. //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/nsched/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/nsched/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/nsched/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/nsched/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/nsched/sys/conf/Makefile.arm#4 integrate .. //depot/projects/nsched/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/nsched/sys/conf/NOTES#23 integrate .. //depot/projects/nsched/sys/conf/files#30 integrate .. //depot/projects/nsched/sys/conf/files.i386#11 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#7 integrate .. //depot/projects/nsched/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#11 integrate .. //depot/projects/nsched/sys/conf/options#19 integrate .. //depot/projects/nsched/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/nsched/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/nsched/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/nsched/sys/ddb/db_output.c#3 integrate .. //depot/projects/nsched/sys/ddb/db_ps.c#7 integrate .. //depot/projects/nsched/sys/ddb/db_thread.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_variables.c#3 integrate .. //depot/projects/nsched/sys/ddb/ddb.h#4 integrate .. //depot/projects/nsched/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/nsched/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/nsched/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/nsched/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/nsched/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#9 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#13 integrate .. //depot/projects/nsched/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/nsched/sys/dev/firewire/iec13213.h#3 integrate .. //depot/projects/nsched/sys/dev/gx/if_gx.c#3 delete .. //depot/projects/nsched/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/nsched/sys/dev/gx/if_gxvar.h#2 delete .. //depot/projects/nsched/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/nsched/sys/dev/hptmv/global.h#1 branch .. //depot/projects/nsched/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/nsched/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/nsched/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/nsched/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/nsched/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/nsched/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/nsched/sys/dev/md/md.c#14 integrate .. //depot/projects/nsched/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/nsched/sys/dev/patm/genrtab/Makefile#2 integrate .. //depot/projects/nsched/sys/dev/pci/pci.c#9 integrate .. //depot/projects/nsched/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/nsched/sys/dev/scd/scd.c#4 integrate .. //depot/projects/nsched/sys/dev/snp/snp.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/nsched/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/nsched/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/nsched/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/nsched/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/uhci.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/uhub.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/nsched/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/nsched/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/nsched/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/nsched/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/nsched/sys/dev/vinum/request.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinum.c#5 delete .. //depot/projects/nsched/sys/dev/vinum/vinumconfig.c#3 delete .. //depot/projects/nsched/sys/dev/vinum/vinumdaemon.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumext.h#4 delete .. //depot/projects/nsched/sys/dev/vinum/vinumhdr.h#3 delete .. //depot/projects/nsched/sys/dev/vinum/vinuminterrupt.c#3 delete .. //depot/projects/nsched/sys/dev/vinum/vinumio.c#5 delete .. //depot/projects/nsched/sys/dev/vinum/vinumio.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumioctl.c#4 delete .. //depot/projects/nsched/sys/dev/vinum/vinumkw.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumlock.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinummemory.c#4 delete .. //depot/projects/nsched/sys/dev/vinum/vinumobj.h#3 delete .. //depot/projects/nsched/sys/dev/vinum/vinumparser.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumraid5.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumrequest.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumrevive.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumstate.c#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumutil.c#3 delete .. //depot/projects/nsched/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/nsched/sys/dev/vinum/vinumvar.h#2 delete .. //depot/projects/nsched/sys/fs/autofs/autofs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/nsched/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfsmount.h#4 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/fs/specfs/spec_vnops.c#10 delete .. //depot/projects/nsched/sys/fs/udf/udf.h#4 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/nsched/sys/geom/geom.h#6 integrate .. //depot/projects/nsched/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_dev.c#7 integrate .. //depot/projects/nsched/sys/geom/geom_event.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_int.h#3 integrate .. //depot/projects/nsched/sys/geom/geom_io.c#10 integrate .. //depot/projects/nsched/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_slice.c#6 integrate .. //depot/projects/nsched/sys/geom/geom_subr.c#6 integrate .. //depot/projects/nsched/sys/geom/geom_vfs.c#1 branch .. //depot/projects/nsched/sys/geom/geom_vfs.h#1 branch .. //depot/projects/nsched/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/nsched/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/nsched/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#8 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_subr.c#4 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_asus.c#6 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_panasonic.c#3 integrate .. //depot/projects/nsched/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#14 integrate .. //depot/projects/nsched/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/nsched/sys/i386/include/sysarch.h#3 integrate .. //depot/projects/nsched/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/nsched/sys/ia64/ia64/db_trace.c#5 integrate .. //depot/projects/nsched/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/nsched/sys/isa/vga_isa.c#4 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_node.h#5 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/nsched/sys/isofs/cd9660/iso.h#4 integrate .. //depot/projects/nsched/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/nsched/sys/kern/init_main.c#15 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#12 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/nsched/sys/kern/kern_environment.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#14 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#21 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#17 integrate .. //depot/projects/nsched/sys/kern/kern_intr.c#9 integrate .. //depot/projects/nsched/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_mac.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_physio.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#14 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#41 integrate .. //depot/projects/nsched/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#45 integrate .. //depot/projects/nsched/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#43 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#11 integrate .. //depot/projects/nsched/sys/kern/subr_param.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/nsched/sys/kern/subr_trap.c#8 integrate .. //depot/projects/nsched/sys/kern/subr_unit.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_witness.c#9 integrate .. //depot/projects/nsched/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#7 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#7 integrate .. //depot/projects/nsched/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/nsched/sys/kern/tty.c#14 integrate .. //depot/projects/nsched/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/nsched/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#11 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/nsched/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/nsched/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_default.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/nsched/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/nsched/sys/kern/vnode_if.src#4 integrate .. //depot/projects/nsched/sys/libkern/arm/divsi3.S#3 integrate .. //depot/projects/nsched/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/nsched/sys/modules/Makefile#15 integrate .. //depot/projects/nsched/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/gx/Makefile#2 delete .. //depot/projects/nsched/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/nsched/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/nsched/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/nsched/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/nsched/sys/modules/vinum/Makefile#2 delete .. //depot/projects/nsched/sys/net/if.c#16 integrate .. //depot/projects/nsched/sys/net/if_ppp.c#7 integrate .. //depot/projects/nsched/sys/net/if_pppvar.h#2 integrate .. //depot/projects/nsched/sys/net/if_sl.c#11 integrate .. //depot/projects/nsched/sys/net/if_tap.c#7 integrate .. //depot/projects/nsched/sys/net/if_tun.c#7 integrate .. //depot/projects/nsched/sys/net/if_var.h#9 integrate .. //depot/projects/nsched/sys/net/ppp_tty.c#5 integrate .. //depot/projects/nsched/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/nsched/sys/net/rtsock.c#10 integrate .. //depot/projects/nsched/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/nsched/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/hci/ng_hci_main.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/nsched/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/nsched/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_pppoe.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/nsched/sys/netinet/if_ether.c#7 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/nsched/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/nsched/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/nsched/sys/netinet/tcp.h#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/nsched/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/nsched/sys/netinet/tcp_seq.h#4 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/nsched/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/nsched/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/nsched/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/nsched/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/nsched/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/nsched/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/nsched/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/nsched/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netipsec/keysock.c#3 integrate .. //depot/projects/nsched/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netipx/spx_usrreq.c#6 integrate .. //depot/projects/nsched/sys/netkey/key.c#5 integrate .. //depot/projects/nsched/sys/netkey/key.h#2 integrate .. //depot/projects/nsched/sys/netkey/keydb.h#2 integrate .. //depot/projects/nsched/sys/netkey/keysock.c#4 integrate .. //depot/projects/nsched/sys/netnatm/natm.c#5 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/nsched/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/nsched/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/nsched/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#10 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#8 integrate .. //depot/projects/nsched/sys/pc98/pc98/wd.c#5 integrate .. //depot/projects/nsched/sys/pc98/pc98/wd_cd.c#3 integrate .. //depot/projects/nsched/sys/pci/agp.c#6 integrate .. //depot/projects/nsched/sys/pci/agp_i810.c#5 integrate .. //depot/projects/nsched/sys/pci/if_de.c#8 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#7 integrate .. //depot/projects/nsched/sys/pci/if_skreg.h#3 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#10 integrate .. //depot/projects/nsched/sys/pci/if_xl.c#11 integrate .. //depot/projects/nsched/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/nsched/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/nsched/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/nsched/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/nsched/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/nsched/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/nsched/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/nsched/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/nsched/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/nsched/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/nsched/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/nsched/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/nsched/sys/sys/_types.h#4 integrate .. //depot/projects/nsched/sys/sys/buf.h#6 integrate .. //depot/projects/nsched/sys/sys/bufobj.h#1 branch .. //depot/projects/nsched/sys/sys/conf.h#14 integrate .. //depot/projects/nsched/sys/sys/fdcio.h#4 integrate .. //depot/projects/nsched/sys/sys/file.h#4 integrate .. //depot/projects/nsched/sys/sys/filedesc.h#4 integrate .. //depot/projects/nsched/sys/sys/kernel.h#4 integrate .. //depot/projects/nsched/sys/sys/ktr.h#3 integrate .. //depot/projects/nsched/sys/sys/mac_policy.h#5 integrate .. //depot/projects/nsched/sys/sys/mdioctl.h#5 integrate .. //depot/projects/nsched/sys/sys/mount.h#8 integrate .. //depot/projects/nsched/sys/sys/param.h#16 integrate .. //depot/projects/nsched/sys/sys/proc.h#40 integrate .. //depot/projects/nsched/sys/sys/protosw.h#4 integrate .. //depot/projects/nsched/sys/sys/resource.h#5 integrate .. //depot/projects/nsched/sys/sys/rman.h#5 integrate .. //depot/projects/nsched/sys/sys/sf_buf.h#3 integrate .. //depot/projects/nsched/sys/sys/syscall.h#7 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#7 integrate .. //depot/projects/nsched/sys/sys/syslog.h#3 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#7 integrate .. //depot/projects/nsched/sys/sys/systm.h#10 integrate .. //depot/projects/nsched/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/nsched/sys/sys/vnode.h#10 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#9 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/nsched/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/nsched/sys/vm/swap_pager.c#9 integrate .. //depot/projects/nsched/sys/vm/uma_core.c#7 integrate .. //depot/projects/nsched/sys/vm/vm_contig.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_glue.c#9 integrate .. //depot/projects/nsched/sys/vm/vm_kern.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/nsched/sys/vm/vm_object.c#7 integrate .. //depot/projects/nsched/sys/vm/vm_object.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#11 integrate .. //depot/projects/nsched/sys/vm/vm_page.h#7 integrate .. //depot/projects/nsched/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_pager.c#3 integrate .. //depot/projects/nsched/sys/vm/vm_pager.h#3 integrate .. //depot/projects/nsched/sys/vm/vm_param.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/nsched/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/db_trace.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -221,7 +221,7 @@ last_ipl = ~0L; tf = NULL; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) ==== //depot/projects/nsched/sys/alpha/alpha/machdep.c#6 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.223 2004/09/05 02:09:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -864,7 +864,8 @@ /* This is not a 'struct user' */ size_t sz = round_page(KSTACK_PAGES * PAGE_SIZE); pcpup = (struct pcpu *) pmap_steal_memory(sz); - pcpu_init(pcpup, alpha_pal_whami(), sz); + pcpu_init(pcpup, 0, sz); + pcpup->pc_pal_id = alpha_pal_whami(); alpha_pal_wrval((u_int64_t) pcpup); PCPU_GET(next_asn) = 1; /* 0 used for proc0 pmap */ PCPU_SET(curthread, &thread0); ==== //depot/projects/nsched/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.53 2004/11/05 19:16:43 jhb Exp $"); #include "opt_kstack_pages.h" @@ -61,23 +61,23 @@ static struct mtx ap_boot_mtx; -u_int boot_cpu_id; +u_int64_t boot_cpu_id; static void release_aps(void *dummy); static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); -static int smp_send_secondary_command(const char *command, int cpuid); -static int smp_start_secondary(int cpuid); +static int smp_send_secondary_command(const char *command, int pal_id); +static int smp_start_secondary(int pal_id, int cpuid); /* * Communicate with a console running on a secondary processor. * Return 1 on failure. */ static int -smp_send_secondary_command(const char *command, int cpuid) +smp_send_secondary_command(const char *command, int pal_id) { - u_int64_t mask = 1L << cpuid; - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + u_int64_t mask = 1L << pal_id; + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); int i, len; /* @@ -165,7 +165,7 @@ /* * Set flags in our per-CPU slot in the HWRPB. */ - cpu = LOCATE_PCS(hwrpb, PCPU_GET(cpuid)); + cpu = LOCATE_PCS(hwrpb, PCPU_GET(pal_id)); cpu->pcs_flags &= ~PCS_BIP; cpu->pcs_flags |= PCS_RC; alpha_mb(); @@ -216,9 +216,9 @@ } static int -smp_start_secondary(int cpuid) +smp_start_secondary(int pal_id, int cpuid) { - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); struct pcs *bootcpu = LOCATE_PCS(hwrpb, boot_cpu_id); struct alpha_pcb *pcb = (struct alpha_pcb *) cpu->pcs_hwpcb; struct pcpu *pcpu; @@ -226,12 +226,12 @@ size_t sz; if ((cpu->pcs_flags & PCS_PV) == 0) { - printf("smp_start_secondary: cpu %d PALcode invalid\n", cpuid); + printf("smp_start_secondary: cpu %d PALcode invalid\n", pal_id); return 0; } if (bootverbose) - printf("smp_start_secondary: starting cpu %d\n", cpuid); + printf("smp_start_secondary: starting cpu %d\n", pal_id); sz = round_page((UAREA_PAGES + KSTACK_PAGES) * PAGE_SIZE); pcpu = malloc(sz, M_TEMP, M_NOWAIT); @@ -241,6 +241,7 @@ } pcpu_init(pcpu, cpuid, sz); + pcpu->pc_pal_id = pal_id; /* * Copy the idle pcb and setup the address to start executing. @@ -270,7 +271,7 @@ /* * Fire it up and hope for the best. */ - if (!smp_send_secondary_command("START\r\n", cpuid)) { + if (!smp_send_secondary_command("START\r\n", pal_id)) { printf("smp_start_secondary: can't send START command\n"); pcpu_destroy(pcpu); free(pcpu, M_TEMP); @@ -296,7 +297,7 @@ * It worked (I think). */ if (bootverbose) - printf("smp_start_secondary: cpu %d started\n", cpuid); + printf("smp_start_secondary: cpu %d started\n", pal_id); return 1; } @@ -329,16 +330,18 @@ void cpu_mp_setmaxid(void) { - int i; + u_int64_t i; mp_maxid = 0; - for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { - if (i == PCPU_GET(cpuid)) + for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - mp_maxid = i; + mp_maxid++; } + if (mp_maxid > MAXCPU) + mp_maxid = MAXCPU; } int @@ -348,7 +351,7 @@ /* XXX: Need to check for valid platforms here. */ - boot_cpu_id = PCPU_GET(cpuid); + boot_cpu_id = PCPU_GET(pal_id); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); all_cpus = PCPU_GET(cpumask); @@ -358,12 +361,10 @@ /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == PCPU_GET(cpuid)) + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - if (i > MAXCPU) - continue; cpus++; } return (cpus); @@ -372,10 +373,11 @@ void cpu_mp_start(void) { - int i; + int i, cpuid; mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); + cpuid = 1; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { struct pcs *pcsp; @@ -410,22 +412,30 @@ printf("CPU %d disabled by loader.\n", i); continue; } - all_cpus |= (1 << i); - mp_ncpus++; + if (smp_start_secondary(i, cpuid)) { + all_cpus |= (1 << cpuid); + mp_ncpus++; + cpuid++; + } } PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); - - for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == boot_cpu_id) - continue; - if (!CPU_ABSENT(i)) - smp_start_secondary(i); - } } void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + /* List CPUs */ + printf(" cpu0 (BSP): PAL ID: %2lu\n", boot_cpu_id); + for (i = 1; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + MPASS(pc != NULL); + printf(" cpu%d (AP): PAL ID: %2lu\n", i, pc->pc_pal_id); + } } /* @@ -446,8 +456,9 @@ if (pcpu) { atomic_set_64(&pcpu->pc_pending_ipis, ipi); alpha_mb(); - CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", cpuid); - alpha_pal_wripir(cpuid); + CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", + pcpu->pc_pal_id); + alpha_pal_wripir(pcpu->pc_pal_id); } } } @@ -529,8 +540,8 @@ * requests to provide PALcode to secondaries and to start up new * secondaries that are added to the system on the fly. */ - if (PCPU_GET(cpuid) == boot_cpu_id) { - u_int cpuid; + if (PCPU_GET(pal_id) == boot_cpu_id) { + u_int pal_id; u_int64_t txrdy; #ifdef DIAGNOSTIC struct pcs *cpu; @@ -539,18 +550,18 @@ alpha_mb(); while (hwrpb->rpb_txrdy != 0) { - cpuid = ffs(hwrpb->rpb_txrdy) - 1; + pal_id = ffs(hwrpb->rpb_txrdy) - 1; #ifdef DIAGNOSTIC - cpu = LOCATE_PCS(hwrpb, cpuid); + cpu = LOCATE_PCS(hwrpb, pal_id); bcopy(&cpu->pcs_buffer.txbuf, buf, cpu->pcs_buffer.txlen); buf[cpu->pcs_buffer.txlen] = '\0'; - printf("SMP From CPU%d: %s\n", cpuid, buf); + printf("SMP From CPU%d: %s\n", pal_id, buf); #endif do { txrdy = hwrpb->rpb_txrdy; } while (atomic_cmpset_64(&hwrpb->rpb_txrdy, txrdy, - txrdy & ~(1 << cpuid)) == 0); + txrdy & ~(1 << pal_id)) == 0); } } } ==== //depot/projects/nsched/sys/alpha/conf/GENERIC#10 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.181 2004/11/09 22:23:34 wilko Exp $ machine alpha cpu EV4 @@ -32,7 +32,6 @@ # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) -options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName options DEC_EB164 # EB164, PC164, PC164LX, PC164SX options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc options DEC_2100_A50 # AlphaStation 200, 250, 255, 400 @@ -41,8 +40,6 @@ options DEC_ST550 # Personal Workstation 433, 500, 600 options DEC_ST6600 # XP1000, DP264, DS20, DS10, family options DEC_1000A # AlphaServer 1000, 1000A, 800 -# TurboLaser support is broken -# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser) options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) @@ -66,7 +63,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/nsched/sys/alpha/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.155 2004/08/28 21:47:24 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -27,7 +27,6 @@ # PLATFORM OPTIONS options API_UP1000 # UP1000, UP1100 (Nautilus) -options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName options DEC_EB164 # EB164, PC164, PC164LX, PC164SX options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc options DEC_2100_A50 # AlphaStation 200, 250, 255, 400 @@ -36,8 +35,6 @@ options DEC_ST550 # Personal Workstation 433, 500, 600 options DEC_ST6600 # XP1000, DP264, DS20, DS10, family options DEC_1000A # AlphaServer 1000, 1000A, 800 -# TurboLaser support is broken -# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser) options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) ==== //depot/projects/nsched/sys/alpha/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.14 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -34,6 +34,7 @@ #define PCPU_MD_FIELDS \ struct alpha_pcb pc_idlepcb; /* pcb for idling */ \ + u_int64_t pc_pal_id; /* physical CPU ID */ \ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ ==== //depot/projects/nsched/sys/alpha/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.6 2001/08/13 22:41:15 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.7 2004/11/05 19:16:44 jhb Exp $ * */ @@ -26,7 +26,7 @@ #ifndef LOCORE -extern u_int boot_cpu_id; +extern u_int64_t boot_cpu_id; void ipi_selected(u_int cpus, u_int64_t ipi); void ipi_all(u_int64_t ipi); ==== //depot/projects/nsched/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.58 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.60 2004/11/10 03:49:24 scottl Exp $"); #include #include @@ -33,12 +33,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -50,6 +52,8 @@ #define MAX_BPAGES 512 +struct bounce_zone; + struct bus_dma_tag { bus_dma_tag_t parent; bus_size_t alignment; @@ -67,6 +71,7 @@ bus_dma_lock_t *lockfunc; void *lockfuncarg; bus_dma_segment_t *segments; + struct bounce_zone *bounce_zone; }; struct bounce_page { @@ -79,29 +84,32 @@ int busdma_swi_pending; +struct bounce_zone { + STAILQ_ENTRY(bounce_zone) links; + STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; + int free_bpages; + int reserved_bpages; + int active_bpages; + int total_bounced; + int total_deferred; + bus_size_t alignment; + bus_size_t boundary; + bus_addr_t lowaddr; + char zoneid[8]; + char lowaddrid[20]; + struct sysctl_ctx_list sysctl_tree; + struct sysctl_oid *sysctl_tree_top; +}; + static struct mtx bounce_lock; -static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; -static int free_bpages; -static int reserved_bpages; -static int active_bpages; static int total_bpages; -static int total_bounced; -static int total_deferred; +static int busdma_zonecount; +static STAILQ_HEAD(, bounce_zone) bounce_zone_list; static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters"); -SYSCTL_INT(_hw_busdma, OID_AUTO, free_bpages, CTLFLAG_RD, &free_bpages, 0, - "Free bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, reserved_bpages, CTLFLAG_RD, &reserved_bpages, - 0, "Reserved bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, active_bpages, CTLFLAG_RD, &active_bpages, 0, - "Active bounce pages"); SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0, "Total bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, total_bounced, CTLFLAG_RD, &total_bounced, 0, - "Total bounce requests"); -SYSCTL_INT(_hw_busdma, OID_AUTO, total_deferred, CTLFLAG_RD, &total_deferred, 0, - "Total bounce requests that were deferred"); struct bus_dmamap { struct bp_list bpages; @@ -120,6 +128,7 @@ static struct bus_dmamap nobounce_dmamap; static void init_bounce_pages(void *dummy); +static struct bounce_zone * alloc_bounce_zone(bus_dma_tag_t dmat); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit); @@ -217,9 +226,13 @@ /* Return a NULL tag on failure */ *dmat = NULL; - newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT); - if (newtag == NULL) + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, + M_ZERO | M_NOWAIT); + if (newtag == NULL) { + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag " + "flags 0x%x error %d", newtag, 0, error); return (ENOMEM); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 04:48:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFE2716A4D0; Wed, 10 Nov 2004 04:48:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 890F916A4CE for ; Wed, 10 Nov 2004 04:48:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E5CB43D48 for ; Wed, 10 Nov 2004 04:48:55 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAA4mt3i087313 for ; Wed, 10 Nov 2004 04:48:55 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAA4msag087310 for perforce@freebsd.org; Wed, 10 Nov 2004 04:48:54 GMT (envelope-from julian@freebsd.org) Date: Wed, 10 Nov 2004 04:48:54 GMT Message-Id: <200411100448.iAA4msag087310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 64776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 04:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=64776 Change 64776 by julian@julian_ref on 2004/11/10 04:48:22 IFC@64774 to get maestro changes Affected files ... .. //depot/projects/nsched/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro_reg.h#2 integrate Differences ... ==== //depot/projects/nsched/sys/dev/sound/pci/maestro.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: maestro.c,v 1.18 2003/07/01 15:52:01 scottl Exp $ + * maestro.c,v 1.23.2.1 2003/10/03 18:21:38 taku Exp */ /* @@ -42,6 +42,9 @@ * were looked at by * Munehiro Matsuda , * who brought patches based on the Linux driver with some simplification. + * + * Hardware volume controller was implemented by + * John Baldwin . */ #include @@ -51,7 +54,8 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.24 2004/08/22 18:57:40 green Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.25 2004/11/10 04:29:09 julian Exp $"); + #define inline __inline @@ -70,60 +74,150 @@ #define NEC_SUBID1 0x80581033 /* Taken from Linux driver */ #define NEC_SUBID2 0x803c1033 /* NEC VersaProNX VA26D */ -#ifndef AGG_MAXPLAYCH +#ifdef AGG_MAXPLAYCH +# if AGG_MAXPLAYCH > 4 +# undef AGG_MAXPLAYCH +# define AGG_MAXPLAYCH 4 +# endif +#else # define AGG_MAXPLAYCH 4 #endif #define AGG_DEFAULT_BUFSZ 0x4000 /* 0x1000, but gets underflows */ +/* compatibility */ +#if __FreeBSD_version < 500000 +# define critical_enter() disable_intr() +# define critical_exit() enable_intr() +#endif + +#ifndef PCIR_BAR +#define PCIR_BAR(x) (PCIR_MAPS + (x) * 4) +#endif + + /* ----------------------------- * Data structures. */ struct agg_chinfo { + /* parent softc */ struct agg_info *parent; + + /* FreeBSD newpcm related */ struct pcm_channel *channel; struct snd_dbuf *buffer; - bus_addr_t offset; - u_int32_t blocksize; + + /* OS independent */ + bus_addr_t phys; /* channel buffer physical address */ + bus_addr_t base; /* channel buffer segment base */ + u_int32_t blklen; /* DMA block length in WORDs */ + u_int32_t buflen; /* channel buffer length in WORDs */ + u_int32_t speed; + unsigned num : 3; + unsigned stereo : 1; + unsigned qs16 : 1; /* quantum size is 16bit */ + unsigned us : 1; /* in unsigned format */ +}; + +struct agg_rchinfo { + /* parent softc */ + struct agg_info *parent; + + /* FreeBSD newpcm related */ + struct pcm_channel *channel; + struct snd_dbuf *buffer; + + /* OS independent */ + bus_addr_t phys; /* channel buffer physical address */ + bus_addr_t base; /* channel buffer segment base */ + u_int32_t blklen; /* DMA block length in WORDs */ + u_int32_t buflen; /* channel buffer length in WORDs */ u_int32_t speed; - int dir; - u_int num; - u_int16_t aputype; - u_int16_t wcreg_tpl; + unsigned : 3; + unsigned stereo : 1; + bus_addr_t srcphys; + int16_t *src; /* stereo peer buffer */ + int16_t *sink; /* channel buffer pointer */ + volatile u_int32_t hwptr; /* ready point in 16bit sample */ }; struct agg_info { + /* FreeBSD newbus related */ device_t dev; + + /* I wonder whether bus_space_* are in common in *BSD... */ struct resource *reg; int regid; - bus_space_tag_t st; bus_space_handle_t sh; - bus_dma_tag_t parent_dmat; struct resource *irq; int irqid; void *ih; - u_int8_t *stat; - bus_addr_t baseaddr; + bus_dma_tag_t buf_dmat; + bus_dma_tag_t stat_dmat; + /* FreeBSD SMPng related */ +#ifdef USING_MUTEX + struct mtx lock; /* mutual exclusion */ +#endif + /* FreeBSD newpcm related */ struct ac97_info *codec; - struct mtx *lock; - unsigned int bufsz; - u_int playchns, active; + /* OS independent */ + u_int8_t *stat; /* status buffer pointer */ + bus_addr_t phys; /* status buffer physical address */ + unsigned int bufsz; /* channel buffer size in bytes */ + u_int playchns; + volatile u_int active; struct agg_chinfo pch[AGG_MAXPLAYCH]; - struct agg_chinfo rch; + struct agg_rchinfo rch; + volatile u_int8_t curpwr; /* current power status: D[0-3] */ }; + +/* ----------------------------- + * Sysctls for debug. + */ +static unsigned int powerstate_active = PCI_POWERSTATE_D1; +#ifdef MAESTRO_AGGRESSIVE_POWERSAVE +static unsigned int powerstate_idle = PCI_POWERSTATE_D2; +#else +static unsigned int powerstate_idle = PCI_POWERSTATE_D1; +#endif +static unsigned int powerstate_init = PCI_POWERSTATE_D2; + +SYSCTL_NODE(_debug, OID_AUTO, maestro, CTLFLAG_RD, 0, ""); +SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_active, CTLFLAG_RW, + &powerstate_active, 0, "The Dx power state when active (0-1)"); +SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_idle, CTLFLAG_RW, + &powerstate_idle, 0, "The Dx power state when idle (0-2)"); +SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_init, CTLFLAG_RW, + &powerstate_init, 0, "The Dx power state prior to the first use (0-2)"); + + +/* ----------------------------- + * Prototypes + */ + +static inline void agg_lock(struct agg_info*); +static inline void agg_unlock(struct agg_info*); +static inline void agg_sleep(struct agg_info*, const char *wmesg, int msec); + +static inline u_int32_t agg_rd(struct agg_info*, int, int size); +static inline void agg_wr(struct agg_info*, int, u_int32_t data, int size); + +static inline int agg_rdcodec(struct agg_info*, int); +static inline int agg_wrcodec(struct agg_info*, int, u_int32_t); + static inline void ringbus_setdest(struct agg_info*, int, int); static inline u_int16_t wp_rdreg(struct agg_info*, u_int16_t); static inline void wp_wrreg(struct agg_info*, u_int16_t, u_int16_t); -static inline u_int16_t wp_rdapu(struct agg_info*, int, u_int16_t); -static inline void wp_wrapu(struct agg_info*, int, u_int16_t, u_int16_t); +static inline u_int16_t wp_rdapu(struct agg_info*, unsigned, u_int16_t); +static inline void wp_wrapu(struct agg_info*, unsigned, u_int16_t, u_int16_t); static inline void wp_settimer(struct agg_info*, u_int); static inline void wp_starttimer(struct agg_info*); static inline void wp_stoptimer(struct agg_info*); @@ -133,16 +227,22 @@ static inline u_int16_t wc_rdchctl(struct agg_info*, int); static inline void wc_wrchctl(struct agg_info*, int, u_int16_t); -static inline void agg_power(struct agg_info*, int); +static inline void agg_stopclock(struct agg_info*, int part, int st); +static inline void agg_initcodec(struct agg_info*); static void agg_init(struct agg_info*); +static void agg_power(struct agg_info*, int); static void aggch_start_dac(struct agg_chinfo*); static void aggch_stop_dac(struct agg_chinfo*); +static void aggch_start_adc(struct agg_rchinfo*); +static void aggch_stop_adc(struct agg_rchinfo*); +static void aggch_feed_adc_stereo(struct agg_rchinfo*); +static void aggch_feed_adc_mono(struct agg_rchinfo*); static inline void suppress_jitter(struct agg_chinfo*); +static inline void suppress_rec_jitter(struct agg_rchinfo*); -static inline u_int calc_timer_freq(struct agg_chinfo*); static void set_timer(struct agg_info*); static void agg_intr(void *); @@ -153,181 +253,260 @@ static int agg_resume(device_t); static int agg_shutdown(device_t); -static void *dma_malloc(struct agg_info*, u_int32_t, bus_addr_t*); -static void dma_free(struct agg_info*, void *); +static void *dma_malloc(bus_dma_tag_t, u_int32_t, bus_addr_t*); +static void dma_free(bus_dma_tag_t, void *); + /* ----------------------------- * Subsystems. */ -/* Codec/Ringbus */ +/* locking */ + +static inline void +agg_lock(struct agg_info *sc) +{ +#ifdef USING_MUTEX + mtx_lock(&sc->lock); +#endif +} + +static inline void +agg_unlock(struct agg_info *sc) +{ +#ifdef USING_MUTEX + mtx_unlock(&sc->lock); +#endif +} + +static inline void +agg_sleep(struct agg_info *sc, const char *wmesg, int msec) +{ + int timo; + + timo = msec * hz / 1000; + if (timo == 0) + timo = 1; +#ifdef USING_MUTEX + msleep(sc, &sc->lock, PWAIT, wmesg, timo); +#else + tsleep(sc, PWAIT, wmesg, timo); +#endif +} + + +/* I/O port */ + +static inline u_int32_t +agg_rd(struct agg_info *sc, int regno, int size) +{ + switch (size) { + case 1: + return bus_space_read_1(sc->st, sc->sh, regno); + case 2: + return bus_space_read_2(sc->st, sc->sh, regno); + case 4: + return bus_space_read_4(sc->st, sc->sh, regno); + default: + return ~(u_int32_t)0; + } +} + +#define AGG_RD(sc, regno, size) \ + bus_space_read_##size( \ + ((struct agg_info*)(sc))->st, \ + ((struct agg_info*)(sc))->sh, (regno)) + +static inline void +agg_wr(struct agg_info *sc, int regno, u_int32_t data, int size) +{ + switch (size) { + case 1: + bus_space_write_1(sc->st, sc->sh, regno, data); + break; + case 2: + bus_space_write_2(sc->st, sc->sh, regno, data); + break; + case 4: + bus_space_write_4(sc->st, sc->sh, regno, data); + break; + } +} + +#define AGG_WR(sc, regno, data, size) \ + bus_space_write_##size( \ + ((struct agg_info*)(sc))->st, \ + ((struct agg_info*)(sc))->sh, (regno), (data)) /* -------------------------------------------------------------------- */ -static u_int32_t -agg_ac97_init(kobj_t obj, void *sc) +/* Codec/Ringbus */ + +static inline int +agg_codec_wait4idle(struct agg_info *ess) { - struct agg_info *ess = sc; + unsigned t = 26; - return (bus_space_read_1(ess->st, ess->sh, PORT_CODEC_STAT) & CODEC_STAT_MASK)? 0 : 1; + while (AGG_RD(ess, PORT_CODEC_STAT, 1) & CODEC_STAT_MASK) { + if (--t == 0) + return EBUSY; + DELAY(2); /* 20.8us / 13 */ + } + return 0; } -static int -agg_rdcodec(kobj_t obj, void *sc, int regno) + +static inline int +agg_rdcodec(struct agg_info *ess, int regno) { - struct agg_info *ess = sc; - unsigned t; + int ret; /* We have to wait for a SAFE time to write addr/data */ - for (t = 0; t < 20; t++) { - if ((bus_space_read_1(ess->st, ess->sh, PORT_CODEC_STAT) - & CODEC_STAT_MASK) != CODEC_STAT_PROGLESS) - break; - DELAY(2); /* 20.8us / 13 */ + if (agg_codec_wait4idle(ess)) { + /* Timed out. No read performed. */ + device_printf(ess->dev, "agg_rdcodec() PROGLESS timed out.\n"); + return -1; } - if (t == 20) - device_printf(ess->dev, "agg_rdcodec() PROGLESS timed out.\n"); - bus_space_write_1(ess->st, ess->sh, PORT_CODEC_CMD, - CODEC_CMD_READ | regno); - DELAY(21); /* AC97 cycle = 20.8usec */ + AGG_WR(ess, PORT_CODEC_CMD, CODEC_CMD_READ | regno, 1); + /*DELAY(21); * AC97 cycle = 20.8usec */ /* Wait for data retrieve */ - for (t = 0; t < 20; t++) { - if ((bus_space_read_1(ess->st, ess->sh, PORT_CODEC_STAT) - & CODEC_STAT_MASK) == CODEC_STAT_RW_DONE) - break; - DELAY(2); /* 20.8us / 13 */ + if (!agg_codec_wait4idle(ess)) { + ret = AGG_RD(ess, PORT_CODEC_REG, 2); + } else { + /* Timed out. No read performed. */ + device_printf(ess->dev, "agg_rdcodec() RW_DONE timed out.\n"); + ret = -1; } - if (t == 20) - /* Timed out, but perform dummy read. */ - device_printf(ess->dev, "agg_rdcodec() RW_DONE timed out.\n"); - return bus_space_read_2(ess->st, ess->sh, PORT_CODEC_REG); + return ret; } -static int -agg_wrcodec(kobj_t obj, void *sc, int regno, u_int32_t data) +static inline int +agg_wrcodec(struct agg_info *ess, int regno, u_int32_t data) { - unsigned t; - struct agg_info *ess = sc; - /* We have to wait for a SAFE time to write addr/data */ - for (t = 0; t < 20; t++) { - if ((bus_space_read_1(ess->st, ess->sh, PORT_CODEC_STAT) - & CODEC_STAT_MASK) != CODEC_STAT_PROGLESS) - break; - DELAY(2); /* 20.8us / 13 */ - } - if (t == 20) { + if (agg_codec_wait4idle(ess)) { /* Timed out. Abort writing. */ device_printf(ess->dev, "agg_wrcodec() PROGLESS timed out.\n"); return -1; } - bus_space_write_2(ess->st, ess->sh, PORT_CODEC_REG, data); - bus_space_write_1(ess->st, ess->sh, PORT_CODEC_CMD, - CODEC_CMD_WRITE | regno); + AGG_WR(ess, PORT_CODEC_REG, data, 2); + AGG_WR(ess, PORT_CODEC_CMD, CODEC_CMD_WRITE | regno, 1); + + /* Wait for write completion */ + if (agg_codec_wait4idle(ess)) { + /* Timed out. */ + device_printf(ess->dev, "agg_wrcodec() RW_DONE timed out.\n"); + return -1; + } return 0; } -static kobj_method_t agg_ac97_methods[] = { - KOBJMETHOD(ac97_init, agg_ac97_init), - KOBJMETHOD(ac97_read, agg_rdcodec), - KOBJMETHOD(ac97_write, agg_wrcodec), - { 0, 0 } -}; -AC97_DECLARE(agg_ac97); - -/* -------------------------------------------------------------------- */ - static inline void ringbus_setdest(struct agg_info *ess, int src, int dest) { u_int32_t data; - data = bus_space_read_4(ess->st, ess->sh, PORT_RINGBUS_CTRL); + data = AGG_RD(ess, PORT_RINGBUS_CTRL, 4); data &= ~(0xfU << src); data |= (0xfU & dest) << src; - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, data); + AGG_WR(ess, PORT_RINGBUS_CTRL, data, 4); } +/* -------------------------------------------------------------------- */ + /* Wave Processor */ static inline u_int16_t wp_rdreg(struct agg_info *ess, u_int16_t reg) { - bus_space_write_2(ess->st, ess->sh, PORT_DSP_INDEX, reg); - return bus_space_read_2(ess->st, ess->sh, PORT_DSP_DATA); + AGG_WR(ess, PORT_DSP_INDEX, reg, 2); + return AGG_RD(ess, PORT_DSP_DATA, 2); } static inline void wp_wrreg(struct agg_info *ess, u_int16_t reg, u_int16_t data) { - bus_space_write_2(ess->st, ess->sh, PORT_DSP_INDEX, reg); - bus_space_write_2(ess->st, ess->sh, PORT_DSP_DATA, data); + AGG_WR(ess, PORT_DSP_INDEX, reg, 2); + AGG_WR(ess, PORT_DSP_DATA, data, 2); } -static inline void -apu_setindex(struct agg_info *ess, u_int16_t reg) +static inline int +wp_wait_data(struct agg_info *ess, u_int16_t data) { - int t; + unsigned t = 0; - wp_wrreg(ess, WPREG_CRAM_PTR, reg); - /* Sometimes WP fails to set apu register index. */ - for (t = 0; t < 1000; t++) { - if (bus_space_read_2(ess->st, ess->sh, PORT_DSP_DATA) == reg) - break; - bus_space_write_2(ess->st, ess->sh, PORT_DSP_DATA, reg); + while (AGG_RD(ess, PORT_DSP_DATA, 2) != data) { + if (++t == 1000) { + return EAGAIN; + } + AGG_WR(ess, PORT_DSP_DATA, data, 2); } - if (t == 1000) - device_printf(ess->dev, "apu_setindex() timed out.\n"); + + return 0; } static inline u_int16_t -wp_rdapu(struct agg_info *ess, int ch, u_int16_t reg) +wp_rdapu(struct agg_info *ess, unsigned ch, u_int16_t reg) { - u_int16_t ret; + wp_wrreg(ess, WPREG_CRAM_PTR, reg | (ch << 4)); + if (wp_wait_data(ess, reg | (ch << 4)) != 0) + device_printf(ess->dev, "wp_rdapu() indexing timed out.\n"); + return wp_rdreg(ess, WPREG_DATA_PORT); +} - apu_setindex(ess, ((unsigned)ch << 4) + reg); - ret = wp_rdreg(ess, WPREG_DATA_PORT); - return ret; +static inline void +wp_wrapu(struct agg_info *ess, unsigned ch, u_int16_t reg, u_int16_t data) +{ + wp_wrreg(ess, WPREG_CRAM_PTR, reg | (ch << 4)); + if (wp_wait_data(ess, reg | (ch << 4)) == 0) { + wp_wrreg(ess, WPREG_DATA_PORT, data); + if (wp_wait_data(ess, data) != 0) + device_printf(ess->dev, "wp_wrapu() write timed out.\n"); + } else { + device_printf(ess->dev, "wp_wrapu() indexing timed out.\n"); + } } static inline void -wp_wrapu(struct agg_info *ess, int ch, u_int16_t reg, u_int16_t data) +apu_setparam(struct agg_info *ess, int apuch, + u_int32_t wpwa, u_int16_t size, int16_t pan, u_int dv) { - int t; - - apu_setindex(ess, ((unsigned)ch << 4) + reg); - wp_wrreg(ess, WPREG_DATA_PORT, data); - for (t = 0; t < 1000; t++) { - if (bus_space_read_2(ess->st, ess->sh, PORT_DSP_DATA) == data) - break; - bus_space_write_2(ess->st, ess->sh, PORT_DSP_DATA, data); - } - if (t == 1000) - device_printf(ess->dev, "wp_wrapu() timed out.\n"); + wp_wrapu(ess, apuch, APUREG_WAVESPACE, (wpwa >> 8) & APU_64KPAGE_MASK); + wp_wrapu(ess, apuch, APUREG_CURPTR, wpwa); + wp_wrapu(ess, apuch, APUREG_ENDPTR, wpwa + size); + wp_wrapu(ess, apuch, APUREG_LOOPLEN, size); + wp_wrapu(ess, apuch, APUREG_ROUTING, 0); + wp_wrapu(ess, apuch, APUREG_AMPLITUDE, 0xf000); + wp_wrapu(ess, apuch, APUREG_POSITION, 0x8f00 + | (APU_RADIUS_MASK & (RADIUS_CENTERCIRCLE << APU_RADIUS_SHIFT)) + | (APU_PAN_MASK & ((pan + PAN_FRONT) << APU_PAN_SHIFT))); + wp_wrapu(ess, apuch, APUREG_FREQ_LOBYTE, + APU_plus6dB | ((dv & 0xff) << APU_FREQ_LOBYTE_SHIFT)); + wp_wrapu(ess, apuch, APUREG_FREQ_HIWORD, dv >> 8); } static inline void -wp_settimer(struct agg_info *ess, u_int freq) +wp_settimer(struct agg_info *ess, u_int divide) { - u_int clock = 48000 << 2; - u_int prescale = 0, divide = (freq != 0) ? (clock / freq) : ~0; + u_int prescale = 0; - RANGE(divide, 4, 32 << 8); + RANGE(divide, 2, 32 << 7); - for (; divide > 32 << 1; divide >>= 1) + for (; divide > 32; divide >>= 1) { prescale++; - divide = (divide + 1) >> 1; + divide++; + } for (; prescale < 7 && divide > 2 && !(divide & 1); divide >>= 1) prescale++; wp_wrreg(ess, WPREG_TIMER_ENABLE, 0); - wp_wrreg(ess, WPREG_TIMER_FREQ, + wp_wrreg(ess, WPREG_TIMER_FREQ, 0x9000 | (prescale << WP_TIMER_FREQ_PRESCALE_SHIFT) | (divide - 1)); wp_wrreg(ess, WPREG_TIMER_ENABLE, 1); } @@ -335,30 +514,37 @@ static inline void wp_starttimer(struct agg_info *ess) { + AGG_WR(ess, PORT_INT_STAT, 1, 2); + AGG_WR(ess, PORT_HOSTINT_CTRL, HOSTINT_CTRL_DSOUND_INT_ENABLED + | AGG_RD(ess, PORT_HOSTINT_CTRL, 2), 2); wp_wrreg(ess, WPREG_TIMER_START, 1); } static inline void wp_stoptimer(struct agg_info *ess) { + AGG_WR(ess, PORT_HOSTINT_CTRL, ~HOSTINT_CTRL_DSOUND_INT_ENABLED + & AGG_RD(ess, PORT_HOSTINT_CTRL, 2), 2); + AGG_WR(ess, PORT_INT_STAT, 1, 2); wp_wrreg(ess, WPREG_TIMER_START, 0); - bus_space_write_2(ess->st, ess->sh, PORT_INT_STAT, 1); } +/* -------------------------------------------------------------------- */ + /* WaveCache */ static inline u_int16_t wc_rdreg(struct agg_info *ess, u_int16_t reg) { - bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_INDEX, reg); - return bus_space_read_2(ess->st, ess->sh, PORT_WAVCACHE_DATA); + AGG_WR(ess, PORT_WAVCACHE_INDEX, reg, 2); + return AGG_RD(ess, PORT_WAVCACHE_DATA, 2); } static inline void wc_wrreg(struct agg_info *ess, u_int16_t reg, u_int16_t data) { - bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_INDEX, reg); - bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_DATA, data); + AGG_WR(ess, PORT_WAVCACHE_INDEX, reg, 2); + AGG_WR(ess, PORT_WAVCACHE_DATA, data, 2); } static inline u_int16_t @@ -373,16 +559,26 @@ wc_wrreg(ess, ch << 3, data); } +/* -------------------------------------------------------------------- */ + /* Power management */ - static inline void -agg_power(struct agg_info *ess, int status) +agg_stopclock(struct agg_info *ess, int part, int st) { - u_int8_t data; + u_int32_t data; - data = pci_read_config(ess->dev, CONF_PM_PTR, 1); - if (pci_read_config(ess->dev, data, 1) == PPMI_CID) - pci_write_config(ess->dev, data + PM_CTRL, status, 1); + data = pci_read_config(ess->dev, CONF_ACPI_STOPCLOCK, 4); + if (part < 16) { + if (st == PCI_POWERSTATE_D1) + data &= ~(1 << part); + else + data |= (1 << part); + if (st == PCI_POWERSTATE_D1 || st == PCI_POWERSTATE_D2) + data |= (0x10000 << part); + else + data &= ~(0x10000 << part); + pci_write_config(ess->dev, CONF_ACPI_STOPCLOCK, data, 4); + } } @@ -395,46 +591,38 @@ { u_int16_t data; - if (bus_space_read_4(ess->st, ess->sh, PORT_RINGBUS_CTRL) - & RINGBUS_CTRL_ACLINK_ENABLED) { - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, 0); + if (AGG_RD(ess, PORT_RINGBUS_CTRL, 4) & RINGBUS_CTRL_ACLINK_ENABLED) { + AGG_WR(ess, PORT_RINGBUS_CTRL, 0, 4); DELAY(104); /* 20.8us * (4 + 1) */ } /* XXX - 2nd codec should be looked at. */ - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, - RINGBUS_CTRL_AC97_SWRESET); + AGG_WR(ess, PORT_RINGBUS_CTRL, RINGBUS_CTRL_AC97_SWRESET, 4); DELAY(2); - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, - RINGBUS_CTRL_ACLINK_ENABLED); - DELAY(21); + AGG_WR(ess, PORT_RINGBUS_CTRL, RINGBUS_CTRL_ACLINK_ENABLED, 4); + DELAY(50); - agg_rdcodec(NULL, ess, 0); - if (bus_space_read_1(ess->st, ess->sh, PORT_CODEC_STAT) - & CODEC_STAT_MASK) { - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, 0); + if (agg_rdcodec(ess, 0) < 0) { + AGG_WR(ess, PORT_RINGBUS_CTRL, 0, 4); DELAY(21); /* Try cold reset. */ device_printf(ess->dev, "will perform cold reset.\n"); - data = bus_space_read_2(ess->st, ess->sh, PORT_GPIO_DIR); + data = AGG_RD(ess, PORT_GPIO_DIR, 2); if (pci_read_config(ess->dev, 0x58, 2) & 1) data |= 0x10; - data |= 0x009 & - ~bus_space_read_2(ess->st, ess->sh, PORT_GPIO_DATA); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_MASK, 0xff6); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DIR, - data | 0x009); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DATA, 0x000); + data |= 0x009 & ~AGG_RD(ess, PORT_GPIO_DATA, 2); + AGG_WR(ess, PORT_GPIO_MASK, 0xff6, 2); + AGG_WR(ess, PORT_GPIO_DIR, data | 0x009, 2); + AGG_WR(ess, PORT_GPIO_DATA, 0x000, 2); DELAY(2); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DATA, 0x001); + AGG_WR(ess, PORT_GPIO_DATA, 0x001, 2); DELAY(1); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DATA, 0x009); - DELAY(500000); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DIR, data); + AGG_WR(ess, PORT_GPIO_DATA, 0x009, 2); + agg_sleep(ess, "agginicd", 500); + AGG_WR(ess, PORT_GPIO_DIR, data, 2); DELAY(84); /* 20.8us * 4 */ - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, - RINGBUS_CTRL_ACLINK_ENABLED); - DELAY(21); + AGG_WR(ess, PORT_RINGBUS_CTRL, RINGBUS_CTRL_ACLINK_ENABLED, 4); + DELAY(50); } } @@ -455,47 +643,93 @@ * Prefer PCI timing rather than that of ISA. * Don't swap L/R. */ data = pci_read_config(ess->dev, CONF_MAESTRO, 4); + data |= MAESTRO_PMC; data |= MAESTRO_CHIBUS | MAESTRO_POSTEDWRITE | MAESTRO_DMA_PCITIMING; data &= ~MAESTRO_SWAP_LR; pci_write_config(ess->dev, CONF_MAESTRO, data, 4); + /* Turn off unused parts if necessary. */ + /* consult CONF_MAESTRO. */ + if (data & MAESTRO_SPDIF) + agg_stopclock(ess, ACPI_PART_SPDIF, PCI_POWERSTATE_D2); + else + agg_stopclock(ess, ACPI_PART_SPDIF, PCI_POWERSTATE_D1); + if (data & MAESTRO_HWVOL) + agg_stopclock(ess, ACPI_PART_HW_VOL, PCI_POWERSTATE_D3); + else + agg_stopclock(ess, ACPI_PART_HW_VOL, PCI_POWERSTATE_D1); + + /* parts that never be used */ + agg_stopclock(ess, ACPI_PART_978, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_DAA, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_GPIO, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_SB, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_FM, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_MIDI, PCI_POWERSTATE_D1); + agg_stopclock(ess, ACPI_PART_GAME_PORT, PCI_POWERSTATE_D1); + + /* parts that will be used only when play/recording */ + agg_stopclock(ess, ACPI_PART_WP, PCI_POWERSTATE_D2); + + /* parts that should always be turned on */ + agg_stopclock(ess, ACPI_PART_CODEC_CLOCK, PCI_POWERSTATE_D3); + agg_stopclock(ess, ACPI_PART_GLUE, PCI_POWERSTATE_D3); + agg_stopclock(ess, ACPI_PART_PCI_IF, PCI_POWERSTATE_D3); + agg_stopclock(ess, ACPI_PART_RINGBUS, PCI_POWERSTATE_D3); + /* Reset direct sound. */ - bus_space_write_2(ess->st, ess->sh, PORT_HOSTINT_CTRL, - HOSTINT_CTRL_DSOUND_RESET); - DELAY(10000); /* XXX - too long? */ - bus_space_write_2(ess->st, ess->sh, PORT_HOSTINT_CTRL, 0); - DELAY(10000); + AGG_WR(ess, PORT_HOSTINT_CTRL, HOSTINT_CTRL_SOFT_RESET, 2); + DELAY(100); + AGG_WR(ess, PORT_HOSTINT_CTRL, 0, 2); + DELAY(100); + AGG_WR(ess, PORT_HOSTINT_CTRL, HOSTINT_CTRL_DSOUND_RESET, 2); + DELAY(100); + AGG_WR(ess, PORT_HOSTINT_CTRL, 0, 2); + DELAY(100); - /* Enable direct sound interruption and hardware volume control. */ - bus_space_write_2(ess->st, ess->sh, PORT_HOSTINT_CTRL, - HOSTINT_CTRL_DSOUND_INT_ENABLED | HOSTINT_CTRL_HWVOL_ENABLED); + /* Enable hardware volume control interruption. */ + if (data & MAESTRO_HWVOL) /* XXX - why not use device flags? */ + AGG_WR(ess, PORT_HOSTINT_CTRL,HOSTINT_CTRL_HWVOL_ENABLED, 2); /* Setup Wave Processor. */ /* Enable WaveCache, set DMA base address. */ wp_wrreg(ess, WPREG_WAVE_ROMRAM, WP_WAVE_VIRTUAL_ENABLED | WP_WAVE_DRAM_ENABLED); - bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_CTRL, - WAVCACHE_ENABLED | WAVCACHE_WTSIZE_4MB); + wp_wrreg(ess, WPREG_CRAM_DATA, 0); + + AGG_WR(ess, PORT_WAVCACHE_CTRL, + WAVCACHE_ENABLED | WAVCACHE_WTSIZE_2MB | WAVCACHE_SGC_32_47, 2); for (data = WAVCACHE_PCMBAR; data < WAVCACHE_PCMBAR + 4; data++) - wc_wrreg(ess, data, ess->baseaddr >> WAVCACHE_BASEADDR_SHIFT); + wc_wrreg(ess, data, ess->phys >> WAVCACHE_BASEADDR_SHIFT); /* Setup Codec/Ringbus. */ agg_initcodec(ess); - bus_space_write_4(ess->st, ess->sh, PORT_RINGBUS_CTRL, - RINGBUS_CTRL_RINGBUS_ENABLED | RINGBUS_CTRL_ACLINK_ENABLED); + AGG_WR(ess, PORT_RINGBUS_CTRL, + RINGBUS_CTRL_RINGBUS_ENABLED | RINGBUS_CTRL_ACLINK_ENABLED, 4); - wp_wrreg(ess, WPREG_BASE, 0x8500); /* Parallel I/O */ + wp_wrreg(ess, 0x08, 0xB004); + wp_wrreg(ess, 0x09, 0x001B); + wp_wrreg(ess, 0x0A, 0x8000); + wp_wrreg(ess, 0x0B, 0x3F37); + wp_wrreg(ess, WPREG_BASE, 0x8598); /* Parallel I/O */ + wp_wrreg(ess, WPREG_BASE + 1, 0x7632); ringbus_setdest(ess, RINGBUS_SRC_ADC, RINGBUS_DEST_STEREO | RINGBUS_DEST_DSOUND_IN); ringbus_setdest(ess, RINGBUS_SRC_DSOUND, RINGBUS_DEST_STEREO | RINGBUS_DEST_DAC); + /* Enable S/PDIF if necessary. */ + if (pci_read_config(ess->dev, CONF_MAESTRO, 4) & MAESTRO_SPDIF) + /* XXX - why not use device flags? */ + AGG_WR(ess, PORT_RINGBUS_CTRL_B, RINGBUS_CTRL_SPDIF | + AGG_RD(ess, PORT_RINGBUS_CTRL_B, 1), 1); + /* Setup ASSP. Needed for Dell Inspiron 7500? */ - bus_space_write_1(ess->st, ess->sh, PORT_ASSP_CTRL_B, 0x00); - bus_space_write_1(ess->st, ess->sh, PORT_ASSP_CTRL_A, 0x03); - bus_space_write_1(ess->st, ess->sh, PORT_ASSP_CTRL_C, 0x00); + AGG_WR(ess, PORT_ASSP_CTRL_B, 0x00, 1); + AGG_WR(ess, PORT_ASSP_CTRL_A, 0x03, 1); + AGG_WR(ess, PORT_ASSP_CTRL_C, 0x00, 1); /* * Setup GPIO. @@ -507,84 +741,400 @@ case NEC_SUBID2: /* Matthew Braithwaite reported that * NEC Versa LX doesn't need GPIO operation. */ - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_MASK, 0x9ff); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DIR, - bus_space_read_2(ess->st, ess->sh, PORT_GPIO_DIR) | 0x600); - bus_space_write_2(ess->st, ess->sh, PORT_GPIO_DATA, 0x200); + AGG_WR(ess, PORT_GPIO_MASK, 0x9ff, 2); + AGG_WR(ess, PORT_GPIO_DIR, + AGG_RD(ess, PORT_GPIO_DIR, 2) | 0x600, 2); + AGG_WR(ess, PORT_GPIO_DATA, 0x200, 2); + break; + } +} + +/* Deals power state transition. Must be called with softc->lock held. */ +static void +agg_power(struct agg_info *ess, int status) +{ + u_int8_t lastpwr; + + lastpwr = ess->curpwr; + if (lastpwr == status) + return; + + switch (status) { + case PCI_POWERSTATE_D0: + case PCI_POWERSTATE_D1: + switch (lastpwr) { + case PCI_POWERSTATE_D2: + pci_set_powerstate(ess->dev, status); + /* Turn on PCM-related parts. */ + agg_wrcodec(ess, AC97_REG_POWER, 0); + DELAY(100); +#if 0 + if ((agg_rdcodec(ess, AC97_REG_POWER) & 3) != 3) + device_printf(ess->dev, "warning: codec not ready.\n"); +#endif + AGG_WR(ess, PORT_RINGBUS_CTRL, + (AGG_RD(ess, PORT_RINGBUS_CTRL, 4) + & ~RINGBUS_CTRL_ACLINK_ENABLED) + | RINGBUS_CTRL_RINGBUS_ENABLED, 4); + DELAY(50); + AGG_WR(ess, PORT_RINGBUS_CTRL, + AGG_RD(ess, PORT_RINGBUS_CTRL, 4) + | RINGBUS_CTRL_ACLINK_ENABLED, 4); + break; + case PCI_POWERSTATE_D3: + /* Initialize. */ + pci_set_powerstate(ess->dev, PCI_POWERSTATE_D0); + DELAY(100); + agg_init(ess); + /* FALLTHROUGH */ + case PCI_POWERSTATE_D0: + case PCI_POWERSTATE_D1: + pci_set_powerstate(ess->dev, status); + break; + } + break; + case PCI_POWERSTATE_D2: + switch (lastpwr) { + case PCI_POWERSTATE_D3: + /* Initialize. */ + pci_set_powerstate(ess->dev, PCI_POWERSTATE_D0); + DELAY(100); + agg_init(ess); + /* FALLTHROUGH */ + case PCI_POWERSTATE_D0: + case PCI_POWERSTATE_D1: + /* Turn off PCM-related parts. */ + AGG_WR(ess, PORT_RINGBUS_CTRL, + AGG_RD(ess, PORT_RINGBUS_CTRL, 4) + & ~RINGBUS_CTRL_RINGBUS_ENABLED, 4); + DELAY(100); + agg_wrcodec(ess, AC97_REG_POWER, 0x300); + DELAY(100); + break; + } + pci_set_powerstate(ess->dev, status); + break; + case PCI_POWERSTATE_D3: + /* Entirely power down. */ + agg_wrcodec(ess, AC97_REG_POWER, 0xdf00); + DELAY(100); + AGG_WR(ess, PORT_RINGBUS_CTRL, 0, 4); + /*DELAY(1);*/ + if (lastpwr != PCI_POWERSTATE_D2) + wp_stoptimer(ess); + AGG_WR(ess, PORT_HOSTINT_CTRL, 0, 2); + AGG_WR(ess, PORT_HOSTINT_STAT, 0xff, 1); + pci_set_powerstate(ess->dev, status); + break; + default: + /* Invalid power state; let it ignored. */ + status = lastpwr; break; } + + ess->curpwr = status; } +/* -------------------------------------------------------------------- */ + /* Channel controller. */ static void aggch_start_dac(struct agg_chinfo *ch) { - bus_addr_t wpwa = APU_USE_SYSMEM | (ch->offset >> 9); - u_int size = ch->parent->bufsz >> 1; - u_int speed = ch->speed; - bus_addr_t offset = ch->offset >> 1; - u_int cp = 0; - u_int16_t apuch = ch->num << 1; - u_int dv; - int pan = 0; + bus_addr_t wpwa; + u_int32_t speed; + u_int16_t size, apuch, wtbar, wcreg, aputype; + u_int dv; + int pan; + + speed = ch->speed; + wpwa = (ch->phys - ch->base) >> 1; + wtbar = 0xc & (wpwa >> WPWA_WTBAR_SHIFT(2)); + wcreg = (ch->phys - 16) & WAVCACHE_CHCTL_ADDRTAG_MASK; + size = ch->buflen; + apuch = (ch->num << 1) | 32; + pan = PAN_RIGHT - PAN_FRONT; - switch (ch->aputype) { - case APUTYPE_16BITSTEREO: - wpwa >>= 1; - size >>= 1; - offset >>= 1; - cp >>= 1; - /* FALLTHROUGH */ - case APUTYPE_8BITSTEREO: - pan = 8; - apuch++; - break; - case APUTYPE_8BITLINEAR: - speed >>= 1; - break; + if (ch->stereo) { + wcreg |= WAVCACHE_CHCTL_STEREO; + if (ch->qs16) { + aputype = APUTYPE_16BITSTEREO; + wpwa >>= 1; + size >>= 1; + pan = -pan; + } else + aputype = APUTYPE_8BITSTEREO; + } else { + pan = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 08:02:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B63A316A4D0; Wed, 10 Nov 2004 08:02:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8936116A4CE for ; Wed, 10 Nov 2004 08:02:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F6C443D41 for ; Wed, 10 Nov 2004 08:02:42 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAA82g8X094473 for ; Wed, 10 Nov 2004 08:02:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAA82fuf094470 for perforce@freebsd.org; Wed, 10 Nov 2004 08:02:41 GMT (envelope-from marcel@freebsd.org) Date: Wed, 10 Nov 2004 08:02:41 GMT Message-Id: <200411100802.iAA82fuf094470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 08:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=64792 Change 64792 by marcel@marcel_nfs on 2004/11/10 08:02:21 IFC @64790 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#10 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#9 integrate .. //depot/projects/uart/alpha/conf/GENERIC#6 integrate .. //depot/projects/uart/alpha/conf/NOTES#5 integrate .. //depot/projects/uart/alpha/include/pcpu.h#2 integrate .. //depot/projects/uart/alpha/include/smp.h#2 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/uart/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/uart/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/uart/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/uart/arm/arm/blockio.S#2 integrate .. //depot/projects/uart/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/uart/arm/arm/copystr.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/uart/arm/arm/critical.c#2 integrate .. //depot/projects/uart/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/uart/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/uart/arm/arm/fusu.S#2 integrate .. //depot/projects/uart/arm/arm/identcpu.c#2 integrate .. //depot/projects/uart/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/uart/arm/arm/locore.S#2 integrate .. //depot/projects/uart/arm/arm/machdep.c#2 integrate .. //depot/projects/uart/arm/arm/mem.c#1 branch .. //depot/projects/uart/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/uart/arm/arm/pmap.c#2 integrate .. //depot/projects/uart/arm/arm/setcpsr.S#2 integrate .. //depot/projects/uart/arm/arm/support.S#2 integrate .. //depot/projects/uart/arm/arm/swtch.S#2 integrate .. //depot/projects/uart/arm/arm/trap.c#2 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/uart/arm/conf/IQ31244#3 integrate .. //depot/projects/uart/arm/conf/SIMICS#3 integrate .. //depot/projects/uart/arm/include/asm.h#2 integrate .. //depot/projects/uart/arm/include/atomic.h#2 integrate .. //depot/projects/uart/arm/include/cpu.h#2 integrate .. //depot/projects/uart/arm/include/cpuconf.h#2 integrate .. //depot/projects/uart/arm/include/cpufunc.h#2 integrate .. //depot/projects/uart/arm/include/endian.h#4 integrate .. //depot/projects/uart/arm/include/memdev.h#1 branch .. //depot/projects/uart/arm/include/param.h#3 integrate .. //depot/projects/uart/arm/include/pcpu.h#2 integrate .. //depot/projects/uart/arm/include/pmap.h#2 integrate .. //depot/projects/uart/arm/include/reg.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/uart/boot/forth/loader.conf#4 integrate .. //depot/projects/uart/boot/forth/loader.conf.5#3 integrate .. //depot/projects/uart/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/uart/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/uart/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/uart/conf/NOTES#19 integrate .. //depot/projects/uart/conf/files#32 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/uart/dev/ata/ata-card.c#6 integrate .. //depot/projects/uart/dev/bge/if_bge.c#13 integrate .. //depot/projects/uart/dev/fdc/fdc.c#4 integrate .. //depot/projects/uart/dev/firewire/fwmem.c#6 integrate .. //depot/projects/uart/dev/gx/if_gx.c#5 delete .. //depot/projects/uart/dev/gx/if_gxreg.h#2 delete .. //depot/projects/uart/dev/gx/if_gxvar.h#2 delete .. //depot/projects/uart/dev/lge/if_lge.c#6 integrate .. //depot/projects/uart/dev/md/md.c#7 integrate .. //depot/projects/uart/dev/nge/if_nge.c#6 integrate .. //depot/projects/uart/dev/pci/pci.c#14 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/uart/dev/snp/snp.c#4 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/uart/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/uart/dev/usb/ehci.c#6 integrate .. //depot/projects/uart/dev/usb/ohci.c#7 integrate .. //depot/projects/uart/dev/usb/uhci.c#8 integrate .. //depot/projects/uart/dev/usb/uhub.c#7 integrate .. //depot/projects/uart/dev/usb/umass.c#8 integrate .. //depot/projects/uart/dev/usb/usb_port.h#7 integrate .. //depot/projects/uart/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/uart/dev/vinum/makestatetext#2 delete .. //depot/projects/uart/dev/vinum/request.h#2 delete .. //depot/projects/uart/dev/vinum/statetexts.h#2 delete .. //depot/projects/uart/dev/vinum/vinum.c#4 delete .. //depot/projects/uart/dev/vinum/vinumconfig.c#6 delete .. //depot/projects/uart/dev/vinum/vinumdaemon.c#3 delete .. //depot/projects/uart/dev/vinum/vinumext.h#3 delete .. //depot/projects/uart/dev/vinum/vinumhdr.h#3 delete .. //depot/projects/uart/dev/vinum/vinuminterrupt.c#4 delete .. //depot/projects/uart/dev/vinum/vinumio.c#4 delete .. //depot/projects/uart/dev/vinum/vinumio.h#2 delete .. //depot/projects/uart/dev/vinum/vinumioctl.c#4 delete .. //depot/projects/uart/dev/vinum/vinumkw.h#2 delete .. //depot/projects/uart/dev/vinum/vinumlock.c#3 delete .. //depot/projects/uart/dev/vinum/vinummemory.c#4 delete .. //depot/projects/uart/dev/vinum/vinumobj.h#3 delete .. //depot/projects/uart/dev/vinum/vinumparser.c#3 delete .. //depot/projects/uart/dev/vinum/vinumraid5.c#3 delete .. //depot/projects/uart/dev/vinum/vinumrequest.c#5 delete .. //depot/projects/uart/dev/vinum/vinumrevive.c#5 delete .. //depot/projects/uart/dev/vinum/vinumstate.c#3 delete .. //depot/projects/uart/dev/vinum/vinumstate.h#2 delete .. //depot/projects/uart/dev/vinum/vinumutil.c#4 delete .. //depot/projects/uart/dev/vinum/vinumutil.h#2 delete .. //depot/projects/uart/dev/vinum/vinumvar.h#4 delete .. //depot/projects/uart/fs/autofs/autofs_vfsops.c#2 integrate .. //depot/projects/uart/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/uart/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/uart/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/uart/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/uart/geom/geom.h#7 integrate .. //depot/projects/uart/geom/geom_event.c#4 integrate .. //depot/projects/uart/geom/geom_vfs.c#2 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/uart/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/uart/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/uart/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/uart/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/uart/i386/include/sysarch.h#4 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/uart/kern/init_main.c#7 integrate .. //depot/projects/uart/kern/kern_descrip.c#9 integrate .. //depot/projects/uart/kern/kern_environment.c#4 integrate .. //depot/projects/uart/kern/kern_exec.c#7 integrate .. //depot/projects/uart/kern/kern_fork.c#6 integrate .. //depot/projects/uart/kern/kern_intr.c#5 integrate .. //depot/projects/uart/kern/kern_mac.c#8 integrate .. //depot/projects/uart/kern/kern_physio.c#6 integrate .. //depot/projects/uart/kern/kern_shutdown.c#4 integrate .. //depot/projects/uart/kern/kern_subr.c#5 integrate .. //depot/projects/uart/kern/kern_switch.c#4 integrate .. //depot/projects/uart/kern/kern_thread.c#12 integrate .. //depot/projects/uart/kern/subr_param.c#6 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/uart/kern/subr_witness.c#7 integrate .. //depot/projects/uart/kern/sys_pipe.c#12 integrate .. //depot/projects/uart/kern/uipc_cow.c#3 integrate .. //depot/projects/uart/kern/uipc_domain.c#5 integrate .. //depot/projects/uart/kern/uipc_socket.c#7 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#7 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#3 integrate .. //depot/projects/uart/kern/vfs_aio.c#5 integrate .. //depot/projects/uart/kern/vfs_bio.c#12 integrate .. //depot/projects/uart/kern/vfs_cluster.c#7 integrate .. //depot/projects/uart/kern/vfs_default.c#5 integrate .. //depot/projects/uart/kern/vfs_mount.c#6 integrate .. //depot/projects/uart/kern/vfs_subr.c#9 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#8 integrate .. //depot/projects/uart/kern/vfs_vnops.c#6 integrate .. //depot/projects/uart/libkern/arm/divsi3.S#2 integrate .. //depot/projects/uart/libkern/arm/ffs.S#2 integrate .. //depot/projects/uart/modules/Makefile#12 integrate .. //depot/projects/uart/modules/gx/Makefile#2 delete .. //depot/projects/uart/modules/vinum/Makefile#2 delete .. //depot/projects/uart/net/if_ppp.c#3 integrate .. //depot/projects/uart/net/if_pppvar.h#2 integrate .. //depot/projects/uart/net/if_sl.c#3 integrate .. //depot/projects/uart/net/if_var.h#5 integrate .. //depot/projects/uart/net/ppp_tty.c#3 integrate .. //depot/projects/uart/net/raw_usrreq.c#4 integrate .. //depot/projects/uart/net/rtsock.c#4 integrate .. //depot/projects/uart/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/uart/netatm/atm_aal5.c#3 integrate .. //depot/projects/uart/netatm/atm_usrreq.c#4 integrate .. //depot/projects/uart/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/uart/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/uart/netgraph/ng_base.c#4 integrate .. //depot/projects/uart/netgraph/ng_socket.c#3 integrate .. //depot/projects/uart/netinet/ip_divert.c#4 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/uart/netinet/raw_ip.c#9 integrate .. //depot/projects/uart/netinet/tcp_input.c#7 integrate .. //depot/projects/uart/netinet/tcp_subr.c#6 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#7 integrate .. //depot/projects/uart/netinet6/ah_core.c#4 integrate .. //depot/projects/uart/netinet6/raw_ip6.c#4 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/uart/netipsec/keysock.c#4 integrate .. //depot/projects/uart/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#4 integrate .. //depot/projects/uart/netkey/key.c#5 integrate .. //depot/projects/uart/netkey/key.h#3 integrate .. //depot/projects/uart/netkey/keydb.h#3 integrate .. //depot/projects/uart/netkey/keysock.c#5 integrate .. //depot/projects/uart/netnatm/natm.c#5 integrate .. //depot/projects/uart/netsmb/smb_dev.c#4 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/uart/pc98/conf/GENERIC#5 integrate .. //depot/projects/uart/pc98/pc98/fd.c#8 integrate .. //depot/projects/uart/pci/if_de.c#4 integrate .. //depot/projects/uart/pci/if_xl.c#11 integrate .. //depot/projects/uart/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/uart/sys/_types.h#3 integrate .. //depot/projects/uart/sys/buf.h#8 integrate .. //depot/projects/uart/sys/conf.h#7 integrate .. //depot/projects/uart/sys/fdcio.h#3 integrate .. //depot/projects/uart/sys/file.h#3 integrate .. //depot/projects/uart/sys/filedesc.h#3 integrate .. //depot/projects/uart/sys/kernel.h#7 integrate .. //depot/projects/uart/sys/ktr.h#3 integrate .. //depot/projects/uart/sys/mac_policy.h#4 integrate .. //depot/projects/uart/sys/mdioctl.h#3 integrate .. //depot/projects/uart/sys/param.h#14 integrate .. //depot/projects/uart/sys/protosw.h#4 integrate .. //depot/projects/uart/sys/resource.h#3 integrate .. //depot/projects/uart/sys/rman.h#3 integrate .. //depot/projects/uart/sys/sf_buf.h#2 integrate .. //depot/projects/uart/sys/syslog.h#3 integrate .. //depot/projects/uart/sys/vnode.h#6 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/uart/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/uart/vm/swap_pager.c#13 integrate .. //depot/projects/uart/vm/uma_core.c#13 integrate .. //depot/projects/uart/vm/vm_object.c#10 integrate .. //depot/projects/uart/vm/vm_object.h#4 integrate .. //depot/projects/uart/vm/vm_pageout.c#13 integrate .. //depot/projects/uart/vm/vm_pager.c#5 integrate .. //depot/projects/uart/vm/vm_pager.h#5 integrate .. //depot/projects/uart/vm/vm_param.h#3 integrate .. //depot/projects/uart/vm/vm_zeroidle.c#5 integrate .. //depot/projects/uart/vm/vnode_pager.c#9 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#10 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.223 2004/09/05 02:09:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -864,7 +864,8 @@ /* This is not a 'struct user' */ size_t sz = round_page(KSTACK_PAGES * PAGE_SIZE); pcpup = (struct pcpu *) pmap_steal_memory(sz); - pcpu_init(pcpup, alpha_pal_whami(), sz); + pcpu_init(pcpup, 0, sz); + pcpup->pc_pal_id = alpha_pal_whami(); alpha_pal_wrval((u_int64_t) pcpup); PCPU_GET(next_asn) = 1; /* 0 used for proc0 pmap */ PCPU_SET(curthread, &thread0); ==== //depot/projects/uart/alpha/alpha/mp_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.53 2004/11/05 19:16:43 jhb Exp $"); #include "opt_kstack_pages.h" @@ -61,23 +61,23 @@ static struct mtx ap_boot_mtx; -u_int boot_cpu_id; +u_int64_t boot_cpu_id; static void release_aps(void *dummy); static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); -static int smp_send_secondary_command(const char *command, int cpuid); -static int smp_start_secondary(int cpuid); +static int smp_send_secondary_command(const char *command, int pal_id); +static int smp_start_secondary(int pal_id, int cpuid); /* * Communicate with a console running on a secondary processor. * Return 1 on failure. */ static int -smp_send_secondary_command(const char *command, int cpuid) +smp_send_secondary_command(const char *command, int pal_id) { - u_int64_t mask = 1L << cpuid; - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + u_int64_t mask = 1L << pal_id; + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); int i, len; /* @@ -165,7 +165,7 @@ /* * Set flags in our per-CPU slot in the HWRPB. */ - cpu = LOCATE_PCS(hwrpb, PCPU_GET(cpuid)); + cpu = LOCATE_PCS(hwrpb, PCPU_GET(pal_id)); cpu->pcs_flags &= ~PCS_BIP; cpu->pcs_flags |= PCS_RC; alpha_mb(); @@ -216,9 +216,9 @@ } static int -smp_start_secondary(int cpuid) +smp_start_secondary(int pal_id, int cpuid) { - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); struct pcs *bootcpu = LOCATE_PCS(hwrpb, boot_cpu_id); struct alpha_pcb *pcb = (struct alpha_pcb *) cpu->pcs_hwpcb; struct pcpu *pcpu; @@ -226,12 +226,12 @@ size_t sz; if ((cpu->pcs_flags & PCS_PV) == 0) { - printf("smp_start_secondary: cpu %d PALcode invalid\n", cpuid); + printf("smp_start_secondary: cpu %d PALcode invalid\n", pal_id); return 0; } if (bootverbose) - printf("smp_start_secondary: starting cpu %d\n", cpuid); + printf("smp_start_secondary: starting cpu %d\n", pal_id); sz = round_page((UAREA_PAGES + KSTACK_PAGES) * PAGE_SIZE); pcpu = malloc(sz, M_TEMP, M_NOWAIT); @@ -241,6 +241,7 @@ } pcpu_init(pcpu, cpuid, sz); + pcpu->pc_pal_id = pal_id; /* * Copy the idle pcb and setup the address to start executing. @@ -270,7 +271,7 @@ /* * Fire it up and hope for the best. */ - if (!smp_send_secondary_command("START\r\n", cpuid)) { + if (!smp_send_secondary_command("START\r\n", pal_id)) { printf("smp_start_secondary: can't send START command\n"); pcpu_destroy(pcpu); free(pcpu, M_TEMP); @@ -296,7 +297,7 @@ * It worked (I think). */ if (bootverbose) - printf("smp_start_secondary: cpu %d started\n", cpuid); + printf("smp_start_secondary: cpu %d started\n", pal_id); return 1; } @@ -329,16 +330,18 @@ void cpu_mp_setmaxid(void) { - int i; + u_int64_t i; mp_maxid = 0; - for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { - if (i == PCPU_GET(cpuid)) + for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - mp_maxid = i; + mp_maxid++; } + if (mp_maxid > MAXCPU) + mp_maxid = MAXCPU; } int @@ -348,7 +351,7 @@ /* XXX: Need to check for valid platforms here. */ - boot_cpu_id = PCPU_GET(cpuid); + boot_cpu_id = PCPU_GET(pal_id); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); all_cpus = PCPU_GET(cpumask); @@ -358,12 +361,10 @@ /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == PCPU_GET(cpuid)) + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - if (i > MAXCPU) - continue; cpus++; } return (cpus); @@ -372,10 +373,11 @@ void cpu_mp_start(void) { - int i; + int i, cpuid; mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); + cpuid = 1; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { struct pcs *pcsp; @@ -410,22 +412,30 @@ printf("CPU %d disabled by loader.\n", i); continue; } - all_cpus |= (1 << i); - mp_ncpus++; + if (smp_start_secondary(i, cpuid)) { + all_cpus |= (1 << cpuid); + mp_ncpus++; + cpuid++; + } } PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); - - for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == boot_cpu_id) - continue; - if (!CPU_ABSENT(i)) - smp_start_secondary(i); - } } void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + /* List CPUs */ + printf(" cpu0 (BSP): PAL ID: %2lu\n", boot_cpu_id); + for (i = 1; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + MPASS(pc != NULL); + printf(" cpu%d (AP): PAL ID: %2lu\n", i, pc->pc_pal_id); + } } /* @@ -446,8 +456,9 @@ if (pcpu) { atomic_set_64(&pcpu->pc_pending_ipis, ipi); alpha_mb(); - CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", cpuid); - alpha_pal_wripir(cpuid); + CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", + pcpu->pc_pal_id); + alpha_pal_wripir(pcpu->pc_pal_id); } } } @@ -529,8 +540,8 @@ * requests to provide PALcode to secondaries and to start up new * secondaries that are added to the system on the fly. */ - if (PCPU_GET(cpuid) == boot_cpu_id) { - u_int cpuid; + if (PCPU_GET(pal_id) == boot_cpu_id) { + u_int pal_id; u_int64_t txrdy; #ifdef DIAGNOSTIC struct pcs *cpu; @@ -539,18 +550,18 @@ alpha_mb(); while (hwrpb->rpb_txrdy != 0) { - cpuid = ffs(hwrpb->rpb_txrdy) - 1; + pal_id = ffs(hwrpb->rpb_txrdy) - 1; #ifdef DIAGNOSTIC - cpu = LOCATE_PCS(hwrpb, cpuid); + cpu = LOCATE_PCS(hwrpb, pal_id); bcopy(&cpu->pcs_buffer.txbuf, buf, cpu->pcs_buffer.txlen); buf[cpu->pcs_buffer.txlen] = '\0'; - printf("SMP From CPU%d: %s\n", cpuid, buf); + printf("SMP From CPU%d: %s\n", pal_id, buf); #endif do { txrdy = hwrpb->rpb_txrdy; } while (atomic_cmpset_64(&hwrpb->rpb_txrdy, txrdy, - txrdy & ~(1 << cpuid)) == 0); + txrdy & ~(1 << pal_id)) == 0); } } } ==== //depot/projects/uart/alpha/conf/GENERIC#6 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.181 2004/11/09 22:23:34 wilko Exp $ machine alpha cpu EV4 @@ -32,7 +32,6 @@ # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) -options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName options DEC_EB164 # EB164, PC164, PC164LX, PC164SX options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc options DEC_2100_A50 # AlphaStation 200, 250, 255, 400 @@ -41,8 +40,6 @@ options DEC_ST550 # Personal Workstation 433, 500, 600 options DEC_ST6600 # XP1000, DP264, DS20, DS10, family options DEC_1000A # AlphaServer 1000, 1000A, 800 -# TurboLaser support is broken -# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser) options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) ==== //depot/projects/uart/alpha/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.155 2004/08/28 21:47:24 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -27,7 +27,6 @@ # PLATFORM OPTIONS options API_UP1000 # UP1000, UP1100 (Nautilus) -options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName options DEC_EB164 # EB164, PC164, PC164LX, PC164SX options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc options DEC_2100_A50 # AlphaStation 200, 250, 255, 400 @@ -36,8 +35,6 @@ options DEC_ST550 # Personal Workstation 433, 500, 600 options DEC_ST6600 # XP1000, DP264, DS20, DS10, family options DEC_1000A # AlphaServer 1000, 1000A, 800 -# TurboLaser support is broken -# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser) options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) ==== //depot/projects/uart/alpha/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.14 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -34,6 +34,7 @@ #define PCPU_MD_FIELDS \ struct alpha_pcb pc_idlepcb; /* pcb for idling */ \ + u_int64_t pc_pal_id; /* physical CPU ID */ \ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ ==== //depot/projects/uart/alpha/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.6 2001/08/13 22:41:15 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.7 2004/11/05 19:16:44 jhb Exp $ * */ @@ -26,7 +26,7 @@ #ifndef LOCORE -extern u_int boot_cpu_id; +extern u_int64_t boot_cpu_id; void ipi_selected(u_int cpus, u_int64_t ipi); void ipi_all(u_int64_t ipi); ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.58 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.60 2004/11/10 03:49:24 scottl Exp $"); #include #include @@ -33,12 +33,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -50,6 +52,8 @@ #define MAX_BPAGES 512 +struct bounce_zone; + struct bus_dma_tag { bus_dma_tag_t parent; bus_size_t alignment; @@ -67,6 +71,7 @@ bus_dma_lock_t *lockfunc; void *lockfuncarg; bus_dma_segment_t *segments; + struct bounce_zone *bounce_zone; }; struct bounce_page { @@ -79,29 +84,32 @@ int busdma_swi_pending; +struct bounce_zone { + STAILQ_ENTRY(bounce_zone) links; + STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; + int free_bpages; + int reserved_bpages; + int active_bpages; + int total_bounced; + int total_deferred; + bus_size_t alignment; + bus_size_t boundary; + bus_addr_t lowaddr; + char zoneid[8]; + char lowaddrid[20]; + struct sysctl_ctx_list sysctl_tree; + struct sysctl_oid *sysctl_tree_top; +}; + static struct mtx bounce_lock; -static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; -static int free_bpages; -static int reserved_bpages; -static int active_bpages; static int total_bpages; -static int total_bounced; -static int total_deferred; +static int busdma_zonecount; +static STAILQ_HEAD(, bounce_zone) bounce_zone_list; static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters"); -SYSCTL_INT(_hw_busdma, OID_AUTO, free_bpages, CTLFLAG_RD, &free_bpages, 0, - "Free bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, reserved_bpages, CTLFLAG_RD, &reserved_bpages, - 0, "Reserved bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, active_bpages, CTLFLAG_RD, &active_bpages, 0, - "Active bounce pages"); SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0, "Total bounce pages"); -SYSCTL_INT(_hw_busdma, OID_AUTO, total_bounced, CTLFLAG_RD, &total_bounced, 0, - "Total bounce requests"); -SYSCTL_INT(_hw_busdma, OID_AUTO, total_deferred, CTLFLAG_RD, &total_deferred, 0, - "Total bounce requests that were deferred"); struct bus_dmamap { struct bp_list bpages; @@ -120,6 +128,7 @@ static struct bus_dmamap nobounce_dmamap; static void init_bounce_pages(void *dummy); +static struct bounce_zone * alloc_bounce_zone(bus_dma_tag_t dmat); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit); @@ -217,9 +226,13 @@ /* Return a NULL tag on failure */ *dmat = NULL; - newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT); - if (newtag == NULL) + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, + M_ZERO | M_NOWAIT); + if (newtag == NULL) { + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag " + "flags 0x%x error %d", newtag, 0, error); return (ENOMEM); + } newtag->parent = parent; newtag->alignment = alignment; @@ -296,16 +309,26 @@ } else { *dmat = newtag; } + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag flags 0x%x " + "error %d", newtag, (newtag != NULL ? newtag->flags : 0), error); return (error); } int bus_dma_tag_destroy(bus_dma_tag_t dmat) { + bus_dma_tag_t dmat_copy; + int error; + + error = 0; + dmat_copy = dmat; + if (dmat != NULL) { - if (dmat->map_count != 0) - return (EBUSY); + if (dmat->map_count != 0) { + error = EBUSY; + goto out; + } while (dmat != NULL) { bus_dma_tag_t parent; @@ -326,7 +349,10 @@ dmat = NULL; } } - return (0); +out: + CTR2(KTR_BUSDMA, "bus_dma_tag_destroy tag %p error %d", dmat_copy, + error); + return (error); } /* @@ -344,8 +370,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } } /* @@ -355,13 +384,17 @@ */ if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) || dmat->alignment > 1 || dmat->boundary > 0) { + /* Must bounce */ int maxpages; *mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO); - if (*mapp == NULL) + if (*mapp == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } /* Initialize the new map */ STAILQ_INIT(&((*mapp)->bpages)); @@ -400,6 +433,8 @@ } if (error == 0) dmat->map_count++; + CTR3(KTR_BUSDMA, "bus_dmamap_create: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, error); return (error); } @@ -411,11 +446,15 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) { if (map != NULL && map != &nobounce_dmamap) { - if (STAILQ_FIRST(&map->bpages) != NULL) + if (STAILQ_FIRST(&map->bpages) != NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error %d", + dmat, EBUSY); return (EBUSY); + } free(map, M_DEVBUF); } dmat->map_count--; + CTR1(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error 0", dmat); return (0); } @@ -445,8 +484,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag " + "flags 0x%x error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } } if ((dmat->maxsize <= PAGE_SIZE) && @@ -463,8 +505,13 @@ 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); } - if (*vaddr == NULL) + if (*vaddr == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, ENOMEM); return (0); } @@ -487,6 +534,8 @@ else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); } + CTR2(KTR_BUSDMA, "bus_dmamem_free: tag %p flags 0x%x", dmat, + dmat->flags); } /* @@ -495,11 +544,11 @@ * the starting segment on entrace, and the ending segment on exit. * first indicates if this is the first invocation of this function. */ -static int +static __inline int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, - struct thread *td, + pmap_t pmap, int flags, bus_addr_t *lastaddrp, int *segp, @@ -512,23 +561,22 @@ bus_addr_t paddr; int needbounce = 0; int seg; - pmap_t pmap; segs = dmat->segments; if (map == NULL) map = &nobounce_dmamap; - if (td != NULL) - pmap = vmspace_pmap(td->td_proc->p_vmspace); - else - pmap = NULL; - - if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) - || dmat->boundary > 0 || dmat->alignment > 1) - && map != &nobounce_dmamap && map->pagesneeded == 0) { + if ((map != &nobounce_dmamap && map->pagesneeded == 0) + && (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) + || dmat->boundary > 0 || dmat->alignment > 1)) { vm_offset_t vendaddr; + CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " + "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), + dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", + map, &nobounce_dmamap, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -544,10 +592,9 @@ } vaddr += PAGE_SIZE; } + CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } - vaddr = (vm_offset_t)buf; - /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { mtx_lock(&bounce_lock); @@ -571,6 +618,7 @@ mtx_unlock(&bounce_lock); } + vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -658,14 +706,19 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, &nsegs, 1); - if (error == EINPROGRESS) + if (error == EINPROGRESS) { + CTR3(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); + } if (error) (*callback)(callback_arg, dmat->segments, 0, error); else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); + CTR2(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x error 0", + dmat, dmat->flags); return (0); } @@ -711,6 +764,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } + CTR3(KTR_BUSDMA, "bus_dmamap_load_mbuf: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); } @@ -727,17 +782,18 @@ int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; - struct thread *td = NULL; + pmap_t pmap; flags |= BUS_DMA_NOWAIT; resid = uio->uio_resid; iov = uio->uio_iov; if (uio->uio_segflg == UIO_USERSPACE) { - td = uio->uio_td; - KASSERT(td != NULL, + KASSERT(uio->uio_td != NULL, ("bus_dmamap_load_uio: USERSPACE but no proc")); - } + pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); + } else + pmap = NULL; nsegs = 0; error = 0; @@ -754,7 +810,7 @@ if (minlen > 0) { error = _bus_dmamap_load_buffer(dmat, map, addr, minlen, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 09:21:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A3F16A4D0; Wed, 10 Nov 2004 09:21:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A19316A4CE; Wed, 10 Nov 2004 09:21:40 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 068AE43D2F; Wed, 10 Nov 2004 09:21:39 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (harmony.village.org [10.0.0.6]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id iAA9Ig4l059266; Wed, 10 Nov 2004 02:18:46 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Wed, 10 Nov 2004 02:18:44 -0700 (MST) Message-Id: <20041110.021844.34601722.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200411070550.iA75o8Uq060242@repoman.freebsd.org> References: <200411070550.iA75o8Uq060242@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 64481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 09:21:41 -0000 In message: <200411070550.iA75o8Uq060242@repoman.freebsd.org> Marcel Moolenaar writes: : http://perforce.freebsd.org/chv.cgi?CH=64481 : : Change 64481 by marcel@marcel_nfs on 2004/11/07 05:49:23 : : Add resource allocation and release related code. With this, : uart(4) probes as a child of scc(4). Next, IRQ handling so : that we can do something other than wait for the interrupt : storm to pass over... : : + rle->res = malloc(sizeof(struct resource), M_SCC, : + M_WAITOK | M_ZERO); We gotta find a way to put this in fewer drivers, not more... Encoding sizeof struct resource is why you need __RMAN_RESOURCE_VISIBLE, which generally shouldn't be defined. Warner From owner-p4-projects@FreeBSD.ORG Wed Nov 10 12:26:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07F2F16A4CF; Wed, 10 Nov 2004 12:26:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A936C16A4E4 for ; Wed, 10 Nov 2004 12:26:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F4CE43D2F for ; Wed, 10 Nov 2004 12:26:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAACQD4F010353 for ; Wed, 10 Nov 2004 12:26:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAACOlT1010241 for perforce@freebsd.org; Wed, 10 Nov 2004 12:24:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 12:24:47 GMT Message-Id: <200411101224.iAACOlT1010241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 12:26:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=64808 Change 64808 by rwatson@rwatson_tislabs on 2004/11/10 12:23:48 First pass at integrating the trustedbsd_sebsd branch. Quite a bit of follow-up cleanup to do due to large numbers of conflicts; the suser() API was changed to rename the prison/jail flag, and privileges relating to mountpoints were revamped in the main tree. Affected files ... .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/sebsd/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#10 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#10 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/cat/cat.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/chio/chio.1#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/vary.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/args.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.h#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/extern.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/df.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/df.c#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/domainname/domainname.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/echo/echo.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/ed.1#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/expr/expr.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/hostname/hostname.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/kill/kill.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/symlink.7#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/print.c#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/ar_io.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/pax.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/extern.h#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/fmt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/keyword.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/pwd/pwd.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/rcp/rcp.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/echo.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/stty/stty.1#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/test/TEST.README#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/test/test.1#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/AUTHORS#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/BUGS#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/COPYING#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/INSTALL#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/MIRRORS#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/amd/NEWS#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/README#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/README.y2k#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/map.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/bootstrap#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/commit#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/transp/transp_sockets.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/config.guess#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/config.guess.long#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/config.sub#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/configure.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/depcomp#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/install-sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/ltmain.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/missing#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/lostaltmail.in#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/amd/tasks#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/CHANGES#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/DNSSEC#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/FREEBSD-Upgrade#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/INSTALL#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/LICENSE#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/README#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/SUPPORT#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/TODO#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/Version#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/addr/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/addr/addr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dig/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dig/dig.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dnskeygen/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dnskeygen/dnskeygen.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dnsquery/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dnsquery/dnsquery.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/host/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/host/host.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/irpd/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/irpd/irpd.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/irpd/irs-irpd.conf#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/irpd/version.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/mkservdb/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/mkservdb/mkservdb.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-bootconf/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-bootconf/named-bootconf.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-bootconf/test.boot#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-xfer/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-xfer/named-xfer.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_defs.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_dump.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_func.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_glob.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_glue.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_ixfr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_load.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_lookup.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_save.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_sec.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_tsig.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_update.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/named.conf#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/named.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_config.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ctl.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_defs.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_forw.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_func.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_glob.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_glue.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_init.c#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ixfr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_lexer.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_lexer.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_main.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_maint.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ncache.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_notify.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_parser.y#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_parseutil.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_parseutil.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_req.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_resp.c#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_signal.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_sort.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_stats.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_udp.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_update.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_xfr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/pathtemplate.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/test/127.0.0.zone#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/test/localhost.zone#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/test/named.conf#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/test/root.hint#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/version.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/ndc/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/ndc/ndc.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/commands.l#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/debug.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/getinfo.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/list.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/main.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/nslookup.help#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/pathnames.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/res.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/send.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/skip.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/subr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nsupdate/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nsupdate/nsupdate.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/acl.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/address_list.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/comments.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/config.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/controls.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/docdef.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/example.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/include.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/index.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/key.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/logging.html#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/master.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/options.html#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/server.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/trusted-keys.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/zone.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/dig.1#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/dnskeygen.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/dnsquery.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/getaddrinfo.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/gethostbyname.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/getipnodebyname.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/getnameinfo.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/getnetent.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/hesiod.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/host.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/hostname.7#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/inet_cidr.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/irs.conf.5#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/mailaddr.7#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/mkdep.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named-bootconf.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named-xfer.8#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named.8#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named.conf.5#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/ndc.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/nslookup.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/nsupdate.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/resolver.3#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/resolver.5#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/tsig.3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/misc/DynamicUpdate#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/misc/FAQ.1of2#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/misc/FAQ.2of2#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/misc/style.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/inet.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/nameser.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/nameser_compat.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/fd_setsize.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/hesiod.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/irp.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/irs.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/assertions.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/ctl.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/dst.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/eventlib.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/heap.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/irpmarshall.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/list.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/logging.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/misc.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/tree.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/netdb.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/netgroup.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/res_update.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/resolv.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/bsafe_link.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/cylink_link.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/dst_api.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/dst_internal.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/eay_dss_link.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/hmac_link.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/md5.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/md5_dgst.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/md5_locl.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/prandom.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/rsaref_link.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/support.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_addr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_cidr_pton.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_data.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_net_ntop.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_net_pton.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_neta.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_netof.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_network.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/inet_pton.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/inet/nsap_addr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/Makefile.BSD#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_gr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_ho.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_nw.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_pr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_pw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_sv.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gai_strerror.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_gr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_ho.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_ng.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_nw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_pr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_pw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_sv.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getaddrinfo.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getgrent.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getgrent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gethostent.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gethostent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnameinfo.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetent.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetgrent.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetgrent_r.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getprotoent.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getprotoent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getpwent.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getpwent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getservent.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getservent_r.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/hesiod.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/hesiod_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_gr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_ho.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_ng.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_nw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_p.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_pr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_pw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_sv.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irpmarshall.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irs_data.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irs_data.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irs_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_gr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_ho.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_ng.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_nw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_pr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_pw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/lcl_sv.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_gr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_ho.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_ng.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_nw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_pr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_pw.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_sv.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nul_ng.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/pathnames.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/util.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/assertions.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/assertions.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/base64.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/bitncmp.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/bitncmp.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_clnt.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_p.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_srvr.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_connects.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_files.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_streams.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_timers.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_waits.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/eventlib.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/eventlib.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/eventlib_p.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/heap.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/heap.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/hex.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/logging.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/logging.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/logging_p.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/memcluster.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/memcluster.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/movefile.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/tree.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/tree.mdoc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_date.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_name.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_netint.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_parse.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_print.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_samedomain.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_sign.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_ttl.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_verify.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/herror.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_comp.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_data.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_debug.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_debug.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_findzonecut.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_init.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_mkquery.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_mkupdate.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_mkupdate.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_private.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_query.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_send.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_sendsigned.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_update.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/Makefile.set#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/bin/probe_ipv6#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/port_after.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/port_before.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/prand_conf.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/sys/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/noop.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/probe#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/prand_conf/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/prand_conf/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/prand_conf/prand_conf.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/settings#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/systype#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/tests/irs_testclient.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/tests/irs_testirpd.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/tests/irs_testserver.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/tests/test_cidr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind/tests/test_getaddr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/acconfig.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.guess#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3596.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3597.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3645.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3655.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3658.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3833.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3845.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc952.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/install-sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/isc-config.sh.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/aclocal.m4#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/daemon.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/ftruncate.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/gettimeofday.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/mktemp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/putenv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/readv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/setenv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/setitimer.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strdup.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strerror.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strpbrk.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strsep.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/strtoul.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/utimes.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/bsd/writev.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 13:27:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C251916A4D0; Wed, 10 Nov 2004 13:27:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D71016A4CE for ; Wed, 10 Nov 2004 13:27:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A61543D1F for ; Wed, 10 Nov 2004 13:27:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAADRTb7018903 for ; Wed, 10 Nov 2004 13:27:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAADRTXD018900 for perforce@freebsd.org; Wed, 10 Nov 2004 13:27:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 13:27:29 GMT Message-Id: <200411101327.iAADRTXD018900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 13:27:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=64814 Change 64814 by rwatson@rwatson_tislabs on 2004/11/10 13:27:15 The new world order doesn't believe in msg_msg.h. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#32 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#32 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Nov 10 13:28:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 526A216A4D0; Wed, 10 Nov 2004 13:28:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E2C816A4CE for ; Wed, 10 Nov 2004 13:28:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22F7643D53 for ; Wed, 10 Nov 2004 13:28:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAADSV7R018987 for ; Wed, 10 Nov 2004 13:28:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAADSU0P018984 for perforce@freebsd.org; Wed, 10 Nov 2004 13:28:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 13:28:30 GMT Message-Id: <200411101328.iAADSU0P018984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 13:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64815 Change 64815 by rwatson@rwatson_tislabs on 2004/11/10 13:28:11 Typo correction. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#18 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#18 (text+ko) ==== @@ -201,7 +201,7 @@ int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); void mac_create_devfs_device(struct ucred *cr, struct mount *mp, - struct cred *dev, struct devfs_dirent *de, const char *fullpath); + struct ucred *dev, struct devfs_dirent *de, const char *fullpath); void mac_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, const char *fullpath); void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, From owner-p4-projects@FreeBSD.ORG Wed Nov 10 14:43:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCCAF16A4D0; Wed, 10 Nov 2004 14:43:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8691B16A4CE for ; Wed, 10 Nov 2004 14:43:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AFC243D41 for ; Wed, 10 Nov 2004 14:43:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAEh2jR021631 for ; Wed, 10 Nov 2004 14:43:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAEh1lm021625 for perforce@freebsd.org; Wed, 10 Nov 2004 14:43:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 14:43:01 GMT Message-Id: <200411101443.iAAEh1lm021625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 14:43:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64819 Change 64819 by rwatson@rwatson_tislabs on 2004/11/10 14:42:58 Clean up some other suser-related loose ends from the integ: - Remove unneeded thread argument to cap_check_cred() to match suser_cred() API in FreeBSD. - Catch up with event handler changes for device cloning: use struct cdev instead of dev_t. - Replace vfs_suser() with vfs_cap_check(), but use u_int64_t for the cap argument for now due to type issues. We need to revisit this. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/alpha/osf1/osf1_misc.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_misc.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_uid16.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_vnops.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/fs/hpfs/hpfs_vnops.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/fs/msdosfs/msdosfs_vnops.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/fs/smbfs/smbfs_vnops.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/gnu/ext2fs/ext2_vnops.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_acl.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_exec.c#15 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_ktrace.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_resource.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_sysctl.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#15 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_subr.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/raw_ip.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_subr.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/udp_usrreq.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_src.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/netncp/ncp_conn.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/netncp/ncp_mod.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_subr.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_vfsops.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/capability.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/conf.h#11 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mount.h#12 edit .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_alloc.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_quota.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_vnops.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/alpha/osf1/osf1_misc.c#8 (text+ko) ==== @@ -1043,7 +1043,7 @@ oldcred = p->p_ucred; if (uid != oldcred->cr_ruid && uid != oldcred->cr_svuid - && (error = cap_check_cred(p->p_ucred, NULL, CAP_SETUID, + && (error = cap_check_cred(p->p_ucred, CAP_SETUID, SUSER_ALLOWJAIL)) != 0) { PROC_UNLOCK(p); uifree(uip); @@ -1098,7 +1098,7 @@ oldcred = p->p_ucred; if (gid != oldcred->cr_rgid && gid != oldcred->cr_svgid - && ((error = cap_check_cred(p->p_ucred, NULL, CAP_SETGID, + && ((error = cap_check_cred(p->p_ucred, CAP_SETGID, SUSER_ALLOWJAIL)) != 0 )) { PROC_UNLOCK(p); crfree(newcred); ==== //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_misc.c#10 (text+ko) ==== @@ -1078,8 +1078,8 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + if ((error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_uid16.c#7 (text+ko) ==== @@ -124,8 +124,8 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + if ((error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_vnops.c#10 (text+ko) ==== @@ -559,7 +559,8 @@ goto notfound; cdev = NULL; - EVENTHANDLER_INVOKE(dev_clone_cred, td->td_ucred, pname, strlen(pname), &cdev); + EVENTHANDLER_INVOKE(dev_clone_cred, td->td_ucred, pname, + strlen(pname), &cdev); EVENTHANDLER_INVOKE(dev_clone, pname, strlen(pname), &cdev); if (cdev == NULL) goto notfound; @@ -1118,8 +1119,8 @@ if (uid != de->de_uid || gid != de->de_gid) { if (((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) && - (error = cap_check_cred(ap->a_td->td_ucred, ap->a_td, - CAP_FOWNER, SUSER_ALLOWJAIL)) != 0) + (error = cap_check_cred(ap->a_td->td_ucred, CAP_FOWNER, + SUSER_ALLOWJAIL)) != 0) return (error); de->de_uid = uid; de->de_gid = gid; @@ -1128,8 +1129,8 @@ if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = cap_check_cred(ap->a_td->td_ucred, ap->a_td, - CAP_FOWNER, SUSER_ALLOWJAIL))) + (error = cap_check_cred(ap->a_td->td_ucred, CAP_FOWNER, + SUSER_ALLOWJAIL))) return (error); de->de_mode = vap->va_mode; c = 1; ==== //depot/projects/trustedbsd/sebsd/sys/fs/hpfs/hpfs_vnops.c#7 (text+ko) ==== @@ -502,7 +502,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != hp->h_uid && - (error = cap_check_cred(cred, NULL, CAP_FOWNER, + (error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, cred, td)))) ==== //depot/projects/trustedbsd/sebsd/sys/fs/msdosfs/msdosfs_vnops.c#10 (text+ko) ==== @@ -388,7 +388,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = cap_check_cred(cred, NULL, CAP_FOWNER, + (error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL))) return (error); /* @@ -403,8 +403,7 @@ * set ATTR_ARCHIVE for directories `cp -pr' from a more * sensible filesystem attempts it a lot. */ - if (cap_check_cred(cred, NULL, CAP_SYS_SETFFLAG, - SUSER_ALLOWJAIL)) { + if (cap_check_cred(cred, CAP_SYS_SETFFLAG, SUSER_ALLOWJAIL)) { if (vap->va_flags & SF_SETTABLE) return EPERM; } @@ -431,7 +430,7 @@ gid = pmp->pm_gid; if ((cred->cr_uid != pmp->pm_uid || uid != pmp->pm_uid || (gid != pmp->pm_gid && !groupmember(gid, cred))) && - (error = cap_check_cred(cred, NULL, CAP_FOWNER, + (error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL))) return error; if (uid != pmp->pm_uid || gid != pmp->pm_gid) @@ -464,7 +463,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = cap_check_cred(cred, NULL, CAP_FOWNER, + (error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(ap->a_vp, VWRITE, cred, ap->a_td)))) @@ -494,7 +493,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = cap_check_cred(cred, NULL, CAP_FOWNER, + (error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL))) return (error); if (vp->v_type != VDIR) { ==== //depot/projects/trustedbsd/sebsd/sys/fs/smbfs/smbfs_vnops.c#10 (text+ko) ==== @@ -372,7 +372,7 @@ atime = &vap->va_atime; if (mtime != atime) { if (ap->a_cred->cr_uid != VTOSMBFS(vp)->sm_args.uid && - (error = cap_check_cred(ap->a_cred, NULL, CAP_FOWNER, + (error = cap_check_cred(ap->a_cred, CAP_FOWNER, SUSER_ALLOWJAIL)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) ==== //depot/projects/trustedbsd/sebsd/sys/gnu/ext2fs/ext2_vnops.c#10 (text+ko) ==== @@ -448,8 +448,8 @@ * Privileged non-jail processes may not modify system flags * if securelevel > 0 and any existing system flags are set. */ - if (cap_check_cred(cred, NULL, CAP_SYS_SETFFLAG, - SUSER_ALLOWJAIL) == 0) { + if (cap_check_cred(cred, CAP_SYS_SETFFLAG, SUSER_ALLOWJAIL) + == 0) { if (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) { error = securelevel_gt(cred, 0); @@ -567,7 +567,7 @@ * Privileged processes may set the sticky bit on non-directories. */ if (vp->v_type != VDIR && (mode & S_ISTXT)) { - if (cap_check_cred(cred, NULL, CAP_SYS_RAWIO, 0) != 0) + if (cap_check_cred(cred, CAP_SYS_RAWIO, 0) != 0) return (EFTYPE); } @@ -576,8 +576,7 @@ */ if (((mode & ISGID) && !groupmember(ip->i_gid, cred)) || ((mode & ISUID) && ip->i_uid != cred->cr_uid)) { - if (cap_check_cred (cred, NULL, CAP_FSETID, SUSER_ALLOWJAIL) - != 0) + if (cap_check_cred (cred, CAP_FSETID, SUSER_ALLOWJAIL) != 0) return (EPERM); } @@ -621,8 +620,7 @@ */ if ((uid != ip->i_uid || (gid != ip->i_gid && !groupmember(gid, cred)))) { - error = cap_check_cred(cred, NULL, CAP_FOWNER, - SUSER_ALLOWJAIL); + error = cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL); if (error) return (error); } @@ -637,8 +635,7 @@ * change. */ if ((ouid != uid || ogid != gid) && (ip->i_mode & (ISUID | ISGID))) { - if (cap_check_cred (cred, NULL, CAP_FSETID, SUSER_ALLOWJAIL) - != 0) + if (cap_check_cred(cred, CAP_FSETID, SUSER_ALLOWJAIL) != 0) ip->i_mode &= ~(ISUID | ISGID); } return (0); @@ -1718,8 +1715,8 @@ tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_nlink = 1; if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred)) { - if (cap_check_cred(cnp->cn_cred, NULL, CAP_FSETID, - SUSER_ALLOWJAIL) != 0) + if (cap_check_cred(cnp->cn_cred, CAP_FSETID, SUSER_ALLOWJAIL) + != 0) ip->i_mode &= ~ISGID; } ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_acl.c#7 (text+ko) ==== @@ -95,24 +95,24 @@ cap_granted = 0; if (type == VDIR) { - if ((acc_mode & VEXEC) && !cap_check_cred (cred, NULL, + if ((acc_mode & VEXEC) && !cap_check_cred (cred, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { - if ((acc_mode & VEXEC) && !cap_check_cred(cred, NULL, + if ((acc_mode & VEXEC) && !cap_check_cred(cred, CAP_DAC_EXECUTE, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } - if ((acc_mode & VREAD) && !cap_check_cred(cred, NULL, - CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + if ((acc_mode & VREAD) && !cap_check_cred(cred, CAP_DAC_READ_SEARCH, + SUSER_ALLOWJAIL)) cap_granted |= VREAD; if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && - !cap_check_cred(cred, NULL, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) + !cap_check_cred(cred, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) cap_granted |= (VWRITE | VAPPEND); - if ((acc_mode & VADMIN) && !cap_check_cred(cred, NULL, CAP_FOWNER, + if ((acc_mode & VADMIN) && !cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL)) cap_granted |= VADMIN; ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#7 (text+ko) ==== @@ -134,8 +134,7 @@ } int -cap_check_cred(struct ucred *cred, struct thread *td, cap_value_t cap, - int jailflags) +cap_check_cred(struct ucred *cred, cap_value_t cap, int jailflags) { int error; @@ -147,11 +146,12 @@ error = suser_cred(cred, jailflags); - return error; + return (error); } int cap_check(struct thread *td, cap_value_t cap) { - return cap_check_cred(td->td_ucred, td, cap, 0); + + return (cap_check_cred(td->td_ucred, cap, 0)); } ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#10 (text+ko) ==== @@ -440,7 +440,7 @@ dev_unlock(); } -struct cdev * +static struct cdev * make_dev_credv(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid, struct ucred *cr, int perms, const char *fmt, ...) { @@ -489,24 +489,29 @@ return (dev); } -dev_t +struct cdev * make_dev_cred(struct cdevsw *devsw, int minor, struct ucred *cr, int perms, const char *fmt, ...) { + struct cdev *dev; va_list ap; - va_start (ap, fmt); - dev_t ret = make_dev_credv (devsw, minor, 0, 0, cr, perms, fmt, ap); - va_end (ap); - return (ret); + + va_start(ap, fmt); + dev = make_dev_credv(devsw, minor, 0, 0, cr, perms, fmt, ap); + va_end(ap); + return (dev); } -dev_t +struct cdev * make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...) { + struct cdev *dev; va_list ap; - va_start (ap, fmt); - dev_t ret = make_dev_credv (devsw, minor, uid, gid, NULL, perms, fmt, ap); - va_end (ap); - return (ret); + + va_start(ap, fmt); + dev = make_dev_credv(devsw, minor, uid, gid, NULL, perms, fmt, ap); + va_end(ap); + + return (dev); } int ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_exec.c#15 (text+ko) ==== @@ -564,7 +564,7 @@ */ setsugid(p); #ifdef KTRACE - if (p->p_tracevp != NULL && cap_check_cred (oldcred, NULL, + if (p->p_tracevp != NULL && cap_check_cred(oldcred, CAP_SYS_PTRACE, SUSER_ALLOWJAIL)) { mtx_lock(&ktrace_mtx); p->p_traceflag = 0; ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_ktrace.c#10 (text+ko) ==== @@ -896,7 +896,7 @@ PROC_LOCK_ASSERT(targetp, MA_OWNED); if (targetp->p_traceflag & KTRFAC_ROOT && - cap_check_cred(td->td_ucred, NULL, CAP_SYS_PTRACE, SUSER_ALLOWJAIL)) + cap_check_cred(td->td_ucred, CAP_SYS_PTRACE, SUSER_ALLOWJAIL)) return (0); if (p_candebug(td, targetp) != 0) ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#11 (text+ko) ==== @@ -525,8 +525,8 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ uid != oldcred->cr_uid && /* allow setuid(geteuid()) */ #endif - (error = cap_check_cred(oldcred, NULL, CAP_SETUID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETUID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); uifree(uip); crfree(newcred); @@ -608,8 +608,8 @@ oldcred = p->p_ucred; if (euid != oldcred->cr_ruid && /* allow seteuid(getuid()) */ euid != oldcred->cr_svuid && /* allow seteuid(saved uid) */ - (error = cap_check_cred(oldcred, NULL, CAP_SETUID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETUID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); uifree(euip); crfree(newcred); @@ -671,8 +671,8 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ gid != oldcred->cr_groups[0] && /* allow setgid(getegid()) */ #endif - (error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); @@ -747,8 +747,8 @@ oldcred = p->p_ucred; if (egid != oldcred->cr_rgid && /* allow setegid(getgid()) */ egid != oldcred->cr_svgid && /* allow setegid(saved gid) */ - (error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); @@ -794,7 +794,7 @@ newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; - error = cap_check_cred(oldcred, NULL, CAP_SETGID, SUSER_ALLOWJAIL); + error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL); if (error) { PROC_UNLOCK(p); crfree(newcred); @@ -858,8 +858,8 @@ ruid != oldcred->cr_svuid) || (euid != (uid_t)-1 && euid != oldcred->cr_uid && euid != oldcred->cr_ruid && euid != oldcred->cr_svuid)) && - (error = cap_check_cred(oldcred, NULL, CAP_SETUID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETUID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); uifree(ruip); uifree(euip); @@ -915,8 +915,8 @@ rgid != oldcred->cr_svgid) || (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] && egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) && - (error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); @@ -990,8 +990,8 @@ (suid != (uid_t)-1 && suid != oldcred->cr_ruid && suid != oldcred->cr_svuid && suid != oldcred->cr_uid)) && - (error = cap_check_cred(oldcred, NULL, CAP_SETUID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETUID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); uifree(ruip); uifree(euip); @@ -1059,8 +1059,8 @@ (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid && sgid != oldcred->cr_svgid && sgid != oldcred->cr_groups[0])) && - (error = cap_check_cred(oldcred, NULL, CAP_SETGID, - SUSER_ALLOWJAIL)) != 0) { + (error = cap_check_cred(oldcred, CAP_SETGID, SUSER_ALLOWJAIL)) + != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); @@ -1338,7 +1338,7 @@ { if (!see_other_uids && u1->cr_ruid != u2->cr_ruid) { - if (cap_check_cred(u1, NULL, CAP_SETUID, SUSER_ALLOWJAIL) != 0) + if (cap_check_cred(u1, CAP_SETUID, SUSER_ALLOWJAIL) != 0) return (ESRCH); } return (0); @@ -1494,7 +1494,7 @@ break; default: /* Not permitted without privilege. */ - error = cap_check_cred(cred, NULL, CAP_KILL, + error = cap_check_cred(cred, CAP_KILL, SUSER_ALLOWJAIL); if (error) return (error); @@ -1510,7 +1510,7 @@ cred->cr_uid != proc->p_ucred->cr_ruid && cred->cr_uid != proc->p_ucred->cr_svuid) { /* Not permitted without privilege. */ - error = cap_check_cred(cred, NULL, CAP_KILL, SUSER_ALLOWJAIL); + error = cap_check_cred(cred, CAP_KILL, SUSER_ALLOWJAIL); if (error) return (error); } @@ -1579,8 +1579,7 @@ return (0); if (td->td_ucred->cr_uid == p->p_ucred->cr_ruid) return (0); - if (cap_check_cred(td->td_ucred, td, CAP_SYS_NICE, SUSER_ALLOWJAIL) - == 0) + if (cap_check_cred(td->td_ucred, CAP_SYS_NICE, SUSER_ALLOWJAIL) == 0) return (0); return (EPERM); @@ -1618,7 +1617,7 @@ KASSERT(td == curthread, ("%s: td not curthread", __func__)); PROC_LOCK_ASSERT(p, MA_OWNED); if (!unprivileged_proc_debug) { - error = cap_check_cred(td->td_ucred, td, CAP_SYS_PTRACE, + error = cap_check_cred(td->td_ucred, CAP_SYS_PTRACE, SUSER_ALLOWJAIL); if (error) return (error); @@ -1671,7 +1670,7 @@ * require CAP_SYS_PTRACE. */ if (!grpsubset || !uidsubset || credentialchanged) { - error = cap_check_cred(td->td_ucred, td, CAP_SYS_PTRACE, + error = cap_check_cred(td->td_ucred, CAP_SYS_PTRACE, SUSER_ALLOWJAIL); if (error) return (error); @@ -1958,7 +1957,7 @@ int error; char logintmp[MAXLOGNAME]; - error = cap_check_cred(td->td_ucred, td, CAP_SETUID, SUSER_ALLOWJAIL); + error = cap_check_cred(td->td_ucred, CAP_SETUID, SUSER_ALLOWJAIL); if (error) return (error); error = copyinstr(uap->namebuf, logintmp, sizeof(logintmp), NULL); ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_resource.c#9 (text+ko) ==== @@ -575,7 +575,7 @@ alimp = &oldlim->pl_rlimit[which]; if (limp->rlim_cur > alimp->rlim_max || limp->rlim_max > alimp->rlim_max) - if ((error = cap_check_cred(td->td_ucred, td, CAP_SYS_RESOURCE, + if ((error = cap_check_cred(td->td_ucred, CAP_SYS_RESOURCE, SUSER_ALLOWJAIL))) { PROC_UNLOCK(p); lim_free(newlim); ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_sysctl.c#9 (text+ko) ==== @@ -1218,7 +1218,7 @@ flags = SUSER_ALLOWJAIL; else flags = 0; - error = cap_check_cred(req->td->td_ucred, req->td, CAP_SYS_ADMIN, flags); + error = cap_check_cred(req->td->td_ucred, CAP_SYS_ADMIN, flags); if (error) return (error); } ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#15 (text+ko) ==== @@ -1498,7 +1498,7 @@ vfsp = vfs_byname("devfs"); if (vfsp == NULL) break; - error = vfs_mount_alloc(NULLVP, vfsp, "/dev", td, &mp); + error = vfs_mount_alloc(NULLVP, vfsp, "/dev", td, NULL, &mp); if (error) break; mp->mnt_flag |= MNT_RDONLY; ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_subr.c#12 (text+ko) ==== @@ -3605,26 +3605,25 @@ * VEXEC requests, instead of CAP_DAC_EXECUTE. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check_cred(cred, NULL, CAP_DAC_READ_SEARCH, + !cap_check_cred(cred, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check_cred(cred, NULL, CAP_DAC_EXECUTE, - SUSER_ALLOWJAIL)) + !cap_check_cred(cred, CAP_DAC_EXECUTE, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) && - !cap_check_cred(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + !cap_check_cred(cred, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) cap_granted |= VREAD; if ((acc_mode & VWRITE) && ((dac_granted & VWRITE) == 0) && - !cap_check_cred(cred, NULL, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) + !cap_check_cred(cred, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) cap_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && ((dac_granted & VADMIN) == 0) && - !cap_check_cred(cred, NULL, CAP_FOWNER, SUSER_ALLOWJAIL)) + !cap_check_cred(cred, CAP_FOWNER, SUSER_ALLOWJAIL)) cap_granted |= VADMIN; if ((acc_mode & (cap_granted | dac_granted)) == acc_mode) { @@ -3662,7 +3661,7 @@ switch (attrnamespace) { case EXTATTR_NAMESPACE_SYSTEM: /* Potentially should be: return (EPERM); */ - return (cap_check_cred(cred, td, CAP_SYS_SETFFLAG, 0)); + return (cap_check_cred(cred, CAP_SYS_SETFFLAG, 0)); case EXTATTR_NAMESPACE_USER: return (VOP_ACCESS(vp, access, cred, td)); default: ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#14 (text+ko) ==== @@ -813,8 +813,7 @@ int error; struct nameidata nd; - error = cap_check_cred(td->td_ucred, td, CAP_SYS_CHROOT, - SUSER_ALLOWJAIL); + error = cap_check_cred(td->td_ucred, CAP_SYS_CHROOT, SUSER_ALLOWJAIL); if (error) return (error); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); @@ -1178,7 +1177,7 @@ error = cap_check(td, CAP_MKNOD); break; default: - error = cap_check_cred(td->td_ucred, td, CAP_MKNOD, + error = cap_check_cred(td->td_ucred, CAP_MKNOD, SUSER_ALLOWJAIL); break; } @@ -1374,7 +1373,7 @@ struct vattr va; int error; - if (cap_check_cred(cred, NULL, CAP_SYS_ADMIN, SUSER_ALLOWJAIL) == 0) + if (cap_check_cred(cred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL) == 0) return (0); if (!hardlink_check_uid && !hardlink_check_gid) @@ -2320,7 +2319,7 @@ * chown can't fail when done as root. */ if (vp->v_type == VCHR || vp->v_type == VBLK) { - error = cap_check_cred(td->td_ucred, td, CAP_SYS_SETFFLAG, + error = cap_check_cred(td->td_ucred, CAP_SYS_SETFFLAG, SUSER_ALLOWJAIL); if (error) return (error); @@ -3762,7 +3761,7 @@ } VOP_UNLOCK(vp, 0, td); if (td->td_ucred->cr_uid != vattr.va_uid) { - error = cap_check_cred(td->td_ucred, td, CAP_SYS_ADMIN, + error = cap_check_cred(td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) goto out; ==== //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.c#14 (text+ko) ==== @@ -322,7 +322,7 @@ /* GROSS */ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && - cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, + cap_check_cred(cred, CAP_NET_BIND_SERVICE, SUSER_ALLOWJAIL)) return (EACCES); if (jailed(cred)) @@ -385,7 +385,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - if ((error = cap_check_cred(cred, NULL, + if ((error = cap_check_cred(cred, CAP_NET_BIND_SERVICE, SUSER_ALLOWJAIL)) != 0) return error; first = ipport_lowfirstauto; /* 1023 */ ==== //depot/projects/trustedbsd/sebsd/sys/netinet/raw_ip.c#13 (text+ko) ==== @@ -585,7 +585,7 @@ INP_INFO_WUNLOCK(&ripcbinfo); return (EPERM); } - if (td && (error = cap_check_cred(td->td_ucred, td, CAP_NET_RAW, + if (td && (error = cap_check_cred(td->td_ucred, CAP_NET_RAW, SUSER_ALLOWJAIL)) != 0) { INP_INFO_WUNLOCK(&ripcbinfo); return error; ==== //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_subr.c#13 (text+ko) ==== @@ -996,7 +996,7 @@ struct inpcb *inp; int error, s; - error = cap_check_cred(req->td->td_ucred, req->td, CAP_SYS_ADMIN, + error = cap_check_cred(req->td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) return (error); @@ -1043,7 +1043,7 @@ struct inpcb *inp; int error, s, mapped = 0; - error = cap_check_cred(req->td->td_ucred, req->td, CAP_SYS_ADMIN, + error = cap_check_cred(req->td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) return (error); ==== //depot/projects/trustedbsd/sebsd/sys/netinet/udp_usrreq.c#12 (text+ko) ==== @@ -688,7 +688,7 @@ struct inpcb *inp; int error, s; - error = cap_check_cred(req->td->td_ucred, req->td, CAP_SYS_ADMIN, + error = cap_check_cred(req->td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) return (error); ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#13 (text+ko) ==== @@ -190,7 +190,7 @@ /* GROSS */ if (ntohs(lport) < IPV6PORT_RESERVED && - cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, + cap_check_cred(cred, CAP_NET_BIND_SERVICE, SUSER_ALLOWJAIL)) return (EACCES); if (so->so_cred->cr_uid != 0 && ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_src.c#9 (text+ko) ==== @@ -760,7 +760,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - if ((error = cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, 0))) + if ((error = cap_check_cred(cred, CAP_NET_BIND_SERVICE, 0))) return error; first = ipport_lowfirstauto; /* 1023 */ last = ipport_lowlastauto; /* 600 */ ==== //depot/projects/trustedbsd/sebsd/sys/netncp/ncp_conn.c#6 (text+ko) ==== @@ -113,7 +113,7 @@ { int error; - if (cred == NOCRED || !cap_check_cred (cred, NULL, CAP_NET_ADMIN, 0) || + if (cred == NOCRED || !cap_check_cred(cred, CAP_NET_ADMIN, 0) || cred->cr_uid == conn->nc_owner->cr_uid) return 0; mode >>= 3; @@ -226,10 +226,10 @@ /* * Only root can change ownership */ - if (cap->owner != NCP_DEFAULT_OWNER && !cap_check_cred (cred, NULL, CAP_NET_ADMIN, 0)) + if (cap->owner != NCP_DEFAULT_OWNER && !cap_check_cred(cred, CAP_NET_ADMIN, 0)) return EPERM; if (cap->group != NCP_DEFAULT_GROUP && - !groupmember(cap->group, cred) && !cap_check_cred (cred, NULL, CAP_NET_ADMIN, 0)) + !groupmember(cap->group, cred) && !cap_check_cred(cred, CAP_NET_ADMIN, 0)) return EPERM; if (cap->owner != NCP_DEFAULT_OWNER) { owner = crget(); @@ -417,7 +417,7 @@ bcmp(&ncp->li.saddr,&ncp->li.saddr,li->saddr.sa_len) != 0) continue; if (cred->cr_uid == ncp->nc_owner->cr_uid || - !cap_check_cred (cred, NULL, CAP_NET_ADMIN, 0)) + !cap_check_cred(cred, CAP_NET_ADMIN, 0)) break; error = ncp_conn_access(ncp,cred,mode); if (!error && ncp2 == NULL) @@ -475,7 +475,7 @@ if (cred->cr_uid == ncp->nc_owner->cr_uid) break; /* XXX: seems redundant with lower ncp_conn_access() call */ - if (cap_check_cred(cred, NULL, CAP_NET_ADMIN, 0) == 0) + if (cap_check_cred(cred, CAP_NET_ADMIN, 0) == 0) ncp2 = ncp; } error = ncp_conn_access(ncp,cred,mode); ==== //depot/projects/trustedbsd/sebsd/sys/netncp/ncp_mod.c#8 (text+ko) ==== @@ -178,7 +178,8 @@ { int error; - if (cred->cr_uid != conn->nc_owner->cr_uid && cap_check_cred(cred, NULL, CAP_NET_ADMIN, 0) != 0) + if (cred->cr_uid != conn->nc_owner->cr_uid && cap_check_cred(cred, + CAP_NET_ADMIN, 0) != 0) return EACCES; conn->li.user = ncp_str_dup(user); if (conn->li.user == NULL) ==== //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_subr.h#7 (text+ko) ==== @@ -68,7 +68,7 @@ SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) || \ SIGISMEMBER(set, SIGQUIT)) -#define smb_suser(cred) cap_check_cred(cred, NULL, CAP_NET_ADMIN, 0) +#define smb_suser(cred) cap_check_cred(cred, CAP_NET_ADMIN, 0) /* * Compatibility wrappers for simple locks ==== //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_vfsops.c#12 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -1023,7 +1024,7 @@ return (error); } if (req->newptr != NULL) { - error = vfs_suser(mp, req->td); + error = vfs_cap_check(mp, req->td, CAP_SYS_ADMIN); if (error) return (error); error = SYSCTL_IN(req, &nmp->nm_tprintf_initial_delay, ==== //depot/projects/trustedbsd/sebsd/sys/sys/capability.h#5 (text+ko) ==== @@ -195,8 +195,7 @@ struct ucred; struct vnode; -int cap_check_cred(struct ucred *, struct thread *, cap_value_t, - int jailflag); +int cap_check_cred(struct ucred *, cap_value_t, int jailflag); int cap_check(struct thread *, cap_value_t); const char *capv_to_text(cap_value_t capv); ==== //depot/projects/trustedbsd/sebsd/sys/sys/conf.h#11 (text+ko) ==== @@ -262,7 +262,7 @@ struct cdev *makebdev(int _maj, int _min); struct cdev *make_dev(struct cdevsw *_devsw, int _minor, uid_t _uid, gid_t _gid, int _perms, const char *_fmt, ...) __printflike(6, 7); -dev_t make_dev_cred(struct cdevsw *_devsw, int _minor, struct ucred *cr, +struct cdev *make_dev_cred(struct cdevsw *_devsw, int _minor, struct ucred *cr, int _perms, const char *_fmt, ...) __printflike(5, 6); struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...) __printflike(2, 3); int dev2unit(struct cdev *_dev); @@ -291,7 +291,8 @@ int dev_stdclone(char *_name, char **_namep, const char *_stem, int *_unit); EVENTHANDLER_DECLARE(dev_clone, dev_clone_fn); -typedef void (*dev_clone_cred_fn)(void *arg, struct ucred *cr, char *name, int namelen, dev_t *result); +typedef void (*dev_clone_cred_fn)(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **result); EVENTHANDLER_DECLARE(dev_clone_cred, dev_clone_cred_fn); /* Stuff relating to kernel-dump */ ==== //depot/projects/trustedbsd/sebsd/sys/sys/mount.h#12 (text+ko) ==== @@ -588,7 +588,7 @@ void vfs_mountroot(void); /* mount our root filesystem */ int vfs_rootmountalloc(char *, char *, struct mount **); void vfs_mount_destroy(struct mount *, struct thread *); -int vfs_suser(struct mount *, struct thread *); +int vfs_cap_check(struct mount *, struct thread *, u_int64_t); void vfs_unbusy(struct mount *, struct thread *); void vfs_unmountall(void); int vfs_register(struct vfsconf *); ==== //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_alloc.c#9 (text+ko) ==== @@ -159,7 +159,7 @@ if (size == fs->fs_bsize && fs->fs_cstotal.cs_nbfree == 0) goto nospace; if (freespace(fs, fs->fs_minfree) - numfrags(fs, size) < 0 && - cap_check_cred(cred, NULL, CAP_SYS_RESOURCE, SUSER_ALLOWJAIL)) + cap_check_cred(cred, CAP_SYS_RESOURCE, SUSER_ALLOWJAIL)) goto nospace; #ifdef QUOTA error = chkdq(ip, btodb(size), cred, 0); @@ -240,7 +240,7 @@ reclaimed = 0; retry: if (freespace(fs, fs->fs_minfree) - numfrags(fs, nsize - osize) < 0 && - cap_check_cred(cred, NULL, CAP_SYS_RESOURCE, SUSER_ALLOWJAIL)) + cap_check_cred(cred, CAP_SYS_RESOURCE, SUSER_ALLOWJAIL)) goto nospace; if (bprev == 0) { printf("dev = %s, bsize = %ld, bprev = %jd, fs = %s\n", ==== //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_quota.c#9 (text+ko) ==== @@ -157,7 +157,8 @@ } return (0); } - if ((flags & FORCE) == 0 && cap_check_cred(cred, NULL, CAP_SYS_RESOURCE, 0)) { + if ((flags & FORCE) == 0 && cap_check_cred(cred, CAP_SYS_RESOURCE, + 0)) { for (i = 0; i < MAXQUOTAS; i++) { if ((dq = ip->i_dquot[i]) == NODQUOT) continue; @@ -280,7 +281,8 @@ } return (0); } - if ((flags & FORCE) == 0 && cap_check_cred(cred, NULL, CAP_SYS_RESOURCE, 0)) { + if ((flags & FORCE) == 0 && cap_check_cred(cred, CAP_SYS_RESOURCE, + 0)) { for (i = 0; i < MAXQUOTAS; i++) { if ((dq = ip->i_dquot[i]) == NODQUOT) continue; @@ -408,8 +410,7 @@ int error, flags; struct nameidata nd; - error = cap_check_cred(td->td_ucred, NULL, CAP_SYS_ADMIN, - SUSER_ALLOWJAIL); + error = cap_check_cred(td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) return (error); @@ -497,8 +498,7 @@ struct inode *ip; int error; - error = cap_check_cred(td->td_ucred, NULL, CAP_SYS_ADMIN, - SUSER_ALLOWJAIL); + error = cap_check_cred(td->td_ucred, CAP_SYS_ADMIN, SUSER_ALLOWJAIL); if (error) return (error); @@ -565,8 +565,8 @@ switch (type) { case USRQUOTA: if ((td->td_ucred->cr_uid != id) && !unprivileged_get_quota) { - error = cap_check_cred(td->td_ucred, td, - CAP_SYS_ADMIN, SUSER_ALLOWJAIL); + error = cap_check_cred(td->td_ucred, CAP_SYS_ADMIN, + SUSER_ALLOWJAIL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 14:57:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 767C516A4D0; Wed, 10 Nov 2004 14:57:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35CC616A4CE for ; Wed, 10 Nov 2004 14:57:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00FB143D1D for ; Wed, 10 Nov 2004 14:57:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAEvJUJ022137 for ; Wed, 10 Nov 2004 14:57:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAEvJw8022134 for perforce@freebsd.org; Wed, 10 Nov 2004 14:57:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 14:57:19 GMT Message-Id: <200411101457.iAAEvJw8022134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 14:57:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=64820 Change 64820 by rwatson@rwatson_tislabs on 2004/11/10 14:56:26 Catch up with the world where config supports includes; make the MAC kernel config GENERIC + various MAC options. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#55 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#55 (text+ko) ==== @@ -1,34 +1,6 @@ -# -# GENERIC -- Generic kernel configuration file for FreeBSD/i386 -# -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: -# -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.418 2004/09/19 00:52:22 mjacob Exp $ - -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU +include GENERIC ident MAC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols - options MAC #options MAC_ALWAYS_LABEL_MBUF options MAC_BIBA @@ -37,261 +9,3 @@ #options MAC_STATIC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART - -#options SCHED_ULE # ULE scheduler -options SCHED_4BSD # 4BSD scheduler -options PREEMPTION # Enable kernel thread preemption -options INET # InterNETworking -options INET6 # IPv6 communications protocols -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_ACL # Support for access control lists -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options NFSCLIENT # Network Filesystem Client -#options NFSSERVER # Network Filesystem Server -options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options MSDOSFS # MSDOS Filesystem -options CD9660 # ISO 9660 Filesystem -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI -options KTRACE # ktrace(1) support -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options ALT_BREAK_TO_DEBUGGER -options BREAK_TO_DEBUGGER -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed - -# To make an SMP kernel, the next two are needed -options SMP # Symmetric MultiProcessor Kernel -device apic # I/O APIC - -# Bus support. Do not remove isa, even if you have no isa slots -device isa -device eisa -device pci - -# Floppy drives -device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering - -# SCSI Controllers -device ahb # EISA AHA1742 family -device ahc # AHA2940 and onboard AIC7xxx devices -device ahd # AHA39320/29320 and onboard AIC79xx devices -device amd # AMD 53C974 (Tekram DC-390(T)) -device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module -device mpt # LSI-Logic MPT-Fusion -#device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') -device trm # Tekram DC395U/UW/F DC315U adapters - -device adv # Advansys SCSI adapters -device adw # Advansys wide SCSI adapters -device aha # Adaptec 154x SCSI adapters -device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. -device bt # Buslogic/Mylex MultiMaster SCSI adapters - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 - -# SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device ch # SCSI media changers -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass # Passthrough device (direct SCSI access) -device ses # SCSI Environmental Services (and SAF-TE) - -# RAID controllers interfaced to the SCSI subsystem -device amr # AMI MegaRAID -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options -device iir # Intel Integrated RAID -device ips # IBM (Adaptec) ServeRAID -device mly # Mylex AcceleRAID/eXtremeRAID -device twa # 3ware 9000 series PATA/SATA RAID - -# RAID controllers -device aac # Adaptec FSA RAID -device aacp # SCSI passthrough for aac (requires CAM) -device ida # Compaq Smart RAID -device mlx # Mylex DAC960 family -device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# Floating point support - do not disable. -device npx - -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -device cbb # cardbus (yenta) bridge -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# Parallel port -device ppc -device ppbus # Parallel port bus (required) -device lpt # Printer -device plip # TCP/IP over parallel -device ppi # Parallel port interface device -#device vpo # Requires scbus and da - -# If you've got a "dumb" serial or parallel PCI card that is -# supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): -#device puc - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device ixgb # Intel PRO/10GbE Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570xx Gigabit Ethernet - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device -device random # Entropy device -device ether # Ethernet support -#device sl # Kernel SLIP -#device ppp # Kernel PPP -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -device bpf # Berkeley packet filter - -# USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners -# USB Ethernet, requires mii -device aue # ADMtek USB Ethernet -device axe # ASIX Electronics USB Ethernet -device cue # CATC USB Ethernet -device kue # Kawasaki LSI USB Ethernet -device rue # RealTek RTL8150 USB Ethernet - -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) From owner-p4-projects@FreeBSD.ORG Wed Nov 10 14:57:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81B6F16A4D2; Wed, 10 Nov 2004 14:57:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0691416A4DF for ; Wed, 10 Nov 2004 14:57:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64F8543D1D for ; Wed, 10 Nov 2004 14:57:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAEvKd3022144 for ; Wed, 10 Nov 2004 14:57:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAEvKAF022140 for perforce@freebsd.org; Wed, 10 Nov 2004 14:57:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 14:57:20 GMT Message-Id: <200411101457.iAAEvKAF022140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 14:57:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=64821 Change 64821 by rwatson@rwatson_tislabs on 2004/11/10 14:57:13 Integ MAC using include to SEBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#13 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#13 (text+ko) ==== @@ -1,34 +1,6 @@ -# -# GENERIC -- Generic kernel configuration file for FreeBSD/i386 -# -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: -# -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.418 2004/09/19 00:52:22 mjacob Exp $ - -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU +include GENERIC ident MAC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols - options MAC #options MAC_ALWAYS_LABEL_MBUF options MAC_DEBUG @@ -36,261 +8,3 @@ #options MAC_STATIC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART - -#options SCHED_ULE # ULE scheduler -options SCHED_4BSD # 4BSD scheduler -options PREEMPTION # Enable kernel thread preemption -options INET # InterNETworking -options INET6 # IPv6 communications protocols -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_ACL # Support for access control lists -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options NFSCLIENT # Network Filesystem Client -#options NFSSERVER # Network Filesystem Server -options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options MSDOSFS # MSDOS Filesystem -options CD9660 # ISO 9660 Filesystem -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI -options KTRACE # ktrace(1) support -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -# Debugging for use in -current -options KDB # Enable kernel debugger support. -options DDB # Support DDB. -options GDB # Support remote GDB. -options ALT_BREAK_TO_DEBUGGER -options BREAK_TO_DEBUGGER -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed - -# To make an SMP kernel, the next two are needed -options SMP # Symmetric MultiProcessor Kernel -device apic # I/O APIC - -# Bus support. Do not remove isa, even if you have no isa slots -device isa -device eisa -device pci - -# Floppy drives -device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering - -# SCSI Controllers -device ahb # EISA AHA1742 family -device ahc # AHA2940 and onboard AIC7xxx devices -device ahd # AHA39320/29320 and onboard AIC79xx devices -device amd # AMD 53C974 (Tekram DC-390(T)) -device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module -device mpt # LSI-Logic MPT-Fusion -#device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') -device trm # Tekram DC395U/UW/F DC315U adapters - -device adv # Advansys SCSI adapters -device adw # Advansys wide SCSI adapters -device aha # Adaptec 154x SCSI adapters -device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. -device bt # Buslogic/Mylex MultiMaster SCSI adapters - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 - -# SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device ch # SCSI media changers -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass # Passthrough device (direct SCSI access) -device ses # SCSI Environmental Services (and SAF-TE) - -# RAID controllers interfaced to the SCSI subsystem -device amr # AMI MegaRAID -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options -device iir # Intel Integrated RAID -device ips # IBM (Adaptec) ServeRAID -device mly # Mylex AcceleRAID/eXtremeRAID -device twa # 3ware 9000 series PATA/SATA RAID - -# RAID controllers -device aac # Adaptec FSA RAID -device aacp # SCSI passthrough for aac (requires CAM) -device ida # Compaq Smart RAID -device mlx # Mylex DAC960 family -device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# Floating point support - do not disable. -device npx - -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -device cbb # cardbus (yenta) bridge -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# Parallel port -device ppc -device ppbus # Parallel port bus (required) -device lpt # Printer -device plip # TCP/IP over parallel -device ppi # Parallel port interface device -#device vpo # Requires scbus and da - -# If you've got a "dumb" serial or parallel PCI card that is -# supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): -#device puc - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device ixgb # Intel PRO/10GbE Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570xx Gigabit Ethernet - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device -device random # Entropy device -device ether # Ethernet support -#device sl # Kernel SLIP -#device ppp # Kernel PPP -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -device bpf # Berkeley packet filter - -# USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners -# USB Ethernet, requires mii -device aue # ADMtek USB Ethernet -device axe # ASIX Electronics USB Ethernet -device cue # CATC USB Ethernet -device kue # Kawasaki LSI USB Ethernet -device rue # RealTek RTL8150 USB Ethernet - -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) From owner-p4-projects@FreeBSD.ORG Wed Nov 10 15:03:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C832016A4D0; Wed, 10 Nov 2004 15:03:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D0A516A4CE for ; Wed, 10 Nov 2004 15:03:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53E6143D2D for ; Wed, 10 Nov 2004 15:03:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAF3SpF022358 for ; Wed, 10 Nov 2004 15:03:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAF3RIt022355 for perforce@freebsd.org; Wed, 10 Nov 2004 15:03:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 15:03:27 GMT Message-Id: <200411101503.iAAF3RIt022355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 15:03:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=64822 Change 64822 by rwatson@rwatson_tislabs on 2004/11/10 15:02:28 Catch up with System V IPC entry point renaming in the MAC branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#33 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#33 (text+ko) ==== @@ -378,7 +378,7 @@ } static void -sebsd_init_ipc_label(struct label *label) +sebsd_init_sysv_label(struct label *label) { struct ipc_security_struct *new; @@ -403,7 +403,7 @@ } static void -sebsd_cleanup_ipc_label(struct label *label) +sebsd_cleanup_sysv_label(struct label *label) { struct ipc_security_struct *ipcsec; @@ -536,7 +536,7 @@ } static void -sebsd_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { struct task_security_struct *tsec; @@ -556,14 +556,14 @@ if(security_transition_sid(tsec->sid, msqsec->sid, SECCLASS_MSG, &msgsec->sid) < 0) { printf("Warning: security_transition_sid failed on" - "create_ipc_msgmsg\n"); + "create_sysv_msgmsg\n"); printf("Assigning the requesting thread's sid to the msg\n"); msgsec->sid = tsec->sid; } } static void -sebsd_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel) { struct task_security_struct *tsec; @@ -577,7 +577,7 @@ } static void -sebsd_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct task_security_struct *tsec; @@ -591,7 +591,7 @@ } static void -sebsd_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +sebsd_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { struct task_security_struct *tsec; @@ -2092,7 +2092,7 @@ } static int -sebsd_check_ipc_msgrcv(struct ucred *cred, struct msg *msgptr, +sebsd_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { @@ -2100,7 +2100,7 @@ } static int -sebsd_check_ipc_msgrmid(struct ucred *cred, struct msg *msgptr, +sebsd_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { @@ -2108,7 +2108,7 @@ } static int -sebsd_check_ipc_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -2116,7 +2116,7 @@ } static int -sebsd_check_ipc_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -2125,7 +2125,7 @@ } static int -sebsd_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr, +sebsd_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -2154,7 +2154,7 @@ } static int -sebsd_check_ipc_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -2162,7 +2162,7 @@ } static int -sebsd_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, +sebsd_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) { access_vector_t perm; @@ -2188,7 +2188,7 @@ } static int -sebsd_check_ipc_semctl(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd) { access_vector_t perm; @@ -2227,7 +2227,7 @@ } static int -sebsd_check_ipc_semget(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel) { @@ -2235,7 +2235,7 @@ } static int -sebsd_check_ipc_semop(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype) { access_vector_t perm; @@ -2250,7 +2250,7 @@ } static int -sebsd_check_ipc_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, +sebsd_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { access_vector_t perm; @@ -2264,7 +2264,7 @@ } static int -sebsd_check_ipc_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, +sebsd_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) { access_vector_t perm; @@ -2289,7 +2289,7 @@ } static int -sebsd_check_ipc_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, +sebsd_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { @@ -2360,16 +2360,16 @@ .mpo_init_devfsdirent_label = sebsd_init_vnode_label, .mpo_init_file_label = sebsd_init_file_label, .mpo_init_ifnet_label = sebsd_init_network_label, - .mpo_init_ipc_msgmsg_label = sebsd_init_ipc_label, - .mpo_init_ipc_msgqueue_label = sebsd_init_ipc_label, - .mpo_init_ipc_sema_label = sebsd_init_ipc_label, - .mpo_init_ipc_shm_label = sebsd_init_ipc_label, + .mpo_init_sysv_msgmsg_label = sebsd_init_sysv_label, + .mpo_init_sysv_msgqueue_label = sebsd_init_sysv_label, + .mpo_init_sysv_sema_label = sebsd_init_sysv_label, + .mpo_init_sysv_shm_label = sebsd_init_sysv_label, .mpo_init_ipq_label = sebsd_init_network_label_waitcheck, .mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, .mpo_init_mount_label = sebsd_init_mount_label, .mpo_init_mount_fs_label = sebsd_init_mount_fs_label, .mpo_init_pipe_label = sebsd_init_vnode_label, - .mpo_init_posix_ksem_label = sebsd_init_ipc_label, + .mpo_init_posix_ksem_label = sebsd_init_sysv_label, .mpo_init_socket_label = sebsd_init_network_label_waitcheck, .mpo_init_socket_peer_label = sebsd_init_network_label_waitcheck, .mpo_init_vnode_label = sebsd_init_vnode_label, @@ -2380,10 +2380,10 @@ .mpo_destroy_cred_label = sebsd_destroy_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_label, .mpo_destroy_ifnet_label = sebsd_destroy_label, - .mpo_destroy_ipc_msgmsg_label = sebsd_destroy_label, - .mpo_destroy_ipc_msgqueue_label = sebsd_destroy_label, - .mpo_destroy_ipc_sema_label = sebsd_destroy_label, - .mpo_destroy_ipc_shm_label = sebsd_destroy_label, + .mpo_destroy_sysv_msgmsg_label = sebsd_destroy_label, + .mpo_destroy_sysv_msgqueue_label = sebsd_destroy_label, + .mpo_destroy_sysv_sema_label = sebsd_destroy_label, + .mpo_destroy_sysv_shm_label = sebsd_destroy_label, .mpo_destroy_ipq_label = sebsd_destroy_label, .mpo_destroy_mbuf_label = sebsd_destroy_label, .mpo_destroy_file_label = sebsd_destroy_label, @@ -2440,10 +2440,10 @@ .mpo_create_devfs_directory = sebsd_create_devfs_directory, .mpo_create_devfs_symlink = sebsd_create_devfs_symlink, .mpo_create_file = sebsd_create_file, - .mpo_create_ipc_msgmsg = sebsd_create_ipc_msgmsg, - .mpo_create_ipc_msgqueue = sebsd_create_ipc_msgqueue, - .mpo_create_ipc_sema = sebsd_create_ipc_sema, - .mpo_create_ipc_shm = sebsd_create_ipc_shm, + .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg, + .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue, + .mpo_create_sysv_sema = sebsd_create_sysv_sema, + .mpo_create_sysv_shm = sebsd_create_sysv_shm, /* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */ .mpo_create_mount = sebsd_create_mount, .mpo_create_pipe = sebsd_create_pipe, @@ -2478,20 +2478,20 @@ .mpo_check_mount = sebsd_check_mount, .mpo_check_umount = sebsd_check_umount, .mpo_check_remount = sebsd_check_remount, - .mpo_check_ipc_msgrcv = sebsd_check_ipc_msgrcv, - .mpo_check_ipc_msgrmid = sebsd_check_ipc_msgrmid, - .mpo_check_ipc_msqget = sebsd_check_ipc_msqget, - .mpo_check_ipc_msqsnd = sebsd_check_ipc_msqsnd, - .mpo_check_ipc_msgmsq = sebsd_check_ipc_msgmsq, - .mpo_check_ipc_msqrcv = sebsd_check_ipc_msqrcv, - .mpo_check_ipc_msqctl = sebsd_check_ipc_msqctl, - .mpo_check_ipc_semctl = sebsd_check_ipc_semctl, - .mpo_check_ipc_semget = sebsd_check_ipc_semget, - .mpo_check_ipc_semop = sebsd_check_ipc_semop, - .mpo_check_ipc_shmat = sebsd_check_ipc_shmat, - .mpo_check_ipc_shmctl = sebsd_check_ipc_shmctl, - /* .mpo_check_ipc_shmdt = sebsd_check_ipc_shmdt, */ - .mpo_check_ipc_shmget = sebsd_check_ipc_shmget, + .mpo_check_sysv_msgrcv = sebsd_check_sysv_msgrcv, + .mpo_check_sysv_msgrmid = sebsd_check_sysv_msgrmid, + .mpo_check_sysv_msqget = sebsd_check_sysv_msqget, + .mpo_check_sysv_msqsnd = sebsd_check_sysv_msqsnd, + .mpo_check_sysv_msgmsq = sebsd_check_sysv_msgmsq, + .mpo_check_sysv_msqrcv = sebsd_check_sysv_msqrcv, + .mpo_check_sysv_msqctl = sebsd_check_sysv_msqctl, + .mpo_check_sysv_semctl = sebsd_check_sysv_semctl, + .mpo_check_sysv_semget = sebsd_check_sysv_semget, + .mpo_check_sysv_semop = sebsd_check_sysv_semop, + .mpo_check_sysv_shmat = sebsd_check_sysv_shmat, + .mpo_check_sysv_shmctl = sebsd_check_sysv_shmctl, + /* .mpo_check_sysv_shmdt = sebsd_check_sysv_shmdt, */ + .mpo_check_sysv_shmget = sebsd_check_sysv_shmget, .mpo_check_mount_stat = sebsd_check_mount_stat, .mpo_check_pipe_ioctl = sebsd_check_pipe_ioctl, @@ -2557,10 +2557,10 @@ .mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr, /*.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf,*/ /*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/ - .mpo_cleanup_ipc_msgmsg = sebsd_cleanup_ipc_label, - .mpo_cleanup_ipc_msgqueue = sebsd_cleanup_ipc_label, - .mpo_cleanup_ipc_sema = sebsd_cleanup_ipc_label, - .mpo_cleanup_ipc_shm = sebsd_cleanup_ipc_label, + .mpo_cleanup_sysv_msgmsg = sebsd_cleanup_sysv_label, + .mpo_cleanup_sysv_msgqueue = sebsd_cleanup_sysv_label, + .mpo_cleanup_sysv_sema = sebsd_cleanup_sysv_label, + .mpo_cleanup_sysv_shm = sebsd_cleanup_sysv_label, .mpo_syscall = sebsd_syscall, }; From owner-p4-projects@FreeBSD.ORG Wed Nov 10 15:11:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C758A16A4D0; Wed, 10 Nov 2004 15:11:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3ED716A4CE for ; Wed, 10 Nov 2004 15:11:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 979EB43D49 for ; Wed, 10 Nov 2004 15:11:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAFBciA022651 for ; Wed, 10 Nov 2004 15:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAFBcOi022648 for perforce@freebsd.org; Wed, 10 Nov 2004 15:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 15:11:38 GMT Message-Id: <200411101511.iAAFBcOi022648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 15:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=64823 Change 64823 by rwatson@rwatson_tislabs on 2004/11/10 15:11:18 Correct type merge-o. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#19 (text+ko) ==== @@ -201,7 +201,7 @@ int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); void mac_create_devfs_device(struct ucred *cr, struct mount *mp, - struct ucred *dev, struct devfs_dirent *de, const char *fullpath); + struct cdev *dev, struct devfs_dirent *de, const char *fullpath); void mac_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, const char *fullpath); void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, From owner-p4-projects@FreeBSD.ORG Wed Nov 10 15:12:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CE2916A4D0; Wed, 10 Nov 2004 15:12:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A29616A4CE for ; Wed, 10 Nov 2004 15:12:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FAFF43D5C for ; Wed, 10 Nov 2004 15:12:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAFCeo7022670 for ; Wed, 10 Nov 2004 15:12:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAFCdxk022667 for perforce@freebsd.org; Wed, 10 Nov 2004 15:12:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 15:12:39 GMT Message-Id: <200411101512.iAAFCdxk022667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 15:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=64824 Change 64824 by rwatson@rwatson_tislabs on 2004/11/10 15:11:39 Re-wrap at 78 chars. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_devs.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_devs.c#8 (text+ko) ==== @@ -324,8 +324,8 @@ de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dev->si_cred, dm->dm_mount, dev, de, - dev->si_name); + mac_create_devfs_device(dev->si_cred, dm->dm_mount, + dev, de, dev->si_name); #endif *dep = de; de->de_dir = dd; From owner-p4-projects@FreeBSD.ORG Wed Nov 10 15:16:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE57316A4D0; Wed, 10 Nov 2004 15:16:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9AC416A4CE for ; Wed, 10 Nov 2004 15:16:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ED5E43D5A for ; Wed, 10 Nov 2004 15:16:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAFGjWp023024 for ; Wed, 10 Nov 2004 15:16:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAFGjvg023021 for perforce@freebsd.org; Wed, 10 Nov 2004 15:16:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Nov 2004 15:16:45 GMT Message-Id: <200411101516.iAAFGjvg023021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 15:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=64825 Change 64825 by rwatson@rwatson_tislabs on 2004/11/10 15:16:04 Remove duplicate definition of DRM_SUSER(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/dev/drm/drm_os_freebsd.h#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/dev/drm/drm_os_freebsd.h#11 (text+ko) ==== @@ -153,7 +153,6 @@ * code for that is not yet written */ #define DRMFILE void * #define DRM_IOCTL_ARGS struct cdev *kdev, u_long cmd, caddr_t data, int flags, DRM_STRUCTPROC *p, DRMFILE filp -#define DRM_SUSER(p) suser(p) #define DRM_SUSER(p) cap_check(p, CAP_SYS_RAWIO) #define DRM_TASKQUEUE_ARGS void *arg, int pending #define DRM_IRQ_ARGS void *arg From owner-p4-projects@FreeBSD.ORG Wed Nov 10 17:01:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26C1816A4D0; Wed, 10 Nov 2004 17:01:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E565B16A4CE for ; Wed, 10 Nov 2004 17:01:51 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C28943D55 for ; Wed, 10 Nov 2004 17:01:51 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.4.250] (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.13.1/8.13.1) with ESMTP id iAAH1hGT046827; Wed, 10 Nov 2004 09:01:43 -0800 (PST) (envelope-from marcel@xcllnt.net) In-Reply-To: <20041110.021844.34601722.imp@bsdimp.com> References: <200411070550.iA75o8Uq060242@repoman.freebsd.org> <20041110.021844.34601722.imp@bsdimp.com> Mime-Version: 1.0 (Apple Message framework v619) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <323321AD-333A-11D9-81D7-000D93C47836@xcllnt.net> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Wed, 10 Nov 2004 09:01:42 -0800 To: "M. Warner Losh" X-Mailer: Apple Mail (2.619) cc: Perforce Change Reviews Subject: Re: PERFORCE change 64481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 17:01:52 -0000 On Nov 10, 2004, at 1:18 AM, M. Warner Losh wrote: > : Add resource allocation and release related code. With this, > : uart(4) probes as a child of scc(4). Next, IRQ handling so > : that we can do something other than wait for the interrupt > : storm to pass over... > : > : + rle->res = malloc(sizeof(struct resource), M_SCC, > : + M_WAITOK | M_ZERO); > > We gotta find a way to put this in fewer drivers, not more... > Encoding sizeof struct resource is why you need > __RMAN_RESOURCE_VISIBLE, which generally shouldn't be defined. Agreed. I don't like it either. My first thought was to add a wrapper for the malloc and my second was that I don't want to get sidetracked right now. I'll get sidetracked for the newbus issues (the bus-specific interrupt handlers and adding a mechanism for time-multiplexing) that I still need to work out. I'll probably deal with the resource stuff then. If I can defer the newbus issues, I'll fix the resource stuff before I commit. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Wed Nov 10 17:20:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5CE16A4D0; Wed, 10 Nov 2004 17:20:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 365B216A4CE for ; Wed, 10 Nov 2004 17:20:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C3DB43D1F for ; Wed, 10 Nov 2004 17:20:14 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAHKEY3033934 for ; Wed, 10 Nov 2004 17:20:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAHKDOa033931 for perforce@freebsd.org; Wed, 10 Nov 2004 17:20:13 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 17:20:13 GMT Message-Id: <200411101720.iAAHKDOa033931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 17:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=64827 Change 64827 by sam@sam_ebb on 2004/11/10 17:19:40 use consistent naming Affected files ... .. //depot/projects/wifi/tools/tools/ath/athdebug.c#2 edit Differences ... ==== //depot/projects/wifi/tools/tools/ath/athdebug.c#2 (text+ko) ==== @@ -89,8 +89,8 @@ { "beacon", ATH_DEBUG_BEACON }, { "watchdog", ATH_DEBUG_WATCHDOG }, { "intr", ATH_DEBUG_INTR }, - { "tx_proc", ATH_DEBUG_TX_PROC }, - { "rx_proc", ATH_DEBUG_RX_PROC }, + { "xmit_proc", ATH_DEBUG_TX_PROC }, + { "recv_proc", ATH_DEBUG_RX_PROC }, { "beacon_proc",ATH_DEBUG_BEACON_PROC }, { "calibrate", ATH_DEBUG_CALIBRATE }, { "keycache", ATH_DEBUG_KEYCACHE }, From owner-p4-projects@FreeBSD.ORG Wed Nov 10 18:01:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 663FA16A4D0; Wed, 10 Nov 2004 18:01:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 432A216A4CE for ; Wed, 10 Nov 2004 18:01:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2314143D2D for ; Wed, 10 Nov 2004 18:01:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAI14HD035308 for ; Wed, 10 Nov 2004 18:01:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAI13EI035305 for perforce@freebsd.org; Wed, 10 Nov 2004 18:01:03 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 18:01:03 GMT Message-Id: <200411101801.iAAI13EI035305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 18:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=64829 Change 64829 by sam@sam_ebb on 2004/11/10 18:00:15 Fix if link state change handling: o move code from mii to if where it belongs o remove internal glop about mapping a link state change ot a knote o remove bogus link state change stuff from net80211 o add proper link state change notification to net80211 where it belongs With these changes dhclient no longer tries to get an ip address too soon and correctly re-acquires a lease when changing ap's. Affected files ... .. //depot/projects/wifi/sys/dev/mii/mii.c#2 edit .. //depot/projects/wifi/sys/net/if.c#3 edit .. //depot/projects/wifi/sys/net/if_var.h#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/mii/mii.c#2 (text+ko) ==== @@ -228,47 +228,30 @@ return; } -void (*vlan_link_state_p)(struct ifnet *, int); /* XXX: private from if_vlan */ - static void miibus_linkchg(dev) - device_t dev; + device_t dev; { - struct mii_data *mii; - struct ifnet *ifp; - device_t parent; - int link, link_state; + struct mii_data *mii; + device_t parent; + int link_state; parent = device_get_parent(dev); MIIBUS_LINKCHG(parent); mii = device_get_softc(dev); - /* - * Note that each NIC's softc must start with an ifnet structure. - */ - ifp = device_get_softc(parent); if (mii->mii_media_status & IFM_AVALID) { - if (mii->mii_media_status & IFM_ACTIVE) { - link = NOTE_LINKUP; + if (mii->mii_media_status & IFM_ACTIVE) link_state = LINK_STATE_UP; - } else { - link = NOTE_LINKDOWN; + else link_state = LINK_STATE_DOWN; - } - } else { - link = NOTE_LINKINV; + } else link_state = LINK_STATE_UNKNOWN; - } - - /* Notify that the link state has changed. */ - if (ifp->if_link_state != link_state) { - ifp->if_link_state = link_state; - rt_ifmsg(ifp); - KNOTE_UNLOCKED(&ifp->if_klist, link); - if (ifp->if_nvlans != 0) - (*vlan_link_state_p)(ifp, link); - } + /* + * Note that each NIC's softc must start with an ifnet structure. + */ + if_link_state_change(device_get_softc(parent), link_state); } static void ==== //depot/projects/wifi/sys/net/if.c#3 (text+ko) ==== @@ -953,6 +953,32 @@ #endif } +void (*vlan_link_state_p)(struct ifnet *, int); /* XXX: private from if_vlan */ + +/* + * Handle a change in the interface link state. + */ +void +if_link_state_change(struct ifnet *ifp, int link_state) +{ + int link; + + /* Notify that the link state has changed. */ + if (ifp->if_link_state != link_state) { + ifp->if_link_state = link_state; + rt_ifmsg(ifp); + if (link_state == LINK_STATE_UP) + link = NOTE_LINKUP; + else if (link_state == LINK_STATE_DOWN) + link = NOTE_LINKDOWN; + else + link = NOTE_LINKINV; + KNOTE_UNLOCKED(&ifp->if_klist, link); + if (ifp->if_nvlans != 0) + (*vlan_link_state_p)(ifp, link); + } +} + /* * Mark an interface down and notify protocols of * the transition. ==== //depot/projects/wifi/sys/net/if_var.h#4 (text+ko) ==== @@ -663,6 +663,7 @@ void if_detach(struct ifnet *); void if_down(struct ifnet *); void if_initname(struct ifnet *, const char *, int); +void if_link_state_change(struct ifnet *, int, int); int if_printf(struct ifnet *, const char *, ...) __printflike(2, 3); int if_setlladdr(struct ifnet *, const u_char *, int); void if_up(struct ifnet *); ==== //depot/projects/wifi/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -590,11 +590,8 @@ } imr->ifm_status = IFM_AVALID; imr->ifm_active = IFM_IEEE80211; - if (ic->ic_state == IEEE80211_S_RUN) { - ifp->if_link_state = LINK_STATE_UP; + if (ic->ic_state == IEEE80211_S_RUN) imr->ifm_status |= IFM_ACTIVE; - } else - ifp->if_link_state = LINK_STATE_DOWN; /* * Calculate a current rate if possible. */ ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#2 (text+ko) ==== @@ -121,6 +121,7 @@ rt_ieee80211msg(ifp, newassoc ? RTM_IEEE80211_ASSOC : RTM_IEEE80211_REASSOC, &iev, sizeof(iev)); + if_link_state_change(ifp, LINK_STATE_UP); } else if (newassoc) { /* fire off wireless event only for new station */ memset(&iev, 0, sizeof(iev)); @@ -137,6 +138,7 @@ if (ni == ic->ic_bss) { rt_ieee80211msg(ifp, RTM_IEEE80211_DISASSOC, NULL, 0); + if_link_state_change(ifp, LINK_STATE_DOWN); } else { /* fire off wireless event station leaving */ memset(&iev, 0, sizeof(iev)); From owner-p4-projects@FreeBSD.ORG Wed Nov 10 18:48:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84F0416A4D0; Wed, 10 Nov 2004 18:48:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6037C16A4CE for ; Wed, 10 Nov 2004 18:48:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5331343D45 for ; Wed, 10 Nov 2004 18:48:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAIm1HZ037351 for ; Wed, 10 Nov 2004 18:48:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAIm1tR037348 for perforce@freebsd.org; Wed, 10 Nov 2004 18:48:01 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 18:48:01 GMT Message-Id: <200411101848.iAAIm1tR037348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 18:48:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=64831 Change 64831 by sam@sam_ebb on 2004/11/10 18:47:23 correct initial recv rssi handling; fixes scanning problem where we selected the wrong station based on rssi Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#17 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#17 (text+ko) ==== @@ -2076,6 +2076,10 @@ /* XXX stat+msg */ return NULL; } + an->an_avgrssi = ATH_RSSI_DUMMY_MARKER; + an->an_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER; + an->an_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER; + an->an_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER; ath_rate_node_init(sc, an); DPRINTF(sc, ATH_DEBUG_NODE, "%s: an %p\n", __func__, an); @@ -2131,8 +2135,13 @@ u_int32_t avgrssi = ATH_NODE_CONST(ni)->an_avgrssi; int32_t rssi; - rssi = HAL_EP_RND(avgrssi, HAL_RSSI_EP_MULTIPLIER); - if (rssi == 0) + /* + * When only one frame is received there will be no state in + * avgrssi so fallback on the value recorded by the 802.11 layer. + */ + if (avgrssi != ATH_RSSI_DUMMY_MARKER) + rssi = HAL_EP_RND(avgrssi, HAL_RSSI_EP_MULTIPLIER); + else rssi = ni->ni_rssi; /* NB: theoretically we shouldn't need this, but be paranoid */ return rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; From owner-p4-projects@FreeBSD.ORG Wed Nov 10 20:31:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AABB716A4D0; Wed, 10 Nov 2004 20:31:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B9AF16A4CE for ; Wed, 10 Nov 2004 20:31:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21B5843D49 for ; Wed, 10 Nov 2004 20:31:40 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAKVePR041661 for ; Wed, 10 Nov 2004 20:31:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAKUcXe041560 for perforce@freebsd.org; Wed, 10 Nov 2004 20:30:38 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 10 Nov 2004 20:30:38 GMT Message-Id: <200411102030.iAAKUcXe041560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 64835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 20:31:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=64835 Change 64835 by jmallett@jmallett_beach on 2004/11/10 20:28:54 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#16 integrate .. //depot/projects/mips/Makefile#12 integrate .. //depot/projects/mips/Makefile.inc1#28 integrate .. //depot/projects/mips/UPDATING#21 integrate .. //depot/projects/mips/bin/Makefile.inc#4 integrate .. //depot/projects/mips/bin/cat/cat.c#5 integrate .. //depot/projects/mips/bin/chflags/Makefile#2 integrate .. //depot/projects/mips/bin/chflags/chflags.1#5 integrate .. //depot/projects/mips/bin/chflags/chflags.c#5 integrate .. //depot/projects/mips/bin/chio/chio.1#4 integrate .. //depot/projects/mips/bin/cp/cp.1#5 integrate .. //depot/projects/mips/bin/csh/config.h#2 integrate .. //depot/projects/mips/bin/date/date.1#5 integrate .. //depot/projects/mips/bin/date/vary.c#2 integrate .. //depot/projects/mips/bin/dd/args.c#6 integrate .. //depot/projects/mips/bin/dd/dd.1#5 integrate .. //depot/projects/mips/bin/dd/dd.c#7 integrate .. //depot/projects/mips/bin/dd/dd.h#5 integrate .. //depot/projects/mips/bin/dd/extern.h#4 integrate .. //depot/projects/mips/bin/df/df.1#5 integrate .. //depot/projects/mips/bin/df/df.c#11 integrate .. //depot/projects/mips/bin/domainname/domainname.1#3 integrate .. //depot/projects/mips/bin/echo/echo.1#5 integrate .. //depot/projects/mips/bin/ed/Makefile#4 integrate .. //depot/projects/mips/bin/ed/ed.1#3 integrate .. //depot/projects/mips/bin/expr/expr.1#4 integrate .. //depot/projects/mips/bin/hostname/hostname.1#3 integrate .. //depot/projects/mips/bin/kill/kill.1#3 integrate .. //depot/projects/mips/bin/ln/ln.1#3 integrate .. //depot/projects/mips/bin/ln/symlink.7#3 integrate .. //depot/projects/mips/bin/ls/cmp.c#4 integrate .. //depot/projects/mips/bin/ls/ls.1#11 integrate .. //depot/projects/mips/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/mips/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/mips/bin/pax/ar_io.c#6 integrate .. //depot/projects/mips/bin/pax/pax.1#5 integrate .. //depot/projects/mips/bin/ps/extern.h#7 integrate .. //depot/projects/mips/bin/ps/fmt.c#5 integrate .. //depot/projects/mips/bin/ps/keyword.c#9 integrate .. //depot/projects/mips/bin/ps/print.c#9 integrate .. //depot/projects/mips/bin/ps/ps.1#9 integrate .. //depot/projects/mips/bin/ps/ps.c#9 integrate .. //depot/projects/mips/bin/ps/ps.h#5 integrate .. //depot/projects/mips/bin/pwd/pwd.1#5 integrate .. //depot/projects/mips/bin/rcp/Makefile#4 integrate .. //depot/projects/mips/bin/rcp/rcp.1#3 integrate .. //depot/projects/mips/bin/rm/rm.1#4 integrate .. //depot/projects/mips/bin/rm/rm.c#6 integrate .. //depot/projects/mips/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/mips/bin/sh/bltin/echo.1#4 integrate .. //depot/projects/mips/bin/sh/exec.c#4 integrate .. //depot/projects/mips/bin/sh/sh.1#8 integrate .. //depot/projects/mips/bin/sh/var.c#5 integrate .. //depot/projects/mips/bin/stty/key.c#3 integrate .. //depot/projects/mips/bin/stty/stty.1#3 integrate .. //depot/projects/mips/bin/test/TEST.README#2 integrate .. //depot/projects/mips/bin/test/test.1#4 integrate .. //depot/projects/mips/contrib/amd/AUTHORS#3 integrate .. //depot/projects/mips/contrib/amd/BUGS#3 integrate .. //depot/projects/mips/contrib/amd/COPYING#3 integrate .. //depot/projects/mips/contrib/amd/ChangeLog#3 integrate .. //depot/projects/mips/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/contrib/amd/INSTALL#3 integrate .. //depot/projects/mips/contrib/amd/MIRRORS#3 delete .. //depot/projects/mips/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/mips/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/mips/contrib/amd/NEWS#3 integrate .. //depot/projects/mips/contrib/amd/README#3 integrate .. //depot/projects/mips/contrib/amd/README.y2k#2 integrate .. //depot/projects/mips/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/mips/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/mips/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/mips/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/map.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/mips/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/mips/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/mips/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/mips/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/mips/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/mips/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/mips/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/mips/contrib/amd/bootstrap#2 integrate .. //depot/projects/mips/contrib/amd/commit#2 delete .. //depot/projects/mips/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/mips/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/mips/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/mips/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/mips/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/mips/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/mips/contrib/amd/config.guess#2 delete .. //depot/projects/mips/contrib/amd/config.guess.long#2 delete .. //depot/projects/mips/contrib/amd/config.sub#2 delete .. //depot/projects/mips/contrib/amd/configure.in#2 delete .. //depot/projects/mips/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/mips/contrib/amd/depcomp#2 delete .. //depot/projects/mips/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/mips/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/mips/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/mips/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#5 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/mips/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/mips/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/mips/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/mips/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/mips/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/mips/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/mips/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/mips/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/mips/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/mips/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/mips/contrib/amd/install-sh#2 delete .. //depot/projects/mips/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/mips/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/mips/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/mips/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/mips/contrib/amd/ltmain.sh#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/mips/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/mips/contrib/amd/missing#2 delete .. //depot/projects/mips/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/mips/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/mips/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/mips/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/mips/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/mips/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/mips/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/mips/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/mips/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/mips/contrib/amd/scripts/lostaltmail.in#3 delete .. //depot/projects/mips/contrib/amd/tasks#3 integrate .. //depot/projects/mips/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/mips/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/mips/contrib/bind/CHANGES#6 delete .. //depot/projects/mips/contrib/bind/DNSSEC#2 delete .. //depot/projects/mips/contrib/bind/FREEBSD-Upgrade#3 delete .. //depot/projects/mips/contrib/bind/FREEBSD-Xlist#2 delete .. //depot/projects/mips/contrib/bind/INSTALL#2 delete .. //depot/projects/mips/contrib/bind/LICENSE#2 delete .. //depot/projects/mips/contrib/bind/Makefile#2 delete .. //depot/projects/mips/contrib/bind/README#5 delete .. //depot/projects/mips/contrib/bind/SUPPORT#2 delete .. //depot/projects/mips/contrib/bind/TODO#2 delete .. //depot/projects/mips/contrib/bind/Version#5 delete .. //depot/projects/mips/contrib/bind/bin/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/addr/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/addr/addr.c#2 delete .. //depot/projects/mips/contrib/bind/bin/dig/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/dig/dig.c#3 delete .. //depot/projects/mips/contrib/bind/bin/dnskeygen/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/dnskeygen/dnskeygen.c#2 delete .. //depot/projects/mips/contrib/bind/bin/dnsquery/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/dnsquery/dnsquery.c#3 delete .. //depot/projects/mips/contrib/bind/bin/host/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/host/host.c#3 delete .. //depot/projects/mips/contrib/bind/bin/irpd/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/irpd/irpd.c#2 delete .. //depot/projects/mips/contrib/bind/bin/irpd/irs-irpd.conf#2 delete .. //depot/projects/mips/contrib/bind/bin/irpd/version.c#2 delete .. //depot/projects/mips/contrib/bind/bin/mkservdb/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/mkservdb/mkservdb.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete .. //depot/projects/mips/contrib/bind/bin/named-bootconf/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/named-bootconf/named-bootconf.sh#2 delete .. //depot/projects/mips/contrib/bind/bin/named-bootconf/test.boot#2 delete .. //depot/projects/mips/contrib/bind/bin/named-xfer/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/named-xfer/named-xfer.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_defs.h#5 delete .. //depot/projects/mips/contrib/bind/bin/named/db_dump.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_func.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_glob.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_glue.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_ixfr.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/db_load.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/db_lookup.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_save.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_sec.c#5 delete .. //depot/projects/mips/contrib/bind/bin/named/db_tsig.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/db_update.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/named.conf#2 delete .. //depot/projects/mips/contrib/bind/bin/named/named.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_config.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_ctl.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_defs.h#5 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_forw.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_func.h#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_glob.h#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_glue.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_init.c#4 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_ixfr.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_lexer.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_lexer.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_main.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_maint.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_ncache.c#5 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_notify.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_parser.y#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_parseutil.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_parseutil.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_req.c#5 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_resp.c#6 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_signal.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_sort.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_stats.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_udp.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_update.c#3 delete .. //depot/projects/mips/contrib/bind/bin/named/ns_xfr.c#2 delete .. //depot/projects/mips/contrib/bind/bin/named/pathtemplate.h#2 delete .. //depot/projects/mips/contrib/bind/bin/named/test/127.0.0.zone#2 delete .. //depot/projects/mips/contrib/bind/bin/named/test/localhost.zone#2 delete .. //depot/projects/mips/contrib/bind/bin/named/test/named.conf#2 delete .. //depot/projects/mips/contrib/bind/bin/named/test/root.hint#2 delete .. //depot/projects/mips/contrib/bind/bin/named/version.c#2 delete .. //depot/projects/mips/contrib/bind/bin/ndc/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/ndc/ndc.c#3 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/commands.l#3 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/debug.c#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/getinfo.c#3 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/list.c#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/main.c#3 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/nslookup.help#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/pathnames.h#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/res.h#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/send.c#3 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/skip.c#2 delete .. //depot/projects/mips/contrib/bind/bin/nslookup/subr.c#2 delete .. //depot/projects/mips/contrib/bind/bin/nsupdate/Makefile#2 delete .. //depot/projects/mips/contrib/bind/bin/nsupdate/nsupdate.c#3 delete .. //depot/projects/mips/contrib/bind/doc/html/acl.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/address_list.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/comments.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/config.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/controls.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/docdef.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/example.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/include.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/index.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/key.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/logging.html#3 delete .. //depot/projects/mips/contrib/bind/doc/html/master.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/options.html#4 delete .. //depot/projects/mips/contrib/bind/doc/html/server.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/trusted-keys.html#2 delete .. //depot/projects/mips/contrib/bind/doc/html/zone.html#2 delete .. //depot/projects/mips/contrib/bind/doc/man/Makefile#2 delete .. //depot/projects/mips/contrib/bind/doc/man/dig.1#3 delete .. //depot/projects/mips/contrib/bind/doc/man/dnskeygen.1#2 delete .. //depot/projects/mips/contrib/bind/doc/man/dnsquery.1#2 delete .. //depot/projects/mips/contrib/bind/doc/man/getaddrinfo.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/gethostbyname.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/getipnodebyname.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/getnameinfo.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/getnetent.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/hesiod.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/host.1#2 delete .. //depot/projects/mips/contrib/bind/doc/man/hostname.7#2 delete .. //depot/projects/mips/contrib/bind/doc/man/inet_cidr.3#2 delete .. //depot/projects/mips/contrib/bind/doc/man/irs.conf.5#2 delete .. //depot/projects/mips/contrib/bind/doc/man/mailaddr.7#2 delete .. //depot/projects/mips/contrib/bind/doc/man/mkdep.1#2 delete .. //depot/projects/mips/contrib/bind/doc/man/named-bootconf.8#2 delete .. //depot/projects/mips/contrib/bind/doc/man/named-xfer.8#3 delete .. //depot/projects/mips/contrib/bind/doc/man/named.8#3 delete .. //depot/projects/mips/contrib/bind/doc/man/named.conf.5#4 delete .. //depot/projects/mips/contrib/bind/doc/man/ndc.8#2 delete .. //depot/projects/mips/contrib/bind/doc/man/nslookup.8#2 delete .. //depot/projects/mips/contrib/bind/doc/man/nsupdate.8#2 delete .. //depot/projects/mips/contrib/bind/doc/man/resolver.3#4 delete .. //depot/projects/mips/contrib/bind/doc/man/resolver.5#2 delete .. //depot/projects/mips/contrib/bind/doc/man/tsig.3#2 delete .. //depot/projects/mips/contrib/bind/doc/misc/DynamicUpdate#2 delete .. //depot/projects/mips/contrib/bind/doc/misc/FAQ.1of2#2 delete .. //depot/projects/mips/contrib/bind/doc/misc/FAQ.2of2#2 delete .. //depot/projects/mips/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete .. //depot/projects/mips/contrib/bind/doc/misc/style.txt#2 delete .. //depot/projects/mips/contrib/bind/include/Makefile#2 delete .. //depot/projects/mips/contrib/bind/include/arpa/Makefile#2 delete .. //depot/projects/mips/contrib/bind/include/arpa/inet.h#2 delete .. //depot/projects/mips/contrib/bind/include/arpa/nameser.h#3 delete .. //depot/projects/mips/contrib/bind/include/arpa/nameser_compat.h#3 delete .. //depot/projects/mips/contrib/bind/include/fd_setsize.h#2 delete .. //depot/projects/mips/contrib/bind/include/hesiod.h#3 delete .. //depot/projects/mips/contrib/bind/include/irp.h#3 delete .. //depot/projects/mips/contrib/bind/include/irs.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/Makefile#2 delete .. //depot/projects/mips/contrib/bind/include/isc/assertions.h#2 delete .. //depot/projects/mips/contrib/bind/include/isc/ctl.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/dst.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/eventlib.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/heap.h#2 delete .. //depot/projects/mips/contrib/bind/include/isc/irpmarshall.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/list.h#2 delete .. //depot/projects/mips/contrib/bind/include/isc/logging.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/mips/contrib/bind/include/isc/misc.h#3 delete .. //depot/projects/mips/contrib/bind/include/isc/tree.h#3 delete .. //depot/projects/mips/contrib/bind/include/netdb.h#2 delete .. //depot/projects/mips/contrib/bind/include/netgroup.h#3 delete .. //depot/projects/mips/contrib/bind/include/res_update.h#2 delete .. //depot/projects/mips/contrib/bind/include/resolv.h#3 delete .. //depot/projects/mips/contrib/bind/lib/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/README#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/bsafe_link.c#3 delete .. //depot/projects/mips/contrib/bind/lib/dst/cylink_link.c#3 delete .. //depot/projects/mips/contrib/bind/lib/dst/dst_api.c#3 delete .. //depot/projects/mips/contrib/bind/lib/dst/dst_internal.h#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/eay_dss_link.c#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/hmac_link.c#3 delete .. //depot/projects/mips/contrib/bind/lib/dst/md5.h#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/md5_dgst.c#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/md5_locl.h#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/prandom.c#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/rsaref_link.c#2 delete .. //depot/projects/mips/contrib/bind/lib/dst/support.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_addr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_cidr_pton.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_data.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_lnaof.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_makeaddr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_net_ntop.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_net_pton.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_neta.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_netof.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_network.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_ntoa.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_ntop.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/inet_pton.c#2 delete .. //depot/projects/mips/contrib/bind/lib/inet/nsap_addr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/Makefile.BSD#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/README#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_gr.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_ho.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_nw.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_pr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_pw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/dns_sv.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gai_strerror.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_gr.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_ho.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_ng.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_nw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_pr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_pw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gen_sv.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getaddrinfo.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/getgrent.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getgrent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/gethostent.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/gethostent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getnameinfo.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/getnetent.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getnetent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getnetgrent.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/getnetgrent_r.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/getprotoent.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getprotoent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getpwent.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getpwent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getservent.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/getservent_r.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/hesiod.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/hesiod_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_gr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_ho.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_ng.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_nw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_p.h#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_pr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_pw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irp_sv.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irpmarshall.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irs_data.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/irs_data.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/irs_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_gr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_ho.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_ng.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_nw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_pr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_pw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/lcl_sv.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_gr.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_ho.c#3 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_ng.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_nw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_pr.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_pw.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nis_sv.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/nul_ng.c#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/pathnames.h#2 delete .. //depot/projects/mips/contrib/bind/lib/irs/util.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/assertions.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/assertions.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/base64.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/bitncmp.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/bitncmp.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/ctl_clnt.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/ctl_p.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/ctl_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/ctl_srvr.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/ev_connects.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/ev_files.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/ev_streams.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/ev_timers.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/ev_waits.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/eventlib.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/eventlib.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/eventlib_p.h#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/heap.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/heap.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/hex.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/logging.c#3 delete .. //depot/projects/mips/contrib/bind/lib/isc/logging.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/logging_p.h#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/memcluster.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/memcluster.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/movefile.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/tree.c#2 delete .. //depot/projects/mips/contrib/bind/lib/isc/tree.mdoc#2 delete .. //depot/projects/mips/contrib/bind/lib/nameser/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_date.c#2 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_name.c#5 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_netint.c#2 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_parse.c#3 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_print.c#3 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_samedomain.c#5 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_sign.c#3 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_ttl.c#2 delete .. //depot/projects/mips/contrib/bind/lib/nameser/ns_verify.c#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/Makefile#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/herror.c#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_comp.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_data.c#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_debug.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_debug.h#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_findzonecut.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_init.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_mkquery.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_mkupdate.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_mkupdate.h#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_private.h#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_query.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_send.c#3 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_sendsigned.c#2 delete .. //depot/projects/mips/contrib/bind/lib/resolv/res_update.c#3 delete .. //depot/projects/mips/contrib/bind/port/Makefile#2 delete .. //depot/projects/mips/contrib/bind/port/README#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/Makefile#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/Makefile.set#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/bin/probe_ipv6#3 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/Makefile#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/port_after.h#3 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/port_before.h#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/prand_conf.h#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/sys/Makefile#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/noop.c#2 delete .. //depot/projects/mips/contrib/bind/port/freebsd/probe#2 delete .. //depot/projects/mips/contrib/bind/port/prand_conf/Makefile#2 delete .. //depot/projects/mips/contrib/bind/port/prand_conf/README#2 delete .. //depot/projects/mips/contrib/bind/port/prand_conf/prand_conf.c#2 delete .. //depot/projects/mips/contrib/bind/port/settings#2 delete .. //depot/projects/mips/contrib/bind/port/systype#2 delete .. //depot/projects/mips/contrib/bind/tests/irs_testclient.c#2 delete .. //depot/projects/mips/contrib/bind/tests/irs_testirpd.c#2 delete .. //depot/projects/mips/contrib/bind/tests/irs_testserver.c#2 delete .. //depot/projects/mips/contrib/bind/tests/test_cidr.c#2 delete .. //depot/projects/mips/contrib/bind/tests/test_getaddr.c#2 delete .. //depot/projects/mips/contrib/bind9/CHANGES#1 branch .. //depot/projects/mips/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/mips/contrib/bind9/FAQ#1 branch .. //depot/projects/mips/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/mips/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/mips/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/mips/contrib/bind9/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/README#1 branch .. //depot/projects/mips/contrib/bind9/acconfig.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/mips/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/mips/contrib/bind9/config.guess#1 branch .. //depot/projects/mips/contrib/bind9/config.sub#1 branch .. //depot/projects/mips/contrib/bind9/configure.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/mips/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3596.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3597.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3645.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3655.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3658.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3833.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3845.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc952.txt#1 branch .. //depot/projects/mips/contrib/bind9/install-sh#1 branch .. //depot/projects/mips/contrib/bind9/isc-config.sh.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/README#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/aclocal.m4#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/api#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/daemon.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/ftruncate.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/gettimeofday.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/mktemp.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/putenv.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/readv.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/setenv.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/setitimer.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strcasecmp.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strdup.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strerror.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strpbrk.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strsep.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/strtoul.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/utimes.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/bsd/writev.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/config.h.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/configure#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/configure.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/dst_api.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/dst_internal.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/hmac_link.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/md5.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/md5_dgst.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/md5_locl.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/dst/support.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/Makefile.in#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/arpa/inet.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/fd_setsize.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/hesiod.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/irp.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/include/irs.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 21:00:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04C1916A4D0; Wed, 10 Nov 2004 21:00:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D442316A4CE for ; Wed, 10 Nov 2004 21:00:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2FF643D1F for ; Wed, 10 Nov 2004 21:00:14 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAL0EG5048994 for ; Wed, 10 Nov 2004 21:00:14 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAL0E08048991 for perforce@freebsd.org; Wed, 10 Nov 2004 21:00:14 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 10 Nov 2004 21:00:14 GMT Message-Id: <200411102100.iAAL0E08048991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 64836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 21:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=64836 Change 64836 by jmallett@jmallett_beach on 2004/11/10 20:59:33 Be like the cool kids. Affected files ... .. //depot/projects/mips/gnu/usr.bin/Makefile#8 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/Makefile#8 (text+ko) ==== @@ -23,7 +23,8 @@ tar \ texinfo -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "mips" NO_GDB= # not yet .endif From owner-p4-projects@FreeBSD.ORG Wed Nov 10 21:14:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35DAD16A4D0; Wed, 10 Nov 2004 21:14:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1110E16A4CE for ; Wed, 10 Nov 2004 21:14:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D73E243D48 for ; Wed, 10 Nov 2004 21:14:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAALEWuF049567 for ; Wed, 10 Nov 2004 21:14:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAALEWFl049564 for perforce@freebsd.org; Wed, 10 Nov 2004 21:14:32 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 21:14:32 GMT Message-Id: <200411102114.iAALEWFl049564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 21:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=64838 Change 64838 by sam@sam_ebb on 2004/11/10 21:13:51 o overhaul sysctl stuff; root everything under net.wlan and add dynamic mib vars o fixup debugging msgs to use the per-instance control o lock virtual ap list and add dumb vap numbering for the dynamic sysctls (need to fix to reuse previously unallocated but unused numbers) o remove inactivity timer ioctls; use sysctls instead o fix bug reclaiming embryonic node state; don't free directly; use the refcnt mechanism like everywhere else Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include @@ -52,12 +51,6 @@ #include -#ifdef IEEE80211_DEBUG -int ieee80211_debug = 0; -SYSCTL_INT(_debug, OID_AUTO, ieee80211, CTLFLAG_RW, &ieee80211_debug, - 0, "IEEE 802.11 media debugging printfs"); -#endif - static void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); @@ -74,6 +67,9 @@ SLIST_HEAD(ieee80211_list, ieee80211com); static struct ieee80211_list ieee80211_list = SLIST_HEAD_INITIALIZER(ieee80211_list); +static int ieee80211_vap = 0; /* next avail vap number */ +static struct mtx ieee80211_vap_mtx; +MTX_SYSINIT(ieee80211, &ieee80211_vap_mtx, "net80211 instances", MTX_DEF); void ieee80211_ifattach(struct ieee80211com *ic) @@ -138,8 +134,12 @@ ieee80211_node_attach(ic); ieee80211_proto_attach(ic); - /* XXX lock */ + mtx_lock(&ieee80211_vap_mtx); + ic->ic_vap = ieee80211_vap++; /* XXX use bitmap */ SLIST_INSERT_HEAD(&ieee80211_list, ic, ic_next); + mtx_unlock(&ieee80211_vap_mtx); + + ieee80211_sysctl_attach(ic); /* NB: requires ic_vap */ } void @@ -147,9 +147,11 @@ { struct ifnet *ifp = ic->ic_ifp; - /* XXX lock */ + mtx_lock(&ieee80211_vap_mtx); SLIST_REMOVE(&ieee80211_list, ic, ieee80211com, ic_next); + mtx_unlock(&ieee80211_vap_mtx); + ieee80211_sysctl_detach(ic); ieee80211_proto_detach(ic); ieee80211_crypto_detach(ic); ieee80211_node_detach(ic); ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -46,6 +47,78 @@ #include +SYSCTL_NODE(_net, OID_AUTO, wlan, CTLFLAG_RD, 0, "IEEE 80211 parameters"); + +#ifdef IEEE80211_DEBUG +int ieee80211_debug = 0; +SYSCTL_INT(_net_wlan, OID_AUTO, debug, CTLFLAG_RW, &ieee80211_debug, + 0, "debugging printfs"); +#endif + +static int +ieee80211_sysctl_inact(SYSCTL_HANDLER_ARGS) +{ + int inact = (*(int *)arg1) * IEEE80211_INACT_WAIT; + int error; + + error = sysctl_handle_int(oidp, &inact, 0, req); + if (error || !req->newptr) + return error; + *(int *)arg1 = inact / IEEE80211_INACT_WAIT; + return 0; +} + +void +ieee80211_sysctl_attach(struct ieee80211com *ic) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid *oid; + char num[14]; /* sufficient for 32 bits */ + + MALLOC(ctx, struct sysctl_ctx_list *, sizeof(struct sysctl_ctx_list), + M_DEVBUF, M_NOWAIT | M_ZERO); + if (ctx == NULL) { + if_printf(ic->ic_ifp, "%s: cannot allocate sysctl context!\n", + __func__); + return; + } + sysctl_ctx_init(ctx); + snprintf(num, sizeof(num), "%u", ic->ic_vap); + /* XXX wlan.%d with vap support */ + oid = SYSCTL_ADD_NODE(ctx, &SYSCTL_NODE_CHILDREN(_net, wlan), + OID_AUTO, num, CTLFLAG_RD, NULL, ""); +#ifdef IEEE80211_DEBUG + ic->ic_debug = ieee80211_debug; + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "debug", CTLFLAG_RW, &ic->ic_debug, 0, + "control debugging printfs"); +#endif + /* XXX inherit from tunables */ + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "inact", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_run, 0, + ieee80211_sysctl_inact, "I", + "station inactivity timeout (sec)"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "inact_auth", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_auth, 0, + ieee80211_sysctl_inact, "I", + "station authentication timeout (sec)"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "inact_init", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_init, 0, + ieee80211_sysctl_inact, "I", + "station initial state timeout (sec)"); + ic->ic_sysctl = ctx; +} + +void +ieee80211_sysctl_detach(struct ieee80211com *ic) +{ + + if (ic->ic_sysctl != NULL) { + sysctl_ctx_free(ic->ic_sysctl); + ic->ic_sysctl = NULL; + } +} + int ieee80211_node_dectestref(struct ieee80211_node *ni) { ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#4 (text+ko) ==== @@ -94,6 +94,12 @@ extern void get_random_bytes(void *, size_t); +struct ieee80211com; + +void ieee80211_sysctl_attach(struct ieee80211com *); +void ieee80211_sysctl_detach(struct ieee80211com *); + +/* XXX this stuff belongs elsewhere */ /* * Message formats for messages from the net80211 layer to user * applications via the routing socket. These messages are appended ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#12 (text+ko) ==== @@ -1290,15 +1290,6 @@ case IEEE80211_IOC_STA_STATS: error = ieee80211_ioctl_getstastats(ic, ireq); break; - case IEEE80211_IOC_INACT: - ireq->i_val = ic->ic_inact_run * IEEE80211_INACT_WAIT; - break; - case IEEE80211_IOC_INACT_AUTH: - ireq->i_val = ic->ic_inact_auth * IEEE80211_INACT_WAIT; - break; - case IEEE80211_IOC_INACT_INIT: - ireq->i_val = ic->ic_inact_init * IEEE80211_INACT_WAIT; - break; case IEEE80211_IOC_STA_INFO: error = ieee80211_ioctl_getstainfo(ic, ireq); break; @@ -1974,15 +1965,6 @@ case IEEE80211_IOC_MACCMD: error = ieee80211_ioctl_maccmd(ic, ireq); break; - case IEEE80211_IOC_INACT: - ic->ic_inact_run = ireq->i_val / IEEE80211_INACT_WAIT; - break; - case IEEE80211_IOC_INACT_AUTH: - ic->ic_inact_auth = ireq->i_val / IEEE80211_INACT_WAIT; - break; - case IEEE80211_IOC_INACT_INIT: - ic->ic_inact_init = ireq->i_val / IEEE80211_INACT_WAIT; - break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#6 (text+ko) ==== @@ -377,9 +377,7 @@ #define IEEE80211_IOC_WPAIE 39 /* WPA information element */ #define IEEE80211_IOC_STA_STATS 40 /* per-station statistics */ #define IEEE80211_IOC_MACCMD 41 /* MAC ACL operation */ -#define IEEE80211_IOC_INACT 42 /* station inactivity timeout */ -#define IEEE80211_IOC_INACT_AUTH 43 /* station auth inact timeout */ -#define IEEE80211_IOC_INACT_INIT 44 /* station init inact timeout */ +/* 42-44 available */ #define IEEE80211_IOC_STA_INFO 45 /* station/neighbor info */ #ifndef IEEE80211_CHAN_ANY ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#11 (text+ko) ==== @@ -163,7 +163,7 @@ { if (ic->ic_bss != NULL) { - ic->ic_node_free(ic->ic_bss); + ieee80211_free_node(ic->ic_bss); ic->ic_bss = NULL; } ieee80211_node_table_cleanup(&ic->ic_scan); @@ -1657,7 +1657,7 @@ ieee80211_node_table_reset(struct ieee80211_node_table *nt) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, "%s %s table\n", __func__, nt->nt_name); IEEE80211_NODE_LOCK(nt); @@ -1670,7 +1670,7 @@ ieee80211_node_table_cleanup(struct ieee80211_node_table *nt) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, "%s %s table\n", __func__, nt->nt_name); ieee80211_free_allnodes_locked(nt); @@ -1684,7 +1684,7 @@ ieee80211_node_table_free(struct ieee80211_node_table *nt) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, "%s %s table\n", __func__, nt->nt_name); IEEE80211_NODE_LOCK(nt); ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#7 (text+ko) ==== @@ -187,12 +187,15 @@ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ struct ieee80211_aclator; +struct sysctl_ctx_list; struct ieee80211com { SLIST_ENTRY(ieee80211com) ic_next; struct ifnet *ic_ifp; /* associated device */ struct ieee80211_stats ic_stats; /* statistics */ + struct sysctl_ctx_list *ic_sysctl; /* dynamic sysctl context */ u_int32_t ic_debug; /* debug msg flags */ + int ic_vap; /* virtual AP index */ int (*ic_reset)(struct ifnet *); void (*ic_recv_mgmt)(struct ieee80211com *, @@ -257,7 +260,7 @@ * Inactivity timer settings for nodes. */ int ic_inact_init; /* initial setting */ - int ic_inact_auth; /* assoc but not auth setting */ + int ic_inact_auth; /* auth but not assoc setting */ int ic_inact_run; /* authorized setting */ /* @@ -395,7 +398,6 @@ #define IEEE80211_MSG_ANY 0xffffffff /* anything */ #ifdef IEEE80211_DEBUG -#ifdef notyet #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) do { \ if (_ic->ic_debug & (_m)) \ printf(_fmt, __VA_ARGS__); \ @@ -415,27 +417,6 @@ #define ieee80211_msg_scan(_ic) \ ((_ic)->ic_debug & IEEE80211_MSG_SCAN) #else -extern int ieee80211_debug; -#define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) do { \ - if (ieee80211_debug & (_m)) \ - printf(_fmt, __VA_ARGS__); \ -} while (0) -#define ieee80211_msg_debug(_ic) \ - (ieee80211_debug & IEEE80211_MSG_DEBUG) -#define ieee80211_msg_dumppkts(_ic) \ - (ieee80211_debug & IEEE80211_MSG_DUMPPKTS) -#define ieee80211_msg_input(_ic) \ - (ieee80211_debug & IEEE80211_MSG_INPUT) -#define ieee80211_msg_radius(_ic) \ - (ieee80211_debug & IEEE80211_MSG_RADIUS) -#define ieee80211_msg_dumpradius(_ic) \ - (ieee80211_debug & IEEE80211_MSG_RADDUMP) -#define ieee80211_msg_dumpradkeys(_ic) \ - (ieee80211_debug & IEEE80211_MSG_RADKEYS) -#define ieee80211_msg_scan(_ic) \ - (ieee80211_debug & IEEE80211_MSG_SCAN) -#endif -#else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) #endif From owner-p4-projects@FreeBSD.ORG Wed Nov 10 21:15:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C80CC16A568; Wed, 10 Nov 2004 21:15:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2BD716A566 for ; Wed, 10 Nov 2004 21:15:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 957DD43D3F for ; Wed, 10 Nov 2004 21:15:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAALFYwm049617 for ; Wed, 10 Nov 2004 21:15:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAALFYDM049614 for perforce@freebsd.org; Wed, 10 Nov 2004 21:15:34 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 21:15:34 GMT Message-Id: <200411102115.iAALFYDM049614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 21:15:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=64839 Change 64839 by sam@sam_ebb on 2004/11/10 21:14:51 remove inactivity timer stuff Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#8 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#8 (text+ko) ==== @@ -1199,33 +1199,6 @@ spacer = ' '; } } - - if (verbose) { - if (spacer != '\t') - printf("\n"); - spacer = '\t'; - } - - ireq.i_type = IEEE80211_IOC_INACT; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cinact%s %u", spacer, - verbose ? "(run)" : "", ireq.i_val); - spacer = ' '; - } - - if (verbose) { - ireq.i_type = IEEE80211_IOC_INACT_AUTH; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cinact(auth) %u", spacer, ireq.i_val); - spacer = ' '; - } - - ireq.i_type = IEEE80211_IOC_INACT_INIT; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cinact(init) %u", spacer, ireq.i_val); - spacer = ' '; - } - } } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { From owner-p4-projects@FreeBSD.ORG Wed Nov 10 21:16:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8371116A4D0; Wed, 10 Nov 2004 21:16:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FD1616A4CE for ; Wed, 10 Nov 2004 21:16:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5393743D39 for ; Wed, 10 Nov 2004 21:16:36 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAALGatp049667 for ; Wed, 10 Nov 2004 21:16:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAALGatu049664 for perforce@freebsd.org; Wed, 10 Nov 2004 21:16:36 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Nov 2004 21:16:36 GMT Message-Id: <200411102116.iAALGatu049664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 21:16:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=64840 Change 64840 by sam@sam_ebb on 2004/11/10 21:16:23 fixup mib var rename Affected files ... .. //depot/projects/wifi/tools/tools/ath/80211debug.c#2 edit Differences ... ==== //depot/projects/wifi/tools/tools/ath/80211debug.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ /* * 80211debug [-i interface] flags - * (default interface is wlan0). + * (default interface is wlan.0). */ #include @@ -159,11 +159,7 @@ #ifdef __linux__ snprintf(oid, sizeof(oid), "net.wlan%s.debug", ifname+3); #else -#if 0 - snprintf(oid, sizeof(oid), "dev.ath.%s.wlan0.debug", ifname+3); -#else - snprintf(oid, sizeof(oid), "debug.ieee80211"); -#endif + snprintf(oid, sizeof(oid), "net.wlan.%s.debug", ifname+3); #endif debuglen = sizeof(debug); if (sysctlbyname(oid, &debug, &debuglen, NULL, 0) < 0) From owner-p4-projects@FreeBSD.ORG Wed Nov 10 23:08:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C73DD16A4D0; Wed, 10 Nov 2004 23:08:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E6C916A4CE for ; Wed, 10 Nov 2004 23:08:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4738E43D39 for ; Wed, 10 Nov 2004 23:08:54 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAN8sXe055761 for ; Wed, 10 Nov 2004 23:08:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAN8rYU055758 for perforce@freebsd.org; Wed, 10 Nov 2004 23:08:53 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Nov 2004 23:08:53 GMT Message-Id: <200411102308.iAAN8rYU055758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 23:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=64846 Change 64846 by peter@peter_daintree on 2004/11/10 23:08:17 IFC @64845 Affected files ... .. //depot/projects/hammer/UPDATING#66 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#42 integrate .. //depot/projects/hammer/etc/rc.d/tmp#4 integrate .. //depot/projects/hammer/etc/rc.d/var#4 integrate .. //depot/projects/hammer/etc/rc.subr#20 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.1#7 integrate .. //depot/projects/hammer/include/Makefile#33 integrate .. //depot/projects/hammer/lib/Makefile#44 integrate .. //depot/projects/hammer/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/arm/gen/alloca.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/divsi3.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#4 integrate .. //depot/projects/hammer/lib/libc/arm/gen/sigsetjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/string/ffs.S#3 integrate .. //depot/projects/hammer/lib/libc/arm/string/memcmp.S#3 integrate .. //depot/projects/hammer/lib/libc/arm/string/memmove.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/string/strcmp.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/brk.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/fork.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/pipe.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/rand.3#4 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#19 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#14 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#14 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#8 integrate .. //depot/projects/hammer/sbin/Makefile#31 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#14 integrate .. //depot/projects/hammer/share/man/man4/acpi_video.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate .. //depot/projects/hammer/share/man/man4/ste.4#7 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#43 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#25 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#21 integrate .. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/fusu.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#6 integrate .. //depot/projects/hammer/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/hammer/sys/arm/include/asm.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#23 integrate .. //depot/projects/hammer/sys/conf/files#91 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#24 integrate .. //depot/projects/hammer/sys/conf/options.arm#3 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#18 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#21 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#8 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/hammer/sys/dev/esp/lsi64854.c#3 delete .. //depot/projects/hammer/sys/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/hammer/sys/dev/esp/lsi64854var.h#3 delete .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#16 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#27 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#12 integrate .. //depot/projects/hammer/sys/fs/autofs/autofs.h#4 delete .. //depot/projects/hammer/sys/fs/autofs/autofs_util.c#4 delete .. //depot/projects/hammer/sys/fs/autofs/autofs_vfsops.c#4 delete .. //depot/projects/hammer/sys/fs/autofs/autofs_vnops.c#4 delete .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#24 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#12 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/hammer/sys/geom/geom.h#31 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#21 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#36 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#61 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/libkern/arm/divsi3.S#3 integrate .. //depot/projects/hammer/sys/libkern/arm/ffs.S#3 integrate .. //depot/projects/hammer/sys/modules/Makefile#59 integrate .. //depot/projects/hammer/sys/modules/autofs/Makefile#3 delete .. //depot/projects/hammer/sys/modules/esp/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if_var.h#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#17 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#9 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#29 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#34 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#25 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#24 integrate .. //depot/projects/hammer/sys/pci/if_sfreg.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/hammer/sys/sys/conf.h#26 integrate .. //depot/projects/hammer/sys/sys/fdcio.h#4 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#22 integrate .. //depot/projects/hammer/sys/sys/rman.h#7 integrate .. //depot/projects/hammer/sys/sys/vnode.h#34 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_pager.h#8 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.8#5 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#5 integrate .. //depot/projects/hammer/usr.sbin/fdread/fdutil.c#6 integrate .. //depot/projects/hammer/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#8 integrate Differences ... ==== //depot/projects/hammer/UPDATING#66 (text+ko) ==== @@ -23,6 +23,14 @@ developers choose to disable these features on build machines to maximize performance. +20041110: + We have had a hack which would mount the root filesystem + R/W if the device were named 'md*'. As part of the vnode + work I'm doing I have had to remove this hack. People + building systems which use preloaded MD root filesystems + may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in + their /etc/rc scripts. + 20041102: The size of struct tcpcb has changed again due to the removal of RFC1644 T/TCP. You have to recompile userland programs that @@ -1961,4 +1969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.377 2004/11/02 22:22:22 andre Exp $ +$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ ==== //depot/projects/hammer/etc/defaults/rc.conf#42 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.229 2004/11/04 13:33:29 ru Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.231 2004/11/09 21:33:18 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,8 +40,10 @@ removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created +tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created +varmfs_flags="-S" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces ==== //depot/projects/hammer/etc/rc.d/tmp#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.34 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.35 2004/11/09 10:03:17 keramida Exp $ # # PROVIDE: tmp @@ -42,7 +42,7 @@ # case "${tmpmfs}" in [Yy][Ee][Ss]) - mount_md ${tmpsize} /tmp + mount_md ${tmpsize} /tmp "${tmpmfs_flags}" chmod 01777 /tmp ;; [Nn][Oo]) @@ -56,7 +56,7 @@ echo "dropping into shell, ^D to continue anyway." /bin/sh else - mount_md ${tmpsize} /tmp + mount_md ${tmpsize} /tmp "${tmpmfs_flags}" chmod 01777 /tmp fi fi ==== //depot/projects/hammer/etc/rc.d/var#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.34 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.35 2004/11/09 10:03:17 keramida Exp $ # # PROVIDE: var @@ -61,7 +61,7 @@ # case "${varmfs}" in [Yy][Ee][Ss]) - mount_md ${varsize} /var + mount_md ${varsize} /var "${varmfs_flags}" ;; [Nn][Oo]) ;; @@ -69,7 +69,7 @@ if (/bin/mkdir -p /var/.diskless 2> /dev/null); then rmdir /var/.diskless else - mount_md ${varsize} /var + mount_md ${varsize} /var "${varmfs_flags}" fi esac ==== //depot/projects/hammer/etc/rc.subr#20 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.31 2004/07/30 17:19:35 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.32 2004/11/09 10:03:17 keramida Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1289,12 +1289,12 @@ # as close as possible between 5-current and 4-stable. # $1 = size # $2 = mount point -# $3 = (optional) bytes-per-inode +# $3 = (optional) extra mdmfs flags mount_md() { if [ -n "$3" ]; then - bpi="-i $3" + flags="$3" fi - /sbin/mdmfs $bpi -s $1 -M md $2 + /sbin/mdmfs $flags -s $1 -M md $2 } fi ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $ GENSRCS+= xm.h LIBSRCS+= fbsd-proc.c gcore.c LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ - i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c + i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#5 (text+ko) ==== @@ -1,42 +1,50 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $ LIB= gdb INTERNALLIB= -SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ - bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \ - c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ - cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \ - cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \ - coffread.c complaints.c completer.c copying.c corefile.c \ - corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \ - dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \ - dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ - dwarf2read.c dwarfread.c elfread.c environ.c eval.c \ - event-loop.c event-top.c exec.c expprint.c f-exp.y f-lang.c \ - f-typeprint.c f-valprint.c findvar.c fork-child.c frame-base.c \ - frame-unwind.c frame.c gdb-events.c gdbarch.c gdbtypes.c \ - gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c inf-loop.c infcall.c \ - infcmd.c inflow.c infptrace.c infrun.c inftarg.c init.c \ - interps.c jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ - kod-cisco.c kod.c language.c linespec.c m2-exp.y m2-lang.c \ - m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c macroscope.c \ - macrotab.c main.c maint.c mdebugread.c mem-break.c memattr.c \ - mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c mi-cmd-file.c \ - mi-cmd-stack.c mi-cmd-var.c mi-cmds.c mi-console.c mi-getopt.c \ - mi-interp.c mi-main.c mi-out.c mi-parse.c mi-symbol-cmds.c \ - minsyms.c mipsread.c nlmread.c objc-exp.y objc-lang.c \ - objfiles.c observer.c osabi.c p-exp.y p-lang.c p-typeprint.c \ - p-valprint.c parse.c printcmd.c regcache.c reggroups.c remote.c \ - remote-fileio.c remote-utils.c scm-exp.c scm-lang.c \ - scm-valprint.c sentinel-frame.c ser-pipe.c ser-tcp.c ser-unix.c \ - serial.c signals.c solib.c solib-svr4.c source.c stabsread.c \ - stack.c std-regs.c symfile.c symmisc.c symtab.c target.c \ - thread.c top.c tracepoint.c trad-frame.c tui.c tui-command.c \ - tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \ - tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \ - tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ - tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ - utils.c valarith.c valops.c valprint.c values.c varobj.c \ +SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \ + bcache.c bfd-target.c block.c blockframe.c breakpoint.c \ + buildsym.c \ + c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ + cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \ + cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \ + coffread.c complaints.c completer.c copying.c corefile.c \ + corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \ + dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \ + dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ + dwarf2read.c dwarfread.c \ + elfread.c environ.c eval.c event-loop.c event-top.c exec.c \ + expprint.c \ + f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ + fork-child.c frame-base.c frame-unwind.c frame.c \ + gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \ + hpacc-abi.c \ + inf-loop.c infcall.c infcmd.c inflow.c infptrace.c infrun.c \ + inftarg.c init.c interps.c \ + jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ + kod-cisco.c kod.c \ + language.c linespec.c \ + m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c macrocmd.c \ + macroexp.c macroscope.c macrotab.c main.c maint.c mdebugread.c \ + mem-break.c memattr.c mi-cmd-break.c mi-cmd-disas.c \ + mi-cmd-env.c mi-cmd-file.c mi-cmd-stack.c mi-cmd-var.c \ + mi-cmds.c mi-console.c mi-getopt.c mi-interp.c mi-main.c \ + mi-out.c mi-parse.c mi-symbol-cmds.c minsyms.c mipsread.c \ + nlmread.c \ + objc-exp.y objc-lang.c objfiles.c observer.c osabi.c \ + p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \ + regcache.c reggroups.c remote-fileio.c remote-utils.c remote.c \ + scm-exp.c scm-lang.c scm-valprint.c sentinel-frame.c ser-pipe.c \ + ser-tcp.c ser-unix.c serial.c signals.c solib.c solib-svr4.c \ + source.c stabsread.c stack.c std-regs.c symfile.c symmisc.c \ + symtab.c \ + target.c thread.c top.c tracepoint.c trad-frame.c tui-command.c \ + tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \ + tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \ + tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ + tui-winsource.c tui.c typeprint.c \ + ui-file.c ui-out.c user-regs.c utils.c \ + valarith.c valops.c valprint.c values.c varobj.c \ wrapper.c ${LIBSRCS} GENSRCS= version.c ==== //depot/projects/hammer/gnu/usr.bin/grep/grep.1#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.25 2004/07/04 10:02:03 tjr Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.26 2004/11/09 17:00:06 keramida Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -312,8 +312,9 @@ This is especially useful for tools like zgrep, e.g. .B "gzip -cd foo.gz |grep --label=foo something" .TP -.BR \-\^\-line-buffering -Use line buffering, it can be a performance penality. +.BR \-\^\-line-buffered +Flush output on every line. +Note that this incurs a performance penalty. .TP .BR \-q ", " \-\^\-quiet ", " \-\^\-silent Quiet; do not write anything to standard output. ==== //depot/projects/hammer/include/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.227 2004/10/17 06:51:50 tjr Exp $ +# $FreeBSD: src/include/Makefile,v 1.228 2004/11/10 22:21:07 markm Exp $ # # Doing a "make install" builds /usr/include. @@ -44,7 +44,7 @@ netgraph/atm netgraph/netflow \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ - ufs/ffs ufs/ufs fs/autofs + ufs/ffs ufs/ufs .if !defined(NO_BLUETOOTH) LSUBSUBDIRS= netgraph/bluetooth/include ==== //depot/projects/hammer/lib/Makefile#44 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.194 2004/09/24 22:10:34 trhodes Exp $ +# $FreeBSD: src/lib/Makefile,v 1.195 2004/11/10 22:16:37 markm Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ - ${_libncp} ${_libngatm} libopie libpam libautofs libpanel libpcap \ + ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} ==== //depot/projects/hammer/lib/libc/arm/SYS.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)SYS.h 5.5 (Berkeley) 5/7/91 - * $FreeBSD: src/lib/libc/arm/SYS.h,v 1.1 2004/05/14 12:04:29 cognet Exp $ + * $FreeBSD: src/lib/libc/arm/SYS.h,v 1.2 2004/11/09 16:49:13 cognet Exp $ */ #include @@ -74,11 +74,11 @@ #define PSEUDO_NOERROR(x) \ _SYSCALL_NOERROR(x); \ - mov r15, r14 + RET #define PSEUDO(x) \ _SYSCALL(x); \ - mov r15, r14 + RET #define RSYSCALL_NOERROR(x) \ ==== //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.2 2004/11/05 23:53:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); /* * C library -- _setjmp, _longjmp @@ -64,11 +64,12 @@ stmia r0, {r4-r14} mov r0, #0x00000000 - mov r15, r14 + RET .L_setjmp_magic: .word _JB_MAGIC__SETJMP +WEAK_ALIAS(___longjmp, _longjmp) ENTRY(_longjmp) ldr r2, .L_setjmp_magic ldr r3, [r0], #4 @@ -96,7 +97,7 @@ mov r0, r1 teq r0, #0x00000000 moveq r0, #0x00000001 - mov r15, r14 + RET /* validation failed, die die die. */ botch: ==== //depot/projects/hammer/lib/libc/arm/gen/alloca.S#2 (text+ko) ==== @@ -35,11 +35,11 @@ /* like alloc, but automatic automatic free in return */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/alloca.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/alloca.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); ENTRY(alloca) add r0, r0, #0x00000007 /* round up to next 8 byte alignment */ bic r0, r0, #0x00000007 sub sp, sp, r0 /* Adjust the stack pointer */ mov r0, sp /* r0 = base of new space */ - mov r15, r14 /* return */ + RET ==== //depot/projects/hammer/lib/libc/arm/gen/divsi3.S#2 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/divsi3.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/divsi3.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); /* * stack is aligned as there's a possibility of branching to L_overflow @@ -47,7 +47,7 @@ /* XXX should cause a fatal error */ mvn r0, #0 #endif - mov pc, lr + RET ENTRY(__udivsi3) .L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -69,7 +69,7 @@ .L_divide_l0: /* r0 == 1 */ mov r0, r1 mov r1, #0 - mov pc, lr + RET ENTRY(__divsi3) .L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -373,7 +373,7 @@ movs ip, ip, lsl #1 bicmi r0, r0, #0x80000000 /* Fix incase we divided 0x80000000 */ rsbmi r0, r0, #0 - mov pc, lr + RET .L_udivide_l1: tst ip, #0x10000000 @@ -384,4 +384,4 @@ subhs r1, r1, r0 addhs r3, r3, r2 mov r0, r3 - mov pc, lr + RET ==== //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.3 2004/11/05 23:53:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.4 2004/11/09 16:49:14 cognet Exp $"); /* * C library -- setjmp, longjmp * @@ -47,7 +47,7 @@ ENTRY(setjmp) /* Block all signals and retrieve the old signal mask */ stmfd sp!, {r0, r14} - add r2, r0, #4 /* oset */ + add r2, r0, #(25 * 4) /* oset */ mov r0, #0x00000001 /* SIG_BLOCK */ mov r1, #0 /* set */ @@ -70,7 +70,7 @@ /* Store integer registers */ stmia r0, {r4-r14} mov r0, #0x00000000 - mov r15, r14 + RET .Lsetjmp_magic: .word _JB_MAGIC_SETJMP @@ -84,14 +84,12 @@ teq r2, r3 bne botch - /* Fetch signal mask */ - add r2, r0, #4 /* Set signal mask */ stmfd sp!, {r0, r1, r14} sub sp, sp, #4 /* align the stack */ - mov r1, r2 + add r1, r0, #(25 * 4) /* Signal mask */ mov r0, #3 /* SIG_SETMASK */ mov r2, #0 bl PIC_SYM(_C_LABEL(sigprocmask), PLT) @@ -122,7 +120,7 @@ mov r0, r1 teq r0, #0x00000000 moveq r0, #0x00000001 - mov r15, r14 + RET /* validation failed, die die die. */ botch: ==== //depot/projects/hammer/lib/libc/arm/gen/sigsetjmp.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/sigsetjmp.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/sigsetjmp.S,v 1.2 2004/11/09 16:44:57 cognet Exp $"); /* * C library -- sigsetjmp, siglongjmp @@ -52,6 +52,7 @@ .L_setjmp_magic: .word _JB_MAGIC__SETJMP +WEAK_ALIAS(__siglongjmp, siglongjmp) ENTRY(siglongjmp) ldr r2, .L_setjmp_magic ==== //depot/projects/hammer/lib/libc/arm/string/ffs.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.2 2004/11/07 16:54:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); /* * ffs - find first set bit, this algorithm isolates the first set @@ -62,7 +62,7 @@ /* now lookup in table indexed on top 6 bits of r0 */ ldrneb r0, [ r2, r0, lsr #26 ] - mov pc, lr + RET .text; .type .L_ffs_table, _ASM_TYPE_OBJECT; .L_ffs_table: @@ -78,5 +78,5 @@ #else clzne r0, r0 rsbne r0, r0, #32 - mov pc, lr + RET #endif ==== //depot/projects/hammer/lib/libc/arm/string/memcmp.S#3 (text+ko) ==== @@ -64,7 +64,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.2 2004/09/23 23:10:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); ENTRY(memcmp) mov ip, r0 @@ -77,7 +77,7 @@ /* Are both addresses aligned the same way? */ cmp r2, #0x00 eornes r3, ip, r1 - moveq pc, lr /* len == 0, or same addresses! */ + RETeq /* len == 0, or same addresses! */ tst r3, #0x03 subne r2, r2, #0x01 bne .Lmemcmp_bytewise2 /* Badly aligned. Do it the slow way */ @@ -93,25 +93,25 @@ ldrb r0, [ip], #0x01 ldrb r3, [r1], #0x01 subs r0, r0, r3 - movne pc, lr + RETne subs r2, r2, #0x01 - moveq pc, lr + RETeq /* Compare up to 2 bytes */ ldrb r0, [ip], #0x01 ldrb r3, [r1], #0x01 subs r0, r0, r3 - movne pc, lr + RETne subs r2, r2, #0x01 - moveq pc, lr + RETeq /* Compare 1 byte */ ldrb r0, [ip], #0x01 ldrb r3, [r1], #0x01 subs r0, r0, r3 - movne pc, lr + RETne subs r2, r2, #0x01 - moveq pc, lr + RETeq /* Compare 4 bytes at a time, if possible */ subs r2, r2, #0x04 @@ -127,7 +127,7 @@ /* Correct for extra subtraction, and check if done */ adds r2, r2, #0x04 cmpeq r0, #0x00 /* If done, did all bytes match? */ - moveq pc, lr /* Yup. Just return */ + RETeq /* Yup. Just return */ /* Re-do the final word byte-wise */ sub ip, ip, #0x04 @@ -142,7 +142,7 @@ cmpcs r0, r3 beq .Lmemcmp_bytewise2 sub r0, r0, r3 - mov pc, lr + RET #if defined(_KERNEL) && !defined(_STANDALONE) /* @@ -158,23 +158,23 @@ ldrb r2, [r1, #0x01] /* r2 = b2#1 */ subs r0, r0, r3 /* r0 = b1#0 - b2#0 */ ldreqb r3, [ip, #0x01] /* r3 = b1#1 */ - movne pc, lr /* Return if mismatch on #0 */ + RETne /* Return if mismatch on #0 */ subs r0, r3, r2 /* r0 = b1#1 - b2#1 */ ldreqb r3, [r1, #0x02] /* r3 = b2#2 */ ldreqb r0, [ip, #0x02] /* r0 = b1#2 */ - movne pc, lr /* Return if mismatch on #1 */ + RETne /* Return if mismatch on #1 */ ldrb r2, [r1, #0x03] /* r2 = b2#3 */ subs r0, r0, r3 /* r0 = b1#2 - b2#2 */ ldreqb r3, [ip, #0x03] /* r3 = b1#3 */ - movne pc, lr /* Return if mismatch on #2 */ + RETne /* Return if mismatch on #2 */ subs r0, r3, r2 /* r0 = b1#3 - b2#3 */ ldreqb r3, [r1, #0x04] /* r3 = b2#4 */ ldreqb r0, [ip, #0x04] /* r0 = b1#4 */ - movne pc, lr /* Return if mismatch on #3 */ + RETne /* Return if mismatch on #3 */ ldrb r2, [r1, #0x05] /* r2 = b2#5 */ subs r0, r0, r3 /* r0 = b1#4 - b2#4 */ ldreqb r3, [ip, #0x05] /* r3 = b1#5 */ - movne pc, lr /* Return if mismatch on #4 */ + RETne /* Return if mismatch on #4 */ sub r0, r3, r2 /* r0 = b1#5 - b2#5 */ - mov pc, lr + RET #endif ==== //depot/projects/hammer/lib/libc/arm/string/memmove.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memmove.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memmove.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); #ifndef _BCOPY /* LINTSTUB: Func: void *memmove(void *, const void *, size_t) */ @@ -53,7 +53,7 @@ #endif /* Do the buffers overlap? */ cmp r0, r1 - moveq pc, lr /* Bail now if src/dst are the same */ + RETeq /* Bail now if src/dst are the same */ subcc r3, r0, r1 /* if (dst > src) r3 = dst - src */ subcs r3, r1, r0 /* if (src > dsr) r3 = src - dst */ cmp r3, r2 /* if (r3 < len) we have an overlap */ @@ -64,7 +64,7 @@ bcc .Lmemmove_backwards moveq r0, #0 /* Quick abort for len=0 */ - moveq pc, lr + RETeq stmdb sp!, {r0, lr} /* memmove() returns dest addr */ subs r2, r2, #4 @@ -382,7 +382,7 @@ .Lmemmove_bl4: /* less than 4 bytes to go */ adds r2, r2, #4 - moveq pc, lr /* done */ + RETeq /* done */ /* copy the crud byte at a time */ cmp r2, #2 @@ -392,7 +392,7 @@ strgeb r3, [r0, #-1]! ldrgtb r3, [r1, #-1]! strgtb r3, [r0, #-1]! - mov pc, lr + RET /* erg - unaligned destination */ .Lmemmove_bdestul: ==== //depot/projects/hammer/lib/libc/arm/string/memset.S#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); /* * memset: Sets a block of memory to the specified value @@ -160,7 +160,7 @@ stmgeia ip!, {r2-r3} #endif bgt .Lmemset_loop128 - moveq pc, lr /* Zero length so just exit */ + RETeq /* Zero length so just exit */ add r1, r1, #0x80 /* Adjust for extra sub */ @@ -179,7 +179,7 @@ stmgeia ip!, {r2-r3} #endif bgt .Lmemset_loop32 - moveq pc, lr /* Zero length so just exit */ + RETeq /* Zero length so just exit */ adds r1, r1, #0x10 /* Partially adjust for extra sub */ @@ -191,7 +191,7 @@ stmgeia ip!, {r2-r3} stmgeia ip!, {r2-r3} #endif - moveq pc, lr /* Zero length so just exit */ + RETeq /* Zero length so just exit */ addlt r1, r1, #0x10 /* Possibly adjust for extra sub */ @@ -200,12 +200,12 @@ subs r1, r1, #0x04 strge r3, [ip], #0x04 bgt .Lmemset_loop4 - moveq pc, lr /* Zero length so just exit */ + RETeq /* Zero length so just exit */ #ifdef __XSCALE__ /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 - moveq pc, lr + RETeq cmp r1, #2 #else cmp r1, #-2 @@ -214,7 +214,7 @@ strb r3, [ip], #0x01 /* Set 1 byte */ strgeb r3, [ip], #0x01 /* Set another byte */ strgtb r3, [ip] /* and a third */ - mov pc, lr /* Exit */ + RET /* Exit */ .Lmemset_wordunaligned: rsb r2, r2, #0x004 @@ -228,9 +228,9 @@ .Lmemset_lessthanfour: cmp r1, #0x00 - moveq pc, lr /* Zero length so exit */ + RETeq /* Zero length so exit */ strb r3, [ip], #0x01 /* Set 1 byte */ cmp r1, #0x02 strgeb r3, [ip], #0x01 /* Set another byte */ strgtb r3, [ip] /* and a third */ - mov pc, lr /* Exit */ + RET /* Exit */ ==== //depot/projects/hammer/lib/libc/arm/string/strcmp.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/strcmp.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/strcmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); ENTRY(strcmp) 1: @@ -40,4 +40,4 @@ cmpcs r2, r3 beq 1b sub r0, r2, r3 - mov pc, lr + RET ==== //depot/projects/hammer/lib/libc/arm/string/strncmp.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); ENTRY(strncmp) /* if ((len - 1) < 0) return 0 */ @@ -48,4 +48,4 @@ cmpcs r2, r3 beq 1b sub r0, r2, r3 - mov pc, lr + RET ==== //depot/projects/hammer/lib/libc/arm/sys/brk.S#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/brk.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/brk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); #include "SYS.h" .globl _C_LABEL(end) @@ -87,7 +87,7 @@ /* Return 0 for success */ mov r0, #0x00000000 - mov r15, r14 + RET .align 2 #ifdef PIC ==== //depot/projects/hammer/lib/libc/arm/sys/cerror.S#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/cerror.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/cerror.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); #include "SYS.h" .globl _C_LABEL(__error) @@ -61,7 +61,7 @@ str r0, [r1] mvn r0, #0x00000000 mvn r1, #0x00000000 - mov pc, lr + RET #if 0 .align 0 ==== //depot/projects/hammer/lib/libc/arm/sys/fork.S#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/fork.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/fork.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); #include "SYS.h" /* @@ -46,4 +46,4 @@ _SYSCALL(fork) sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 10 23:18:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87C8916A4D0; Wed, 10 Nov 2004 23:18:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62AC616A4CE for ; Wed, 10 Nov 2004 23:18:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5564E43D46 for ; Wed, 10 Nov 2004 23:18:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANI6Mk056144 for ; Wed, 10 Nov 2004 23:18:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANI6IW056141 for perforce@freebsd.org; Wed, 10 Nov 2004 23:18:06 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Nov 2004 23:18:06 GMT Message-Id: <200411102318.iAANI6IW056141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 23:18:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64848 Change 64848 by peter@peter_daintree on 2004/11/10 23:17:32 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#50 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#14 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#22 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#50 (text+ko) ==== @@ -427,7 +427,7 @@ * returned. */ struct sf_buf * -sf_buf_alloc(struct vm_page *m, int pri) +sf_buf_alloc(struct vm_page *m, int flags) { return ((struct sf_buf *)m); ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#14 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Nov 10 23:25:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C683316A4FE; Wed, 10 Nov 2004 23:25:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85F0916A4DD for ; Wed, 10 Nov 2004 23:25:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63BEA43D45 for ; Wed, 10 Nov 2004 23:25:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANPFaV056743 for ; Wed, 10 Nov 2004 23:25:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANPFF7056740 for perforce@freebsd.org; Wed, 10 Nov 2004 23:25:15 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Nov 2004 23:25:15 GMT Message-Id: <200411102325.iAANPFF7056740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64849 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 23:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=64849 Change 64849 by peter@peter_daintree on 2004/11/10 23:24:15 fix mismerge Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#51 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#51 (text+ko) ==== @@ -427,7 +427,7 @@ * returned. */ struct sf_buf * -sf_buf_alloc(struct vm_page *m, int flags) +sf_buf_alloc(struct vm_page *m, int pri) { return ((struct sf_buf *)m); From owner-p4-projects@FreeBSD.ORG Wed Nov 10 23:27:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A14316A4D0; Wed, 10 Nov 2004 23:27:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66A0A16A4CE for ; Wed, 10 Nov 2004 23:27:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 575B343D39 for ; Wed, 10 Nov 2004 23:27:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANRIuR056828 for ; Wed, 10 Nov 2004 23:27:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANRIUk056825 for perforce@freebsd.org; Wed, 10 Nov 2004 23:27:18 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Nov 2004 23:27:18 GMT Message-Id: <200411102327.iAANRIUk056825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64850 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 23:27:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=64850 Change 64850 by peter@peter_daintree on 2004/11/10 23:26:58 kill cpu_reset_proxy stuff, sched_bind() to cpu0 does it better. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#52 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#52 (text+ko) ==== @@ -80,11 +80,6 @@ #include static void cpu_reset_real(void); -#ifdef SMP -static void cpu_reset_proxy(void); -static u_int cpu_reset_proxyid; -static volatile u_int cpu_reset_proxy_active; -#endif /* * Finish a fork operation, with process p2 nearly set up. @@ -332,22 +327,6 @@ /* * Force reset the processor by invalidating the entire address space! */ - -#ifdef SMP -static void -cpu_reset_proxy() -{ - - cpu_reset_proxy_active = 1; - while (cpu_reset_proxy_active == 1) - ; /* Wait for other cpu to see that we've started */ - stop_cpus((1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7BB916A4D0; Wed, 10 Nov 2004 23:42:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B352716A4CE for ; Wed, 10 Nov 2004 23:42:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A542E43D46 for ; Wed, 10 Nov 2004 23:42:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANgb68057496 for ; Wed, 10 Nov 2004 23:42:37 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANgboc057493 for perforce@freebsd.org; Wed, 10 Nov 2004 23:42:37 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Nov 2004 23:42:37 GMT Message-Id: <200411102342.iAANgboc057493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2004 23:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=64852 Change 64852 by peter@peter_daintree on 2004/11/10 23:41:55 move USER_LDT to done section with XXX note to point out that it is done via custom compat libs Affected files ... .. //depot/projects/hammer/TODO.txt#18 edit Differences ... ==== //depot/projects/hammer/TODO.txt#18 (text+ko) ==== @@ -1,12 +1,9 @@ -$P4: //depot/projects/hammer/TODO.txt#17 $ +$P4: //depot/projects/hammer/TODO.txt#18 $ reread the logs etc and check out the "XXX worry about this later" stuff performance tuning (segment registers etc at context switch time, pmap) -USER_LDT (however, there is a syscall to set the %fs and %gs base values - to arbitary 64 bit addresses). - ddb (needs a dwarf2 based unwinder to get stack traces and a disassembler) (peter: basic functionality, uses -fno-omit-frame-pointer.. disassembler still expects 32 bit code but compiles) @@ -32,6 +29,11 @@ "long" sysctls to translate. ======= DONE ======= + +USER_LDT (however, there is a syscall to set the %fs and %gs base values + to arbitary 64 bit addresses). + XXX; changed compat library implementations to not use user_ldt. + ppp(8) (compiler bug, hack in http://people.freebsd.org/~peter/hammer.diff, but gcc-3.3 would be much better) From owner-p4-projects@FreeBSD.ORG Thu Nov 11 03:49:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A32D716A4D0; Thu, 11 Nov 2004 03:49:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7694816A4CE for ; Thu, 11 Nov 2004 03:49:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 330BF43D48 for ; Thu, 11 Nov 2004 03:49:38 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAB3ncwK072056 for ; Thu, 11 Nov 2004 03:49:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAB3nbGL072053 for perforce@freebsd.org; Thu, 11 Nov 2004 03:49:37 GMT (envelope-from marcel@freebsd.org) Date: Thu, 11 Nov 2004 03:49:37 GMT Message-Id: <200411110349.iAB3nbGL072053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 03:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=64860 Change 64860 by marcel@marcel_nfs on 2004/11/11 03:49:01 IFC @64859 Affected files ... .. //depot/projects/uart/arm/arm/pmap.c#3 integrate .. //depot/projects/uart/arm/conf/IQ31244#4 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/uart/conf/files#33 integrate .. //depot/projects/uart/conf/files.sparc64#7 integrate .. //depot/projects/uart/conf/options.arm#2 integrate .. //depot/projects/uart/dev/ed/if_ed.c#5 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/uart/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/uart/dev/esp/lsi64854.c#2 delete .. //depot/projects/uart/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/uart/dev/esp/lsi64854var.h#2 delete .. //depot/projects/uart/fs/autofs/autofs.h#2 delete .. //depot/projects/uart/fs/autofs/autofs_util.c#2 delete .. //depot/projects/uart/fs/autofs/autofs_vfsops.c#3 delete .. //depot/projects/uart/fs/autofs/autofs_vnops.c#2 delete .. //depot/projects/uart/i386/i386/autoconf.c#3 integrate .. //depot/projects/uart/kern/vfs_mount.c#7 integrate .. //depot/projects/uart/modules/Makefile#13 integrate .. //depot/projects/uart/modules/autofs/Makefile#2 delete .. //depot/projects/uart/modules/esp/Makefile#2 integrate .. //depot/projects/uart/netgraph/ng_device.c#5 integrate .. //depot/projects/uart/pc98/conf/NOTES#6 integrate .. //depot/projects/uart/pci/if_sf.c#5 integrate .. //depot/projects/uart/pci/if_sfreg.h#3 integrate .. //depot/projects/uart/sparc64/sbus/lsi64854.c#2 integrate Differences ... ==== //depot/projects/uart/arm/arm/pmap.c#3 (text+ko) ==== @@ -144,8 +144,10 @@ */ /* Include header files */ +#include "opt_vm.h" + #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.15 2004/11/07 23:01:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.17 2004/11/10 22:11:08 cognet Exp $"); #include #include #include @@ -2811,7 +2813,6 @@ if (flags & KENTER_CACHE) *pte |= pte_l2_s_cache_mode; PTE_SYNC(pte); - cpu_dcache_wbinv_all(); /* XXX: shouldn't be needed */ } void @@ -2895,6 +2896,7 @@ KENTER_CACHE); va += PAGE_SIZE; } + cpu_dcache_wbinv_all(); /* XXX: shouldn't be needed */ } @@ -3392,7 +3394,6 @@ pmap_vac_me_harder(m, pmap, va); } - pmap_dcache_wbinv_all(pmap) /* XXX: Shouldn't be needed. */; vm_page_unlock_queues(); } @@ -3411,6 +3412,7 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { pmap_enter(pmap, va, m, VM_PROT_READ|VM_PROT_EXECUTE, FALSE); + pmap_dcache_wbinv_all(pmap); /* XXX: shouldn't be needed */ return (NULL); } ==== //depot/projects/uart/arm/conf/IQ31244#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.4 2004/11/07 23:02:15 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.5 2004/11/10 22:09:39 cognet Exp $ machine arm ident IQ31244 @@ -25,6 +25,7 @@ options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options STARTUP_PAGETABLE_ADDR=0xa0000000 +options ARM32_NEW_VM_LAYOUT include "../xscale/i80321/std.iq31244" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. ==== //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.2 2004/11/05 19:52:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.3 2004/11/10 22:09:39 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -105,7 +105,7 @@ #define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM) #define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1) -#define KERNEL_PT_VMDATA_NUM 4 +#define KERNEL_PT_VMDATA_NUM 10 #define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM) /* Define various stack sizes in pages */ @@ -262,8 +262,17 @@ freemempos -= PAGE_SIZE; valloc_pages(kernel_l1pt, L1_TABLE_SIZE / PAGE_SIZE); for (loop = 0; loop < NUM_KERNEL_PTS; ++loop) { - valloc_pages(kernel_pt_table[loop], - L2_TABLE_SIZE / PAGE_SIZE); + if (!(loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL))) { + valloc_pages(kernel_pt_table[loop], + L2_TABLE_SIZE / PAGE_SIZE); + } else { + kernel_pt_table[loop].pv_pa = freemempos - + (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) * + L2_TABLE_SIZE_REAL; + kernel_pt_table[loop].pv_va = + kernel_pt_table[loop].pv_pa + 0x20000000; + } + i++; } /* @@ -301,14 +310,14 @@ /* Map the L2 pages tables in the L1 page table */ - pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH & ~(0x00400000 - 1), + pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH & ~(0x00100000 - 1), &kernel_pt_table[KERNEL_PT_SYS]); for (i = 0; i < KERNEL_PT_KERNEL_NUM; i++) { - pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x00400000, + pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x00100000, &kernel_pt_table[KERNEL_PT_KERNEL + i]); } for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; ++loop) - pmap_link_l2pt(l1pagetable, KERNBASE + (i + loop) * 0x00400000, + pmap_link_l2pt(l1pagetable, KERNBASE + (i + loop) * 0x00100000, &kernel_pt_table[KERNEL_PT_VMDATA + loop]); pmap_link_l2pt(l1pagetable, IQ80321_IOPXS_VBASE, &kernel_pt_table[KERNEL_PT_IOPXS]); ==== //depot/projects/uart/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.961 2004/11/08 19:05:21 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.962 2004/11/10 19:54:17 markm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -853,9 +853,6 @@ dev/zs/zs.c optional zs dev/zs/zs_sbus.c optional zs fhc dev/zs/zs_sbus.c optional zs sbus -fs/autofs/autofs_vnops.c optional autofs -fs/autofs/autofs_vfsops.c optional autofs -fs/autofs/autofs_util.c optional autofs fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard ==== //depot/projects/uart/conf/files.sparc64#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.61 2004/10/25 10:29:56 yongari Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.62 2004/11/10 14:09:51 trhodes Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -15,7 +15,6 @@ dev/auxio/auxio.c optional auxio sbus dev/auxio/auxio.c optional auxio ebus dev/esp/esp_sbus.c optional esp sbus -dev/esp/lsi64854.c optional esp sbus dev/fb/creator.c optional creator sc dev/fb/fb.c optional sc dev/fb/splash.c optional splash @@ -68,6 +67,7 @@ sparc64/pci/ofw_pci_if.m standard sparc64/pci/psycho.c optional pci sparc64/sbus/sbus.c optional sbus +sparc64/sbus/lsi64854.c optional esp sbus sparc64/sparc64/autoconf.c standard sparc64/sparc64/bus_machdep.c standard sparc64/sparc64/cache.c standard ==== //depot/projects/uart/conf/options.arm#2 (text+ko) ==== @@ -1,4 +1,6 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.2 2004/09/23 22:52:25 cognet Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.3 2004/11/10 22:08:27 cognet Exp $ +ARM32_NEW_VM_LAYOUT opt_vm.h +ARM9_CACHE_WRITE_THROUGH opt_global.h ARMFPE opt_global.h CPU_SA1100 opt_global.h CPU_SA1110 opt_global.h ==== //depot/projects/uart/dev/ed/if_ed.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.234 2004/09/06 21:14:32 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.235 2004/11/10 13:16:12 nyan Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -370,8 +370,8 @@ if (error) return (error); -#if ED_DEBUG - printf("type = %x type_str=%s isa16bit=%d memsize=%d id_msize=%d\n", +#ifdef ED_DEBUG + printf("type = %x type_str=%s isa16bit=%d memsize=%d id_msize=%lu\n", sc->type, sc->type_str, isa16bit, memsize, conf_msize); for (i = 0; i < 8; i++) printf("%x -> %x\n", i, ed_asic_inb(sc, i)); ==== //depot/projects/uart/dev/ed/if_ed_cbus.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.12 2003/10/31 18:31:58 brooks Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.13 2004/11/10 13:16:12 nyan Exp $ */ #include @@ -1682,7 +1682,7 @@ ed_nic_outb(sc, ED_P0_PSTART, page_offset / ED_PAGE_SIZE); ed_nic_outb(sc, ED_P0_PSTOP, (page_offset + memsize) / ED_PAGE_SIZE); #ifdef ED_DEBUG - printf("ed?: ed_pio_testmem: page start=%x, end=%x", + printf("ed?: ed_pio_testmem: page start=%x, end=%lx", page_offset, page_offset + memsize); #endif ==== //depot/projects/uart/dev/esp/esp_sbus.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.7 2004/09/13 15:15:38 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.8 2004/11/10 14:11:10 trhodes Exp $"); #include #include @@ -82,14 +82,14 @@ #include #include #include -#include #include #include #include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/uart/i386/i386/autoconf.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/autoconf.c,v 1.179 2004/10/01 15:57:23 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/autoconf.c,v 1.180 2004/11/10 12:28:06 nyan Exp $"); /* * Setup the system to run on the current machine. @@ -130,8 +130,8 @@ if (bootverbose) { #ifdef PC98 - { int i; + /* * Print out the BIOS's idea of the disk geometries. */ @@ -147,11 +147,7 @@ * when the get-disk-geometry interrupt fails. Skip * drives that have this geometry. */ -#ifdef PC98 if (bios_geom == 0x4f020f) -#else - if (bios_geom == 0x4f010f) -#endif continue; printf(" %x:%08lx ", i, bios_geom); @@ -165,7 +161,6 @@ max_sector, max_sector); } printf(" %d accounted for\n", bootinfo.bi_n_bios_used); - } #endif printf("Device configuration finished.\n"); ==== //depot/projects/uart/kern/vfs_mount.c#7 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.146 2004/11/10 07:36:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.147 2004/11/10 09:56:28 phk Exp $"); #include #include @@ -1290,7 +1290,6 @@ { struct mount *mp; char *vfsname, *path; - const char *devname; int error; char patt[32]; int s; ==== //depot/projects/uart/modules/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.406 2004/11/08 19:05:22 phk Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.407 2004/11/10 19:54:18 markm Exp $ # pcic -- currently broken and being worked on out of tree. # oldcard -- specialized use for debugging only. @@ -27,7 +27,6 @@ ath \ ${_ath_hal} \ aue \ - autofs \ ${_auxio} \ ${_awi} \ axe \ ==== //depot/projects/uart/modules/esp/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/modules/esp/Makefile,v 1.3 2004/08/12 17:41:30 marius Exp $ +# $FreeBSD: src/sys/modules/esp/Makefile,v 1.4 2004/11/10 14:09:51 trhodes Exp $ -.PATH: ${.CURDIR}/../../dev/esp +.PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus KMOD= esp ==== //depot/projects/uart/netgraph/ng_device.c#5 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2002 Mark Santcroos + * Copyright (c) 2004 Gleb Smirnoff * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,7 +27,7 @@ * This node presents a /dev/ngd%d device that interfaces to an other * netgraph node. * - * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.14 2004/10/31 17:32:51 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.15 2004/11/10 11:18:05 glebius Exp $ * */ ==== //depot/projects/uart/pc98/conf/NOTES#6 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.43 2004/09/02 12:50:47 ru Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.44 2004/11/10 12:24:30 nyan Exp $ # # @@ -88,9 +88,11 @@ # I/O device(s). # # CPU_DISABLE_CMPXCHG disables the CMPXCHG instruction on > i386 IA32 -# machines. VmWare seems to emulate this instruction poorly, causing -# the guest OS to run very slowly. Enabling this with an SMP kernel -# will cause the kernel to be unusable. +# machines. VmWare 3.x seems to emulate this instruction poorly, causing +# the guest OS to run very slowly. This problem appears to be fixed in +# VmWare 4.x, at least in version 4.5.2, so that enabling this option with +# VmWare 4.x will result in locking operations to be 20-30 times slower. +# Enabling this with an SMP kernel will cause the kernel to be unusable. # # CPU_DISABLE_SSE explicitly prevents I686_CPU from turning on SSE. # ==== //depot/projects/uart/pci/if_sf.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.73 2004/08/28 15:10:35 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.74 2004/11/10 23:04:39 brueffer Exp $"); /* * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD. @@ -164,6 +164,12 @@ static int sf_miibus_readreg (device_t, int, int); static int sf_miibus_writereg (device_t, int, int, int); static void sf_miibus_statchg (device_t); +#ifdef DEVICE_POLLING +static void sf_poll (struct ifnet *ifp, enum poll_cmd cmd, + int count); +static void sf_poll_locked (struct ifnet *ifp, enum poll_cmd cmd, + int count); +#endif /* DEVICE_POLLING */ static u_int32_t csr_read_4 (struct sf_softc *, int); static void csr_write_4 (struct sf_softc *, int, u_int32_t); @@ -534,6 +540,10 @@ mii = device_get_softc(sc->sf_miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); break; + case SIOCSIFCAP: + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; + break; default: error = ether_ioctl(ifp, command, data); break; @@ -714,6 +724,10 @@ ifp->if_init = sf_init; ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = SF_TX_DLIST_CNT - 1; +#ifdef DEVICE_POLLING + ifp->if_capabilities |= IFCAP_POLLING; +#endif /* DEVICE_POLLING */ + ifp->if_capenable = ifp->if_capabilities; /* * Call MI attach routine. @@ -903,6 +917,14 @@ while (cmpconsidx != cmpprodidx) { struct mbuf *m0; +#ifdef DEVICE_POLLING + if (ifp->if_flags & IFF_POLLING) { + if (sc->rxcycles <= 0) + break; + sc->rxcycles--; + } +#endif /* DEVICE_POLLING */ + cur_rx = &sc->sf_ldata->sf_rx_clist[cmpconsidx]; desc = &sc->sf_ldata->sf_rx_dlist_big[cur_rx->sf_endidx]; m = desc->sf_mbuf; @@ -1010,6 +1032,63 @@ } } +#ifdef DEVICE_POLLING +static void +sf_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct sf_softc *sc = ifp->if_softc; + + SF_LOCK(sc); + sf_poll_locked(ifp, cmd, count); + SF_UNLOCK(sc); +} + +static void +sf_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct sf_softc *sc = ifp->if_softc; + + SF_LOCK_ASSERT(sc); + + if (!(ifp->if_capenable & IFCAP_POLLING)) { + ether_poll_deregister(ifp); + cmd = POLL_DEREGISTER; + } + + if (cmd == POLL_DEREGISTER) { + /* Final call, enable interrupts. */ + csr_write_4(sc, SF_IMR, SF_INTRS); + return; + } + + sc->rxcycles = count; + sf_rxeof(sc); + sf_txeof(sc); + if (ifp->if_snd.ifq_head != NULL) + sf_start(ifp); + + if (cmd == POLL_AND_CHECK_STATUS) { + u_int32_t status; + + status = csr_read_4(sc, SF_ISR); + if (status) + csr_write_4(sc, SF_ISR, status); + + if (status & SF_ISR_TX_LOFIFO) + sf_txthresh_adjust(sc); + + if (status & SF_ISR_ABNORMALINTR) { + if (status & SF_ISR_STATSOFLOW) { + untimeout(sf_stats_update, sc, + sc->sf_stat_ch); + sf_stats_update(sc); + } else + sf_init(sc); + } + } +} +#endif /* DEVICE_POLLING */ + static void sf_intr(arg) void *arg; @@ -1023,6 +1102,19 @@ ifp = &sc->arpcom.ac_if; +#ifdef DEVICE_POLLING + if (ifp->if_flags & IFF_POLLING) + goto done_locked; + + if ((ifp->if_capenable & IFCAP_POLLING) && + ether_poll_register(sf_poll, ifp)) { + /* OK, disable interrupts. */ + csr_write_4(sc, SF_IMR, 0x00000000); + sf_poll_locked(ifp, 0, 1); + goto done_locked; + } +#endif /* DEVICE_POLLING */ + if (!(csr_read_4(sc, SF_ISR_SHADOW) & SF_ISR_PCIINT_ASSERTED)) { SF_UNLOCK(sc); return; @@ -1066,6 +1158,9 @@ if (ifp->if_snd.ifq_head != NULL) sf_start(ifp); +#ifdef DEVICE_POLLING +done_locked: +#endif /* DEVICE_POLLING */ SF_UNLOCK(sc); } @@ -1163,6 +1258,13 @@ /* Enable autopadding of short TX frames. */ SF_SETBIT(sc, SF_MACCFG_1, SF_MACCFG1_AUTOPAD); +#ifdef DEVICE_POLLING + /* Disable interrupts if we are polling. */ + if (ifp->if_flags & IFF_POLLING) + csr_write_4(sc, SF_IMR, 0x00000000); + else +#endif /* DEVICE_POLLING */ + /* Enable interrupts. */ csr_write_4(sc, SF_IMR, SF_INTRS); SF_SETBIT(sc, SF_PCI_DEVCFG, SF_PCIDEVCFG_INTR_ENB); @@ -1339,6 +1441,10 @@ untimeout(sf_stats_update, sc, sc->sf_stat_ch); +#ifdef DEVICE_POLLING + ether_poll_deregister(ifp); +#endif /* DEVICE_POLLING */ + csr_write_4(sc, SF_GEN_ETH_CTL, 0); csr_write_4(sc, SF_CQ_CONSIDX, 0); csr_write_4(sc, SF_CQ_PRODIDX, 0); ==== //depot/projects/uart/pci/if_sfreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.10 2003/11/14 19:00:31 sam Exp $ + * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.11 2004/11/10 23:04:39 brueffer Exp $ */ /* @@ -1046,6 +1046,9 @@ int sf_if_flags; struct callout_handle sf_stat_ch; struct mtx sf_mtx; +#ifdef DEVICE_POLLING + int rxcycles; +#endif }; ==== //depot/projects/uart/sparc64/sbus/lsi64854.c#2 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/lsi64854.c,v 1.1 2004/06/10 05:11:39 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/lsi64854.c,v 1.2 2004/11/10 14:09:52 trhodes Exp $"); #include #include @@ -80,8 +80,8 @@ #include #include -#include -#include +#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Nov 11 17:16:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0C416A4D1; Thu, 11 Nov 2004 17:16:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB15216A4CE for ; Thu, 11 Nov 2004 17:16:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA88E43D39 for ; Thu, 11 Nov 2004 17:16:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABHGuV1025183 for ; Thu, 11 Nov 2004 17:16:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABHGu7H025180 for perforce@freebsd.org; Thu, 11 Nov 2004 17:16:56 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Nov 2004 17:16:56 GMT Message-Id: <200411111716.iABHGu7H025180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 17:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=64879 Change 64879 by jhb@jhb_slimer on 2004/11/11 17:16:29 Use better initial pstate. Affected files ... .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#6 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/sparc64/critical.c#6 (text+ko) ==== @@ -51,5 +51,5 @@ struct thread *td; td = curthread; - td->td_md.md_savecrit = 0; + td->td_md.md_savecrit = PSTATE_KERNEL; } From owner-p4-projects@FreeBSD.ORG Thu Nov 11 17:47:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00EC116A4D1; Thu, 11 Nov 2004 17:47:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B66EB16A4CE for ; Thu, 11 Nov 2004 17:47:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98FC943D1F for ; Thu, 11 Nov 2004 17:47:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABHlZ1h026462 for ; Thu, 11 Nov 2004 17:47:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABHlZCZ026459 for perforce@freebsd.org; Thu, 11 Nov 2004 17:47:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Nov 2004 17:47:35 GMT Message-Id: <200411111747.iABHlZCZ026459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 17:47:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=64883 Change 64883 by jhb@jhb_slimer on 2004/11/11 17:47:05 - Provide a function to adjust the TPR for the current CPU. - Shuffle the IPI and local interrupts a bit so that the handlers that use spin locks (the ones related to clock) are all lower than the IPI handlers that can safely be allowed to fire while holding a spin lock. (More on this later.) Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#15 edit .. //depot/projects/smpng/sys/i386/include/apicvar.h#7 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#15 (text+ko) ==== @@ -60,7 +60,8 @@ #define MAX_APICID 16 /* Sanity checks on IDT vectors. */ -CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS <= APIC_LOCAL_INTS); +CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_CLOCK_INTS); +CTASSERT(APIC_CLOCK_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); /* @@ -264,10 +265,8 @@ /* XXX: more LVT entries */ - /* Clear the TPR. */ - value = lapic->tpr; - value &= ~APIC_TPR_PRIO; - lapic->tpr = value; + /* Initialize the TPR to allow all interrupts. */ + lapic_set_tpr(0); /* Use the cluster model for logical IDs. */ value = lapic->dfr; @@ -472,6 +471,24 @@ return (0); } +/* + * Adjust the TPR of the current CPU so that it blocks all interrupts below + * the passed in vector. + */ +void +lapic_set_tpr(u_int vector) +{ +#ifdef CHEAP_TPR + lapic->tpr = vector; +#else + u_int32_t tpr; + + tpr = lapic->tpr & ~APIC_TPR_PRIO; + tpr |= vector; + lapic->tpr = tpr; +#endif +} + void lapic_eoi(void) { @@ -637,10 +654,9 @@ #ifdef SMP /* * Inter Processor Interrupt functions. The lapic_ipi_*() functions are - * private the sys/i386 code. The public interface for the rest of the + * private to the sys/i386 code. The public interface for the rest of the * kernel is defined in mp_machdep.c. */ - int lapic_ipi_wait(int delay) { ==== //depot/projects/smpng/sys/i386/include/apicvar.h#7 (text+ko) ==== @@ -78,24 +78,38 @@ */ #define APIC_ID_ALL 0xff + +/* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) #define APIC_NUM_IOINTS 192 -#define APIC_LOCAL_INTS 240 -#define APIC_TIMER_INT APIC_LOCAL_INTS -#define APIC_ERROR_INT (APIC_LOCAL_INTS + 1) -#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 2) +/* Clock interrupts are used for clock handling and drive hardclock, etc. */ +#define APIC_CLOCK_INTS (APIC_IO_INTS + APIC_NUM_IOINTS) +#define APIC_TIMER_INT APIC_CLOCK_INTS +#define IPI_HARDCLOCK (APIC_CLOCK_INTS + 1) /* Inter-CPU clock handling. */ +#define IPI_STATCLOCK (APIC_CLOCK_INTS + 2) + +/* + * These interrupt handlers are for IPIs and local interrupts whose handlers + * do not use any spin locks, so they may still be allowed when a spin lock + * is held. + */ +#define APIC_LOCK_SAFE_INTS (APIC_CLOCK_INTS + 3) + +/* Interrupts for local APIC LVT entries other than the timer. */ +#define APIC_LOCAL_INTS APIC_LOCK_SAFE_INTS +#define APIC_ERROR_INT APIC_LOCAL_INTS +#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) -#define APIC_IPI_INTS (APIC_LOCAL_INTS + 3) +/* Spin lock safe IPIs. */ +#define APIC_IPI_INTS (APIC_LOCAL_INTS + 2) #define IPI_AST APIC_IPI_INTS /* Generate software trap. */ #define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) #define IPI_LAZYPMAP (APIC_IPI_INTS + 4) /* Lazy pmap release. */ -#define IPI_HARDCLOCK (APIC_IPI_INTS + 8) /* Inter-CPU clock handling. */ -#define IPI_STATCLOCK (APIC_IPI_INTS + 9) -#define IPI_RENDEZVOUS (APIC_IPI_INTS + 10) /* Inter-CPU rendezvous. */ -#define IPI_STOP (APIC_IPI_INTS + 11) /* Stop CPU until restarted. */ +#define IPI_RENDEZVOUS (APIC_IPI_INTS + 5) /* Inter-CPU rendezvous. */ +#define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */ #define APIC_SPURIOUS_INT 255 @@ -173,6 +187,7 @@ enum intr_polarity pol); int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger); +void lapic_set_tpr(u_int vector); void lapic_setup(void); #endif /* !LOCORE */ From owner-p4-projects@FreeBSD.ORG Thu Nov 11 17:50:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FC0516A4D1; Thu, 11 Nov 2004 17:50:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3CE816A4CE for ; Thu, 11 Nov 2004 17:50:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D165643D2F for ; Thu, 11 Nov 2004 17:50:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABHodHY026601 for ; Thu, 11 Nov 2004 17:50:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABHodW6026598 for perforce@freebsd.org; Thu, 11 Nov 2004 17:50:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 17:50:39 GMT Message-Id: <200411111750.iABHodW6026598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 17:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64884 Change 64884 by rwatson@rwatson_tislabs on 2004/11/11 17:50:30 BREAK_TO_DEBUGGER definitely desirable. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#14 (text+ko) ==== @@ -1,6 +1,7 @@ include GENERIC ident MAC +options BREAK_TO_DEBUGGER options MAC #options MAC_ALWAYS_LABEL_MBUF options MAC_DEBUG From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:01:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF4A116A4D3; Thu, 11 Nov 2004 19:01:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F1D316A4CE for ; Thu, 11 Nov 2004 19:01:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B65B43D46 for ; Thu, 11 Nov 2004 19:01:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJ15pC029090 for ; Thu, 11 Nov 2004 19:01:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJ15O8029087 for perforce@freebsd.org; Thu, 11 Nov 2004 19:01:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 19:01:05 GMT Message-Id: <200411111901.iABJ15O8029087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=64886 Change 64886 by rwatson@rwatson_tislabs on 2004/11/11 19:00:25 Style fix. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#11 (text+ko) ==== @@ -312,7 +312,7 @@ { if (dev->si_cred) - crfree (dev->si_cred); + crfree(dev->si_cred); free(dev, M_DEVT); } From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:15:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 334B216A4D1; Thu, 11 Nov 2004 19:15:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4D9B16A4CE for ; Thu, 11 Nov 2004 19:15:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B615743D54 for ; Thu, 11 Nov 2004 19:15:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJFNVb029900 for ; Thu, 11 Nov 2004 19:15:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJFNcP029897 for perforce@freebsd.org; Thu, 11 Nov 2004 19:15:23 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Nov 2004 19:15:23 GMT Message-Id: <200411111915.iABJFNcP029897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:15:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64889 Change 64889 by jhb@jhb_slimer on 2004/11/11 19:15:13 Add and use macros for use in IPI spin-wait loops to dink with TPR and enable interrupts while holding a spinlock such that we will allow safe IPIs to interrupt us while waiting in the spin loop. XXX: Ideally what we would do is just mess with the TPR to implement critical sections instead of cli/sti. Maybe amd64 can do this if it mandates APIC use. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#16 edit .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#75 edit .. //depot/projects/smpng/sys/i386/i386/pmap.c#77 edit .. //depot/projects/smpng/sys/i386/include/apicvar.h#8 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#16 (text+ko) ==== @@ -666,6 +666,8 @@ * Wait delay loops for IPI to be sent. This is highly bogus * since this is sensitive to CPU clock speed. If delay is * -1, we wait forever. + * + * XXX: Should we be using the IPI spinwait macros here? */ if (delay == -1) { incr = 0; @@ -761,7 +763,7 @@ * the failure with the check above when the next IPI is * sent. * - * We could skiip this wait entirely, EXCEPT it probably + * We could skip this wait entirely, EXCEPT it probably * protects us from other routines that assume that the * message was delivered and acted upon when this function * returns. ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#75 (text+ko) ==== @@ -932,8 +932,10 @@ smp_tlb_addr2 = addr2; atomic_store_rel_int(&smp_tlb_wait, 0); ipi_all_but_self(vector); + APIC_IPI_SPINWAIT_ENTER(); while (smp_tlb_wait < ncpu) ia32_pause(); + APIC_IPI_SPINWAIT_EXIT(); } /* @@ -1021,8 +1023,10 @@ ipi_all_but_self(vector); else ipi_selected(mask, vector); + APIC_IPI_SPINWAIT_ENTER(); while (smp_tlb_wait < ncpu) ia32_pause(); + APIC_IPI_SPINWAIT_EXIT(); } void ==== //depot/projects/smpng/sys/i386/i386/pmap.c#77 (text+ko) ==== @@ -1329,11 +1329,13 @@ (u_int)&pmap->pm_active); atomic_store_rel_int(&lazywait, 0); ipi_selected(mask, IPI_LAZYPMAP); + APIC_IPI_SPINWAIT_ENTER(); while (lazywait == 0) { ia32_pause(); if (--spins == 0) break; } + APIC_IPI_SPINWAIT_EXIT(); } mtx_unlock_spin(&smp_ipi_mtx); if (spins == 0) ==== //depot/projects/smpng/sys/i386/include/apicvar.h#8 (text+ko) ==== @@ -133,6 +133,16 @@ #define APIC_BUS_PCI 2 #define APIC_BUS_MAX APIC_BUS_PCI +#define APIC_IPI_SPINWAIT_ENTER() do { \ + lapic_set_tpr(APIC_LOCK_SAFE_INTS); \ + enable_intr(); \ +} while (0) + +#define APIC_IPI_SPINWAIT_EXIT() do { \ + disable_intr(); \ + lapic_set_tpr(0); \ +} while (0) + /* * An APIC enumerator is a psuedo bus driver that enumerates APIC's including * CPU's and I/O APIC's. From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:28:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 764D216A4D1; Thu, 11 Nov 2004 19:28:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5293B16A4CE for ; Thu, 11 Nov 2004 19:28:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3068E43D48 for ; Thu, 11 Nov 2004 19:28:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJSfvv031373 for ; Thu, 11 Nov 2004 19:28:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJSell031370 for perforce@freebsd.org; Thu, 11 Nov 2004 19:28:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 19:28:40 GMT Message-Id: <200411111928.iABJSell031370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:28:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=64892 Change 64892 by rwatson@rwatson_tislabs on 2004/11/11 19:27:47 Style tweak. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_acct.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_acct.c#7 (text+ko) ==== @@ -133,7 +133,7 @@ int error, flags; /* Make sure that the caller has process accounting admin capability. */ - error = cap_check(td,CAP_SYS_PACCT); + error = cap_check(td, CAP_SYS_PACCT); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:30:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95D4816A525; Thu, 11 Nov 2004 19:30:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4331516A4FE for ; Thu, 11 Nov 2004 19:30:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25D8543D5D for ; Thu, 11 Nov 2004 19:30:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJUi1L031735 for ; Thu, 11 Nov 2004 19:30:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJUhpf031732 for perforce@freebsd.org; Thu, 11 Nov 2004 19:30:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 19:30:43 GMT Message-Id: <200411111930.iABJUhpf031732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:30:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=64893 Change 64893 by rwatson@rwatson_tislabs on 2004/11/11 19:29:52 Correct possible merge-o from integ: variable arguments need to be processed in make_dev_credv(), but started/stopped and passed down transparently in make_dev() and make_dev_cred(). Otherwise all the devices get funny names, which is counter-productive to usability and functionality. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#12 (text+ko) ==== @@ -442,10 +442,9 @@ static struct cdev * make_dev_credv(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid, - struct ucred *cr, int perms, const char *fmt, ...) + struct ucred *cr, int perms, const char *fmt, va_list ap) { struct cdev *dev; - va_list ap; int i; KASSERT((minornr & ~0xffff00ff) == 0, @@ -469,7 +468,6 @@ ("make_dev() by driver %s on pre-existing device (maj=%d, min=%d, name=%s)", devsw->d_name, major(dev), minor(dev), devtoname(dev))); - va_start(ap, fmt); i = vsnrprintf(dev->__si_namebuf, sizeof dev->__si_namebuf, 32, fmt, ap); if (i > (sizeof dev->__si_namebuf - 1)) { printf("WARNING: Device name truncated! (%s)\n", From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:50:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 137FF16A4D1; Thu, 11 Nov 2004 19:50:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C305016A4CE for ; Thu, 11 Nov 2004 19:50:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B079643D31 for ; Thu, 11 Nov 2004 19:50:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJo69l034200 for ; Thu, 11 Nov 2004 19:50:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJo6Gq034190 for perforce@freebsd.org; Thu, 11 Nov 2004 19:50:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 19:50:06 GMT Message-Id: <200411111950.iABJo6Gq034190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:50:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64896 Change 64896 by rwatson@rwatson_tislabs on 2004/11/11 19:47:20 Fix sysctl declarations for enable flags for System V IPC: don't use enforce_sysv for all of them. The tunables were correct. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_sem.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_shm.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#10 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_msg = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_msg, CTLFLAG_RW, &mac_enforce_sysv_msg, 0, "Enforce MAC policy on System V IPC Message Queues"); TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_sem.c#10 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_sem = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_sem, CTLFLAG_RW, &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_shm.c#9 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_shm = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_shm, CTLFLAG_RW, &mac_enforce_sysv_shm, 0, "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); From owner-p4-projects@FreeBSD.ORG Thu Nov 11 19:59:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BB7916A4D1; Thu, 11 Nov 2004 19:59:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CC2916A4CE for ; Thu, 11 Nov 2004 19:59:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AB9543D2F for ; Thu, 11 Nov 2004 19:59:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABJxNVW034742 for ; Thu, 11 Nov 2004 19:59:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABJxNUO034739 for perforce@freebsd.org; Thu, 11 Nov 2004 19:59:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Nov 2004 19:59:23 GMT Message-Id: <200411111959.iABJxNUO034739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 19:59:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64901 Change 64901 by rwatson@rwatson_tislabs on 2004/11/11 19:58:22 Integrate System V IPC sysctl fix to SEBSD branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_msg.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_msg = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_msg, CTLFLAG_RW, &mac_enforce_sysv_msg, 0, "Enforce MAC policy on System V IPC Message Queues"); TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_sem = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_sem, CTLFLAG_RW, &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ #include static int mac_enforce_sysv_shm = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_shm, CTLFLAG_RW, &mac_enforce_sysv_shm, 0, "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); From owner-p4-projects@FreeBSD.ORG Thu Nov 11 20:12:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C6CB16A4D1; Thu, 11 Nov 2004 20:12:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 330DC16A4CE for ; Thu, 11 Nov 2004 20:12:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11A0243D1D for ; Thu, 11 Nov 2004 20:12:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABKCeqe035133 for ; Thu, 11 Nov 2004 20:12:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABKCew3035130 for perforce@freebsd.org; Thu, 11 Nov 2004 20:12:40 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Nov 2004 20:12:40 GMT Message-Id: <200411112012.iABKCew3035130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 20:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=64904 Change 64904 by jhb@jhb_twclab on 2004/11/11 20:11:58 Compile fix. Affected files ... .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#23 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_zeroidle.c#23 (text+ko) ==== @@ -161,7 +161,6 @@ wakeup_needed = TRUE; msleep(&zero_state, &vm_page_queue_mtx, PDROP | td->td_priority, "pgzero", hz * 300); - pages = 0; } } } From owner-p4-projects@FreeBSD.ORG Thu Nov 11 20:33:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA4916A4D1; Thu, 11 Nov 2004 20:33:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DF2716A4CE for ; Thu, 11 Nov 2004 20:33:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF36143D5C for ; Thu, 11 Nov 2004 20:33:05 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iABKX5e3035735 for ; Thu, 11 Nov 2004 20:33:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iABKX5Z1035732 for perforce@freebsd.org; Thu, 11 Nov 2004 20:33:05 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Nov 2004 20:33:05 GMT Message-Id: <200411112033.iABKX5Z1035732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 20:33:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64905 Change 64905 by jhb@jhb_slimer on 2004/11/11 20:32:09 Revert, this is wrong. Pointed out by: jake Affected files ... .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#7 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/sparc64/critical.c#7 (text+ko) ==== @@ -51,5 +51,5 @@ struct thread *td; td = curthread; - td->td_md.md_savecrit = PSTATE_KERNEL; + td->td_md.md_savecrit = 0; } From owner-p4-projects@FreeBSD.ORG Thu Nov 11 22:43:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E46A016A4D0; Thu, 11 Nov 2004 22:43:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96C9216A4D5 for ; Thu, 11 Nov 2004 22:43:47 +0000 (GMT) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6226843D2F for ; Thu, 11 Nov 2004 22:43:47 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 22671 invoked from network); 11 Nov 2004 22:43:47 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 11 Nov 2004 22:43:46 -0000 Received: from [10.50.41.235] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id iABMhR8c046593; Thu, 11 Nov 2004 17:43:43 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Peter Wemm Date: Thu, 11 Nov 2004 17:04:55 -0500 User-Agent: KMail/1.6.2 References: <200411102327.iAANRIUk056825@repoman.freebsd.org> In-Reply-To: <200411102327.iAANRIUk056825@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200411111704.56002.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 64850 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 22:43:48 -0000 On Wednesday 10 November 2004 06:27 pm, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=64850 > > Change 64850 by peter@peter_daintree on 2004/11/10 23:26:58 > > kill cpu_reset_proxy stuff, sched_bind() to cpu0 does > it better. We really should halt other CPUs during shutdown though, maybe send an IPI_STOP to all but self after the sched_bind()? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Nov 12 00:40:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF7A916A4D1; Fri, 12 Nov 2004 00:40:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA7F216A4CE for ; Fri, 12 Nov 2004 00:40:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB7C543D3F for ; Fri, 12 Nov 2004 00:40:11 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAC0eBgM052864 for ; Fri, 12 Nov 2004 00:40:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAC0eBtb052861 for perforce@freebsd.org; Fri, 12 Nov 2004 00:40:11 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 00:40:11 GMT Message-Id: <200411120040.iAC0eBtb052861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 00:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=64925 Change 64925 by sam@sam_ebb on 2004/11/12 00:39:26 code shuffle; move erp code together in protocol area Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#6 (text+ko) ==== @@ -833,38 +833,6 @@ } /* - * Reset 11g-related state. - */ -void -ieee80211_reset_erp(struct ieee80211com *ic) -{ - ic->ic_flags &= ~IEEE80211_F_USEPROT; - ic->ic_nonerpsta = 0; - ic->ic_longslotsta = 0; - /* - * Short slot time is enabled only when operating in 11g - * and not in an IBSS. We must also honor whether or not - * the driver is capable of doing it. - */ - ieee80211_set_shortslottime(ic, - ic->ic_curmode == IEEE80211_MODE_11A || - (ic->ic_curmode == IEEE80211_MODE_11G && - ic->ic_opmode == IEEE80211_M_HOSTAP && - (ic->ic_caps & IEEE80211_C_SHSLOT))); - /* - * Set short preamble and ERP barker-preamble flags. - */ - if (ic->ic_curmode == IEEE80211_MODE_11A || - (ic->ic_caps & IEEE80211_C_SHPREAMBLE)) { - ic->ic_flags |= IEEE80211_F_SHPREAMBLE; - ic->ic_flags &= ~IEEE80211_F_USEBARKER; - } else { - ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; - ic->ic_flags |= IEEE80211_F_USEBARKER; - } -} - -/* * Return the phy mode for with the specified channel so the * caller can select a rate set. This is problematic for channels * where multiple operating modes are possible (e.g. 11g+11b). ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#12 (text+ko) ==== @@ -1553,21 +1553,6 @@ ieee80211_free_node(ni); } -/* - * Set the short slot time state and notify the driver. - */ -void -ieee80211_set_shortslottime(struct ieee80211com *ic, int onoff) -{ - if (onoff) - ic->ic_flags |= IEEE80211_F_SHSLOT; - else - ic->ic_flags &= ~IEEE80211_F_SHSLOT; - /* notify driver */ - if (ic->ic_updateslot != NULL) - ic->ic_updateslot(ic->ic_ifp); -} - u_int8_t ieee80211_getrssi(struct ieee80211com *ic) { ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#9 (text+ko) ==== @@ -300,6 +300,5 @@ struct ieee80211_node *, int); extern void ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *); -extern void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); extern u_int8_t ieee80211_getrssi(struct ieee80211com *ic); #endif /* _NET80211_IEEE80211_NODE_H_ */ ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#5 (text+ko) ==== @@ -405,6 +405,53 @@ } /* + * Reset 11g-related state. + */ +void +ieee80211_reset_erp(struct ieee80211com *ic) +{ + ic->ic_flags &= ~IEEE80211_F_USEPROT; + ic->ic_nonerpsta = 0; + ic->ic_longslotsta = 0; + /* + * Short slot time is enabled only when operating in 11g + * and not in an IBSS. We must also honor whether or not + * the driver is capable of doing it. + */ + ieee80211_set_shortslottime(ic, + ic->ic_curmode == IEEE80211_MODE_11A || + (ic->ic_curmode == IEEE80211_MODE_11G && + ic->ic_opmode == IEEE80211_M_HOSTAP && + (ic->ic_caps & IEEE80211_C_SHSLOT))); + /* + * Set short preamble and ERP barker-preamble flags. + */ + if (ic->ic_curmode == IEEE80211_MODE_11A || + (ic->ic_caps & IEEE80211_C_SHPREAMBLE)) { + ic->ic_flags |= IEEE80211_F_SHPREAMBLE; + ic->ic_flags &= ~IEEE80211_F_USEBARKER; + } else { + ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; + ic->ic_flags |= IEEE80211_F_USEBARKER; + } +} + +/* + * Set the short slot time state and notify the driver. + */ +void +ieee80211_set_shortslottime(struct ieee80211com *ic, int onoff) +{ + if (onoff) + ic->ic_flags |= IEEE80211_F_SHSLOT; + else + ic->ic_flags &= ~IEEE80211_F_SHSLOT; + /* notify driver */ + if (ic->ic_updateslot != NULL) + ic->ic_updateslot(ic->ic_ifp); +} + +/* * Check if the specified rate set supports ERP. * NB: the rate set is assumed to be sorted. */ ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#4 (text+ko) ==== @@ -67,6 +67,9 @@ extern void ieee80211_pwrsave(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); +extern void ieee80211_reset_erp(struct ieee80211com *); +extern void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); + /* * Return the size of the 802.11 header for a management or data frame. */ ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#8 (text+ko) ==== @@ -356,7 +356,6 @@ u_int ieee80211_chan2ieee(struct ieee80211com *, struct ieee80211_channel *); u_int ieee80211_ieee2mhz(u_int, u_int); int ieee80211_setmode(struct ieee80211com *, enum ieee80211_phymode); -void ieee80211_reset_erp(struct ieee80211com *); enum ieee80211_phymode ieee80211_chan2mode(struct ieee80211com *, struct ieee80211_channel *); From owner-p4-projects@FreeBSD.ORG Fri Nov 12 00:44:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BF3716A4D1; Fri, 12 Nov 2004 00:44:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28DFC16A4CE for ; Fri, 12 Nov 2004 00:44:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B4F843D45 for ; Fri, 12 Nov 2004 00:44:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAC0iGdA053030 for ; Fri, 12 Nov 2004 00:44:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAC0iGXT053027 for perforce@freebsd.org; Fri, 12 Nov 2004 00:44:16 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 00:44:16 GMT Message-Id: <200411120044.iAC0iGXT053027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 00:44:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=64926 Change 64926 by sam@sam_ebb on 2004/11/12 00:43:45 correct handling of slot time for 11g adhoc mode Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#18 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#18 (text+ko) ==== @@ -1667,14 +1667,14 @@ struct ieee80211com *ic = &sc->sc_ic; /* - * In station mode we change the hardware immediately. - * For other operation we defer the change until beacon - * updates have propagated to the stations. + * When not coordinating the BSS, change the hardware + * immediately. For other operation we defer the change + * until beacon updates have propagated to the stations. */ - if (ic->ic_opmode == IEEE80211_M_STA) + if (ic->ic_opmode == IEEE80211_M_HOSTAP) + sc->sc_updateslot = UPDATE; + else ath_setslottime(sc); - else - sc->sc_updateslot = UPDATE; } /* From owner-p4-projects@FreeBSD.ORG Fri Nov 12 00:46:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CF4216A4D1; Fri, 12 Nov 2004 00:46:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3785316A4CE for ; Fri, 12 Nov 2004 00:46:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E8C543D45 for ; Fri, 12 Nov 2004 00:46:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAC0kJFZ053134 for ; Fri, 12 Nov 2004 00:46:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAC0kJ09053131 for perforce@freebsd.org; Fri, 12 Nov 2004 00:46:19 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 00:46:19 GMT Message-Id: <200411120046.iAC0kJ09053131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 00:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=64927 Change 64927 by sam@sam_ebb on 2004/11/12 00:46:02 o add some assertions to track bus_dma failures (need to recover but for now at least catch them)) o add debug code to watch for whomever is smashing m_next in rx mbufs Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#19 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#19 (text+ko) ==== @@ -1561,7 +1561,9 @@ struct ath_buf *bf = arg; KASSERT(nseg <= ATH_MAX_SCATTER, - ("ath_mbuf_load_cb: too many DMA segments %u", nseg)); + ("%s: too many DMA segments %u", __func__, nseg)); + KASSERT(error == 0, + ("%s: error %u on bus_dma callback", __func__, error)); bf->bf_mapsize = mapsize; bf->bf_nseg = nseg; bcopy(seg, bf->bf_segs, nseg * sizeof (seg[0])); @@ -1676,6 +1678,7 @@ else ath_setslottime(sc); } +} /* * Allocate and setup an initial beacon frame. @@ -1942,6 +1945,8 @@ ath_load_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { bus_addr_t *paddr = (bus_addr_t*) arg; + KASSERT(error == 0, + ("%s: error %u on bus_dma callback", __func__, error)); *paddr = segs->ds_addr; } @@ -2154,9 +2159,11 @@ struct ath_hal *ah = sc->sc_ah; int error; struct mbuf *m; +struct mbuf *morig; /*XXX*/ struct ath_desc *ds; m = bf->bf_m; +morig = m; /* XXX */ if (m == NULL) { /* * NB: by assigning a page to the rx dma buffer we @@ -2172,6 +2179,7 @@ sc->sc_stats.ast_rx_nombuf++; return ENOMEM; } + KASSERT(m->m_next == NULL, ("m_next %p (1)", m->m_next)); bf->bf_m = m; m->m_pkthdr.len = m->m_len = m->m_ext.ext_size; @@ -2188,6 +2196,7 @@ KASSERT(bf->bf_nseg == 1, ("%s: multi-segment packet; nseg %u", __func__, bf->bf_nseg)); } + KASSERT(m->m_next == NULL, ("m_next %p morig %p (2)", m->m_next, morig)); bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREREAD); /* @@ -2333,6 +2342,10 @@ #endif if (status == HAL_EINPROGRESS) break; + if (m->m_next != NULL) { /* XXX */ + if_printf(ifp, "m_next %p, patching!\n", m->m_next); + m->m_next = NULL; + } STAILQ_REMOVE_HEAD(&sc->sc_rxbuf, bf_list); if (ds->ds_rxstat.rs_more) { /* @@ -2401,6 +2414,7 @@ goto rx_next; } rx_accept: + KASSERT(m->m_next == NULL, ("m_next %p (3)", m->m_next)); /* * Sync and unmap the frame. At this point we're * committed to passing the mbuf somewhere so clear From owner-p4-projects@FreeBSD.ORG Fri Nov 12 17:47:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13C3416A4D1; Fri, 12 Nov 2004 17:47:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF54416A4CE for ; Fri, 12 Nov 2004 17:47:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C33D543D48 for ; Fri, 12 Nov 2004 17:47:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACHlDa7020368 for ; Fri, 12 Nov 2004 17:47:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACHlDc8020365 for perforce@freebsd.org; Fri, 12 Nov 2004 17:47:13 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Nov 2004 17:47:13 GMT Message-Id: <200411121747.iACHlDc8020365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 17:47:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=64957 Change 64957 by jhb@jhb_slimer on 2004/11/12 17:46:12 Don't recursively panic in sched_bind() if the panic happens on another CPU. Probably panic() needs to better handle the case that a panic happens inside of a critical section. I almost wish that panic() transferred to a dedicated shutdown thread instead. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#85 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#85 (text+ko) ==== @@ -287,7 +287,7 @@ #endif KASSERT(td->td_critnest == 1 || (td->td_critnest == 2 && (td->td_pflags & TDP_OWEPREEMPT) != 0 && (flags & SW_INVOL) != 0 && - newtd == NULL), + newtd == NULL) || panicstr, ("mi_switch: switch in a critical section")); KASSERT((flags & (SW_INVOL | SW_VOL)) != 0, ("mi_switch: switch must be voluntary or involuntary")); From owner-p4-projects@FreeBSD.ORG Fri Nov 12 17:47:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B19316A4DC; Fri, 12 Nov 2004 17:47:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D26016A4DB for ; Fri, 12 Nov 2004 17:47:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FE1443D48 for ; Fri, 12 Nov 2004 17:47:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACHlExX020375 for ; Fri, 12 Nov 2004 17:47:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACHlD2N020371 for perforce@freebsd.org; Fri, 12 Nov 2004 17:47:13 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Nov 2004 17:47:13 GMT Message-Id: <200411121747.iACHlD2N020371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 17:47:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=64958 Change 64958 by jhb@jhb_slimer on 2004/11/12 17:46:44 Do the TPR magic in lapic_ipi_wait() if needed as well. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#17 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#17 (text+ko) ==== @@ -660,26 +660,37 @@ int lapic_ipi_wait(int delay) { - int x, incr; + int x, incr, allow_ipis, done; + + /* + * If interrupts are disabled, then hack on the APIC to allow + * safe IPIs to come in while we wait. + */ + allow_ipis = (read_eflags() & PSL_I) == 0; + if (allow_ipis) + APIC_IPI_SPINWAIT_ENTER(); /* * Wait delay loops for IPI to be sent. This is highly bogus * since this is sensitive to CPU clock speed. If delay is * -1, we wait forever. - * - * XXX: Should we be using the IPI spinwait macros here? */ if (delay == -1) { incr = 0; delay = 1; } else incr = 1; + done = 0; for (x = 0; x < delay; x += incr) { - if ((lapic->icr_lo & APIC_DELSTAT_MASK) == APIC_DELSTAT_IDLE) - return (1); + if ((lapic->icr_lo & APIC_DELSTAT_MASK) == APIC_DELSTAT_IDLE) { + done = 1; + break; + } ia32_pause(); } - return (0); + if (allow_ipis) + APIC_IPI_SPINWAIT_EXIT(); + return (done); } void From owner-p4-projects@FreeBSD.ORG Fri Nov 12 18:20:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3BF116A4D1; Fri, 12 Nov 2004 18:20:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7156916A4CE for ; Fri, 12 Nov 2004 18:20:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E5A243D48 for ; Fri, 12 Nov 2004 18:20:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACIKuCr021775 for ; Fri, 12 Nov 2004 18:20:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACIKuFj021772 for perforce@freebsd.org; Fri, 12 Nov 2004 18:20:56 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Nov 2004 18:20:56 GMT Message-Id: <200411121820.iACIKuFj021772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 18:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=64961 Change 64961 by jhb@jhb_slimer on 2004/11/12 18:20:41 Merge this commit. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#18 integrate Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/atomic.h,v 1.32 2004/03/12 21:45:29 trhodes Exp $ + * $FreeBSD: src/sys/i386/include/atomic.h,v 1.33 2004/11/11 22:42:25 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ From owner-p4-projects@FreeBSD.ORG Fri Nov 12 18:26:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2386716A4D1; Fri, 12 Nov 2004 18:26:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1A0516A4CE for ; Fri, 12 Nov 2004 18:26:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6A4843D49 for ; Fri, 12 Nov 2004 18:26:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACIQ2Nq021910 for ; Fri, 12 Nov 2004 18:26:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACIQ2dE021907 for perforce@freebsd.org; Fri, 12 Nov 2004 18:26:02 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Nov 2004 18:26:02 GMT Message-Id: <200411121826.iACIQ2dE021907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 18:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64962 Change 64962 by jhb@jhb_slimer on 2004/11/12 18:25:42 Bah, fixes from Bruce for userland use of atomic ops. Also, UP doesn't even need gcc barriers. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#19 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#19 (text+ko) ==== @@ -172,7 +172,7 @@ #if defined(__GNUC__) || defined(__INTEL_COMPILER) -#if !defined(SMP) +#if defined(KERNEL) && !defined(SMP) /* * We assume that a = b will do atomic loads and stores. However, on a @@ -191,7 +191,6 @@ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile("" : : : "memory"); \ *p = v; \ } \ struct __hack From owner-p4-projects@FreeBSD.ORG Fri Nov 12 18:55:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF9D416A4D1; Fri, 12 Nov 2004 18:55:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8658A16A4CE for ; Fri, 12 Nov 2004 18:55:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63A8043D39 for ; Fri, 12 Nov 2004 18:55:39 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACItd3H025731 for ; Fri, 12 Nov 2004 18:55:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACItdfl025728 for perforce@freebsd.org; Fri, 12 Nov 2004 18:55:39 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Nov 2004 18:55:39 GMT Message-Id: <200411121855.iACItdfl025728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 18:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64964 Change 64964 by jhb@jhb_slimer on 2004/11/12 18:54:56 Loopback. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#20 integrate Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#20 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/atomic.h,v 1.33 2004/11/11 22:42:25 jhb Exp $ + * $FreeBSD: src/sys/i386/include/atomic.h,v 1.34 2004/11/12 18:40:22 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ From owner-p4-projects@FreeBSD.ORG Fri Nov 12 23:29:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8502616A4D1; Fri, 12 Nov 2004 23:29:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BBC916A4CE for ; Fri, 12 Nov 2004 23:29:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E644543D46 for ; Fri, 12 Nov 2004 23:29:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACNTFlH041753 for ; Fri, 12 Nov 2004 23:29:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACNTFG5041750 for perforce@freebsd.org; Fri, 12 Nov 2004 23:29:15 GMT (envelope-from peter@freebsd.org) Date: Fri, 12 Nov 2004 23:29:15 GMT Message-Id: <200411122329.iACNTFG5041750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 23:29:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=64980 Change 64980 by peter@peter_daintree on 2004/11/12 23:28:39 IFC @64978 Affected files ... .. //depot/projects/hammer/Makefile.inc1#75 integrate .. //depot/projects/hammer/contrib/gcc/gcc.1#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#17 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#6 delete .. //depot/projects/hammer/libexec/rtld-elf/arm/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/ia64/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/powerpc/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/sparc64/lockdflt.c#3 delete .. //depot/projects/hammer/sbin/gpt/create.c#6 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#8 integrate .. //depot/projects/hammer/share/man/man4/altq.4#3 integrate .. //depot/projects/hammer/share/man/man4/polling.4#12 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#28 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#11 integrate .. //depot/projects/hammer/share/mk/sys.mk#17 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/hammer/sys/boot/common/commands.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#73 integrate .. //depot/projects/hammer/sys/conf/files#92 integrate .. //depot/projects/hammer/sys/conf/files.i386#43 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#26 integrate .. //depot/projects/hammer/sys/conf/options#62 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_snc.c#1 branch .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#33 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#19 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#13 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#10 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/pbio.c#3 delete .. //depot/projects/hammer/sys/kern/sched_ule.c#52 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#15 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#17 integrate .. //depot/projects/hammer/sys/kern/tty.c#33 edit .. //depot/projects/hammer/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#16 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_snc/Makefile#1 branch .. //depot/projects/hammer/sys/netinet/in.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#27 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#25 integrate .. //depot/projects/hammer/sys/sys/msg.h#4 integrate .. //depot/projects/hammer/sys/sys/pbioio.h#2 delete .. //depot/projects/hammer/sys/sys/sem.h#4 integrate .. //depot/projects/hammer/sys/sys/shm.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#33 integrate .. //depot/projects/hammer/tools/regression/README#5 integrate .. //depot/projects/hammer/tools/regression/TODO#1 branch .. //depot/projects/hammer/tools/regression/geom/RunTest.t#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/include/tgmath/tgmath.c#2 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mblen.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrtowc.c#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbtowc.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcrtomb.c#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wctomb.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-perror.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#7 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/string/test-strerror.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/hammer/tools/regression/pipe/bigpipetest.c#3 integrate .. //depot/projects/hammer/tools/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#5 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/kqueue/kqueue.c#3 integrate .. //depot/projects/hammer/tools/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/join/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/m4/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#10 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/regress.m4#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/uudecode/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/uudecode/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/uuencode/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/uuencode/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/xargs/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/xargs/regress.t#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#5 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#9 integrate .. //depot/projects/hammer/usr.bin/make/config.h#4 integrate .. //depot/projects/hammer/usr.bin/make/job.c#12 integrate .. //depot/projects/hammer/usr.bin/make/job.h#9 integrate .. //depot/projects/hammer/usr.bin/make/main.c#17 integrate .. //depot/projects/hammer/usr.bin/make/make.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.8#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#17 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#75 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,7 +83,7 @@ .endif CVS?= cvs -CVSFLAGS?= -A -P -d +CVSFLAGS?= -A -P -d -I! SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -201,7 +201,7 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == "amd64" # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 @@ -378,7 +378,7 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == "amd64" build32: @echo @echo "--------------------------------------------------------------" @@ -436,7 +436,7 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) WMAKE_TGTS+= build32 .endif @@ -569,7 +569,7 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif ==== //depot/projects/hammer/contrib/gcc/gcc.1#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.19 2003/06/25 16:12:05 obrien Exp $ +.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.21 2004/11/11 07:50:09 obrien Exp $ .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" @@ -24,7 +24,7 @@ .Id $Id: gcc.1,v 1.9 1998/12/16 20:55:57 law Exp $ .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools" .SH NAME -gcc, g++ \- GNU project C and C++ Compiler (gcc-3.2.1) +gcc, g++ \- GNU project C and C++ Compiler .SH SYNOPSIS .B gcc .RI "[ " option " | " filename " ].\|.\|." @@ -2461,10 +2461,11 @@ .B \-finline\-functions. .TP .B \-Os -Optimize for size. This enables all +Optimize for size. +This enables all .B \-O2 -optimizations that do not typically increase code size. It also performs -further optimizations designed to reduce code size. +optimizations that do not typically increase code size. +It also performs further optimizations designed to reduce code size. .TP .B \-O0 Do not optimize. @@ -3628,17 +3629,19 @@ (pentium), .B pentium, .B i686 -(pentiumpro), and +(pentiumpro), +and .B pentiumpro. While picking a specific CPU TYPE will schedule things appropriately for that -particular chip, the compiler will not generate any code that does not run on -the i386 without the +particular chip, +the compiler will not generate any code that does not run on the i386 without +the .B \-march=\fIcpu type\fP option being used. .TP .B \-march=\fIcpu type\fP -Generate instructions for the machine type CPU TYPE. The choices for CPU TYPE -are: +Generate instructions for the machine type CPU TYPE. +The choices for CPU TYPE are: .B i386, .B i486, .B pentium, ==== //depot/projects/hammer/games/fortune/datfiles/fortunes2#17 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.77 2004/09/29 19:52:19 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.78 2004/11/12 10:15:43 schweikh Exp $ % ======================================================================= || || @@ -19979,6 +19979,9 @@ Hear about the Californian terrorist that tried to blow up a bus? Burned his lips on the exhaust pipe. % +Hear about the young Chinese woman who just won the lottery? +One fortunate cookie... +% Hear me, my chiefs, I am tired; my heart is sick and sad. From where the sun now stands I Will Fight No More Forever. -- Chief Joseph of the Nez Perce @@ -20094,9 +20097,6 @@ No stellar recognition's given. There are not stars enough in heaven. % -Here about the young Chinese woman who just won the lottery? -One fortunate cookie... -% Here at the Phone Company, we serve all kinds of people; from President's and Kings to the scum of the earth... % ==== //depot/projects/hammer/sbin/gpt/create.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.8 2004/10/25 03:39:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.9 2004/11/12 04:34:46 marcel Exp $"); #include @@ -63,6 +63,8 @@ struct gpt_ent *ent; unsigned int i; + last = mediasz / secsz - 1LL; + if (map_find(MAP_TYPE_PRI_GPT_HDR) != NULL || map_find(MAP_TYPE_SEC_GPT_HDR) != NULL) { warnx("%s: error: device already contains a GPT", device_name); @@ -92,12 +94,12 @@ mbr->mbr_part[0].part_esect = 0xff; mbr->mbr_part[0].part_ecyl = 0xff; mbr->mbr_part[0].part_start_lo = htole16(1); - if (mediasz > 0xffffffff) { + if (last > 0xffffffff) { mbr->mbr_part[0].part_size_lo = htole16(0xffff); mbr->mbr_part[0].part_size_hi = htole16(0xffff); } else { - mbr->mbr_part[0].part_size_lo = htole16(mediasz); - mbr->mbr_part[0].part_size_hi = htole16(mediasz >> 16); + mbr->mbr_part[0].part_size_lo = htole16(last); + mbr->mbr_part[0].part_size_hi = htole16(last >> 16); } map = map_add(0LL, 1LL, MAP_TYPE_PMBR, mbr); gpt_write(fd, map); @@ -118,8 +120,6 @@ blocks++; /* Don't forget the header itself */ } - last = mediasz / secsz - 1LL; - /* Never cross the median of the device. */ if ((blocks + 1LL) > ((last + 1LL) >> 1)) blocks = ((last + 1LL) >> 1) - 1LL; ==== //depot/projects/hammer/sbin/gpt/migrate.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.11 2004/10/31 02:20:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.12 2004/11/12 04:34:46 marcel Exp $"); #include #include @@ -313,12 +313,12 @@ mbr->mbr_part[0].part_esect = 0xff; mbr->mbr_part[0].part_ecyl = 0xff; mbr->mbr_part[0].part_start_lo = htole16(1); - if (mediasz > 0xffffffff) { + if (last > 0xffffffff) { mbr->mbr_part[0].part_size_lo = htole16(0xffff); mbr->mbr_part[0].part_size_hi = htole16(0xffff); } else { - mbr->mbr_part[0].part_size_lo = htole16(mediasz); - mbr->mbr_part[0].part_size_hi = htole16(mediasz >> 16); + mbr->mbr_part[0].part_size_lo = htole16(last); + mbr->mbr_part[0].part_size_hi = htole16(last >> 16); } gpt_write(fd, map); } ==== //depot/projects/hammer/share/man/man4/altq.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.3 2004/11/01 11:43:07 mlaier Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.5 2004/11/12 18:13:54 brueffer Exp $ .\" -.Dd October 7, 2004 +.Dd November 12, 2004 .Dt ALTQ 4 .Os .Sh NAME @@ -79,7 +79,7 @@ .It Dv ALTQ_CDNR build the traffic conditioner. This option is meaningless at the moment as the conditioner is not used by -any of the available disciplines or consumer. +any of the available disciplines or consumers. .It Dv ALTQ_PRIQ build the .Dq "Priority Queuing" @@ -92,7 +92,7 @@ .Pp Note that .Nm Ns -disciplines -can not be loaded as kernel modules. +cannot be loaded as kernel modules. In order to use a certain discipline you have to build it into a custom kernel. The @@ -103,9 +103,9 @@ .Sh SUPPORTED DEVICES The driver modifications described in .Xr altq 9 -and required to use a certain network card with -.Nm -have been applied to the following hardware drivers +are required to use a certain network card with +.Nm . +They have been applied to the following hardware drivers: .Xr an 4 , .Xr ath 4 , .Xr awi 4 , @@ -119,6 +119,7 @@ .Xr wi 4 , .Xr de 4 , .Xr rl 4 , +.Xr sf 4 , .Xr sis 4 , .Xr vr 4 and ==== //depot/projects/hammer/share/man/man4/polling.4#12 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/polling.4,v 1.14 2004/10/11 13:27:44 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/polling.4,v 1.15 2004/11/10 23:31:15 brueffer Exp $ .\" -.Dd April 5, 2004 +.Dd November 11, 2004 .Dt POLLING 4 .Os .Sh NAME @@ -186,6 +186,7 @@ .Xr nge 4 , .Xr re 4 , .Xr rl 4 , +.Xr sf 4 , .Xr sis 4 , .Xr ste 4 , .Xr vge 4 , ==== //depot/projects/hammer/share/man/man5/make.conf.5#28 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.99 2004/11/04 12:57:40 phk Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.100 2004/11/12 00:01:07 imp Exp $ .\" .Dd October 15, 2004 .Dt MAKE.CONF 5 @@ -352,6 +352,9 @@ .It Va MODULES_OVERRIDE .Pq Vt str Set to a list of modules to build instead of all of them. +.It Va PORTS_MODULES +Set this to the list of ports you wish to rebuild every time the kernel +is built. .It Va NO_KERNELCONFIG .Pq Vt bool Set this to skip running ==== //depot/projects/hammer/share/mk/bsd.prog.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.137 2004/11/03 18:01:18 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.138 2004/11/12 13:24:34 ru Exp $ .include @@ -115,9 +115,12 @@ .if !target(install) -.if defined(PRECIOUSPROG) && !defined(NOFSCHG) +.if defined(PRECIOUSPROG) +.if !defined(NOFSCHG) INSTALLFLAGS+= -fschg .endif +INSTALLFLAGS+= -S +.endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} ==== //depot/projects/hammer/share/mk/sys.mk#17 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.81 2004/10/25 20:04:50 des Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.82 2004/11/11 01:09:56 obrien Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -37,7 +37,7 @@ CFLAGS ?= -O .else CC ?= cc -CFLAGS ?= -O2 -pipe +CFLAGS ?= -O2 -fno-strict-aliasing -pipe .endif CXX ?= c++ ==== //depot/projects/hammer/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.2 2004/09/23 22:11:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.3 2004/11/12 21:49:05 cognet Exp $"); #include #include #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -109,3 +110,6 @@ ASSYM(P_SIGEVENT, P_SIGEVENT); ASSYM(P_PROFIL, P_PROFIL); ASSYM(TRAPFRAMESIZE, sizeof(struct trapframe)); + +ASSYM(MAXCOMLEN, MAXCOMLEN); +ASSYM(NIRQ, NIRQ); ==== //depot/projects/hammer/sys/arm/arm/intr.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.3 2004/09/23 22:09:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.4 2004/11/12 21:49:05 cognet Exp $"); #include #include #include @@ -50,7 +50,10 @@ #include #include -struct ithd *ithreads[NIRQ]; +static struct ithd *ithreads[NIRQ]; +static int intrcnt_tab[NIRQ]; +static int intrcnt_index = 0; +static int last_printed = 0; struct arm_intr { driver_intr_t *handler; void *arg; @@ -69,7 +72,8 @@ void arm_handler_execute(void *, int); -void arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, +void +arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct ithd *cur_ith; @@ -87,6 +91,14 @@ if (error) return; ithreads[irq] = cur_ith; + last_printed += + snprintf(intrnames + last_printed, + MAXCOMLEN + 1, + "irq%d: %s", irq, name); + last_printed++; + intrcnt_tab[irq] = intrcnt_index; + intrcnt_index++; + } if (!(flags & INTR_FAST)) { intr->handler = hand; @@ -120,6 +132,7 @@ arm_mask_irqs(irqnb); while (irqnb != 0) { i = ffs(irqnb) - 1; + intrcnt[intrcnt_tab[i]]++; irqnb &= ~(1U << i); ithd = ithreads[i]; if (!ithd) ==== //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#3 (text+ko) ==== @@ -72,7 +72,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.2 2004/09/23 22:09:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.3 2004/11/12 21:49:05 cognet Exp $"); /* * irq_entry: @@ -102,18 +102,13 @@ .align 0 - /* - * XXX Provide intrnames/intrcnt for legacy code, but - * don't actually use them. - */ - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) .global _C_LABEL(intrcnt), _C_LABEL(eintrcnt) _C_LABEL(intrnames): + .space NIRQ * (MAXCOMLEN + 1) _C_LABEL(eintrnames): - - .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt) _C_LABEL(intrcnt): + .space NIRQ * 4 _C_LABEL(eintrcnt): .global _C_LABEL(current_intr_depth) ==== //depot/projects/hammer/sys/boot/common/commands.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.20 2004/09/29 13:43:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.21 2004/11/12 13:27:49 ru Exp $"); #include #include @@ -214,12 +214,23 @@ command_commandlist(int argc, char *argv[]) { struct bootblk_command **cmdp; - - printf("Available commands:\n"); + int res; + char name[20]; + + res = 0; + pager_open(); + res = pager_output("Available commands:\n"); SET_FOREACH(cmdp, Xcommand_set) { - if (((*cmdp)->c_name != NULL) && ((*cmdp)->c_desc != NULL)) - printf(" %-15s %s\n", (*cmdp)->c_name, (*cmdp)->c_desc); + if (res) + break; + if (((*cmdp)->c_name != NULL) && ((*cmdp)->c_desc != NULL)) { + sprintf(name, " %-15s ", (*cmdp)->c_name); + pager_output(name); + pager_output((*cmdp)->c_desc); + res = pager_output("\n"); + } } + pager_close(); return(CMD_OK); } ==== //depot/projects/hammer/sys/conf/NOTES#73 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1287 2004/11/08 19:05:21 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1288 2004/11/12 19:44:30 peter Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -756,7 +756,6 @@ options NFSCLIENT #Network File System client # The rest are optional: -options AUTOFS #Auto File System options CD9660 #ISO 9660 filesystem options FDESCFS #File descriptor filesystem options HPFS #OS/2 File system ==== //depot/projects/hammer/sys/conf/files#92 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.962 2004/11/10 19:54:17 markm Exp $ +# $FreeBSD: src/sys/conf/files,v 1.966 2004/11/12 04:48:24 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -300,6 +300,7 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi +dev/acpica/acpi_snc.c optional acpi_snc acpi dev/acpica/acpi_video.c optional acpi_video acpi dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa @@ -594,6 +595,7 @@ dev/patm/if_patm_tx.c optional patm pci dev/patm/if_patm_attach.c optional patm pci dev/patm/if_patm_rtables.c optional patm pci +dev/pbio/pbio.c optional pbio isa dev/pccard/card_if.m standard dev/pccard/pccard.c optional pccard dev/pccard/pccard_cis.c optional pccard ==== //depot/projects/hammer/sys/conf/files.i386#43 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.506 2004/10/24 08:53:40 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.507 2004/11/11 04:53:46 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -292,7 +292,6 @@ i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx -i386/isa/pbio.c optional pbio i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt ==== //depot/projects/hammer/sys/conf/kern.post.mk#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.70 2004/09/23 08:34:50 phk Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.72 2004/11/12 20:44:51 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -27,6 +27,20 @@ .endif .endfor +# Handle out of tree ports +.if defined(PORTS_MODULES) +.if defined(SYSDIR) +PORTSMODULESENV=SYSDIR=${SYSDIR} +.endif +.for target in all install clean +${target}: ports-${target} +ports-${target}: +.for __i in ${PORTS_MODULES} + cd /usr/ports/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${target} +.endfor +.endfor +.endif + .ORDER: kernel-install modules-install kernel-all: ${KERNEL_KO} ==== //depot/projects/hammer/sys/conf/options#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.486 2004/10/27 19:26:01 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.487 2004/11/12 19:44:30 peter Exp $ # # On the handling of kernel options # @@ -162,7 +162,6 @@ # time, since the corresponding lkms cannot work if there are any static # dependencies. Unusability is enforced by hiding the defines for the # options in a never-included header. -AUTOFS opt_dontuse.h CD9660 opt_dontuse.h CODA opt_dontuse.h EXT2FS opt_dontuse.h ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.50 2004/08/13 06:22:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.51 2004/11/11 22:33:08 jhb Exp $"); #include "opt_acpi.h" #include @@ -70,11 +70,13 @@ /* * Get the PCI interrupt routing table for this bus. If we can't - * get it, this is not an error but may reduce functionality. + * get it, this is not an error but may reduce functionality. There + * are several valid bridges in the field that do not have a _PRT, so + * only warn about missing tables if bootverbose is set. */ prt->Length = ACPI_ALLOCATE_BUFFER; status = AcpiGetIrqRoutingTable(acpi_get_handle(dev), prt); - if (ACPI_FAILURE(status)) + if (ACPI_FAILURE(status) && (bootverbose || status != AE_NOT_FOUND)) device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", acpi_name(acpi_get_handle(dev)), AcpiFormatException(status)); ==== //depot/projects/hammer/sys/dev/aha/aha_isa.c#9 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.29 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.31 2004/11/12 02:18:42 imp Exp $"); #include #include @@ -122,7 +122,7 @@ port_rid = 0; port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &port_rid, - 0, ~0, AHA_NREGS, RF_ACTIVE); + 0, ~0, AHA_NREGS, RF_ACTIVE); if (port_res == NULL) return (ENXIO); @@ -150,7 +150,7 @@ "settings for adapter at %#jx. Failing probe\n", (uintmax_t)port_start); aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, port_rid, + bus_release_resource(dev, SYS_RES_IOPORT, port_rid, port_res); return (ENXIO); } @@ -208,7 +208,8 @@ RF_ACTIVE); if (!aha->irq) { device_printf(dev, "Unable to allocate excluse use of irq\n"); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); return ENOMEM; } @@ -217,7 +218,8 @@ RF_ACTIVE); if (!aha->drq) { device_printf(dev, "Unable to allocate drq\n"); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); return ENOMEM; } @@ -247,41 +249,45 @@ /* lockfunc */ busdma_lock_mutex, /* lockarg */ &Giant, &aha->parent_dmat) != 0) { - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (ENOMEM); - } + aha_free(aha); + return (ENOMEM); + } - if (aha_init(aha)) { + if (aha_init(aha)) { device_printf(dev, "init failed\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (ENOMEM); - } + aha_free(aha); + return (ENOMEM); + } error = aha_attach(aha); if (error) { device_printf(dev, "attach failed\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (error); + aha_free(aha); + return (error); } - error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY, aha_intr, aha, - &ih); + error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY, + aha_intr, aha, &ih); if (error) { device_printf(dev, "Unable to register interrupt handler\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (error); + aha_free(aha); + return (error); } return (0); ==== //depot/projects/hammer/sys/dev/em/if_em.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.51 2004/11/03 14:11:18 phk Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.53 2004/11/12 11:03:07 rwatson Exp $*/ #include @@ -161,7 +161,7 @@ static int em_get_buf(int i, struct adapter *, struct mbuf *); static void em_enable_vlans(struct adapter *); -static int em_encap(struct adapter *, struct mbuf *); +static int em_encap(struct adapter *, struct mbuf **); static void em_smartspeed(struct adapter *); static int em_82547_fifo_workaround(struct adapter *, int); static void em_82547_update_fifo_head(struct adapter *, int); @@ -310,26 +310,14 @@ em_adapter_list = adapter; /* SYSCTL stuff */ - sysctl_ctx_init(&adapter->sysctl_ctx); - adapter->sysctl_tree = SYSCTL_ADD_NODE(&adapter->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_hw), - OID_AUTO, - device_get_nameunit(dev), - CTLFLAG_RD, - 0, ""); - if (adapter->sysctl_tree == NULL) { - error = EIO; - goto err_sysctl; - } - - SYSCTL_ADD_PROC(&adapter->sysctl_ctx, - SYSCTL_CHILDREN(adapter->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, (void *)adapter, 0, em_sysctl_debug_info, "I", "Debug Information"); - SYSCTL_ADD_PROC(&adapter->sysctl_ctx, - SYSCTL_CHILDREN(adapter->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, (void *)adapter, 0, em_sysctl_stats, "I", "Statistics"); @@ -504,8 +492,6 @@ err_tx_desc: err_pci: em_free_pci_resources(adapter); - sysctl_ctx_free(&adapter->sysctl_ctx); -err_sysctl: return(error); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 12 23:39:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F182316A4D1; Fri, 12 Nov 2004 23:39:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCD9816A4CE for ; Fri, 12 Nov 2004 23:39:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC3AD43D41 for ; Fri, 12 Nov 2004 23:39:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACNdSJL042076 for ; Fri, 12 Nov 2004 23:39:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACNdSDj042072 for perforce@freebsd.org; Fri, 12 Nov 2004 23:39:28 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 23:39:28 GMT Message-Id: <200411122339.iACNdSDj042072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 23:39:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=64981 Change 64981 by sam@sam_ebb on 2004/11/12 23:38:39 missed auto authmode Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#9 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#9 (text+ko) ==== @@ -1026,6 +1026,9 @@ break; } break; + case IEEE80211_AUTH_AUTO: + printf("AUTO"); + break; default: printf("UNKNOWN (0x%x)", ireq.i_val); break; From owner-p4-projects@FreeBSD.ORG Fri Nov 12 23:40:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C400316A4D3; Fri, 12 Nov 2004 23:40:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83E9A16A4CE for ; Fri, 12 Nov 2004 23:40:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54C2343D46 for ; Fri, 12 Nov 2004 23:40:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACNeUsg042149 for ; Fri, 12 Nov 2004 23:40:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACNeUOM042146 for perforce@freebsd.org; Fri, 12 Nov 2004 23:40:30 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 23:40:30 GMT Message-Id: <200411122340.iACNeUOM042146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 23:40:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64982 Change 64982 by sam@sam_ebb on 2004/11/12 23:39:47 o must check ic_sta before referencing it o cleanup some aspects of channel handling in get+set channel Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#13 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#13 (text+ko) ==== @@ -789,13 +789,10 @@ switch (ic->ic_state) { case IEEE80211_S_INIT: case IEEE80211_S_SCAN: - if (ic->ic_opmode == IEEE80211_M_STA) - return ic->ic_des_chan; - break; + return ic->ic_des_chan; default: - break; + return ic->ic_ibss_chan; } - return ic->ic_ibss_chan; } static int @@ -1356,10 +1353,13 @@ ni = ic->ic_bss; if (!IEEE80211_ADDR_EQ(ik.ik_macaddr, ni->ni_bssid)) return EADDRNOTAVAIL; - } else + } else { + if (ic->ic_sta == NULL) + return EINVAL; ni = ieee80211_find_node(ic->ic_sta, ik.ik_macaddr); - if (ni == NULL) - return ENOENT; + if (ni == NULL) + return ENOENT; + } wk = &ni->ni_ucastkey; } else { if (kid >= IEEE80211_WEP_NKID) @@ -1474,6 +1474,8 @@ mlme.im_reason); break; case IEEE80211_M_HOSTAP: + if (ic->ic_sta == NULL) + return EINVAL; ni = ieee80211_find_node(ic->ic_sta, mlme.im_macaddr); if (ni == NULL) return EINVAL; @@ -1491,6 +1493,8 @@ case IEEE80211_MLME_UNAUTHORIZE: if (ic->ic_opmode != IEEE80211_M_HOSTAP) return EINVAL; + if (ic->ic_sta == NULL) + return EINVAL; ni = ieee80211_find_node(ic->ic_sta, mlme.im_macaddr); if (ni == NULL) return EINVAL; @@ -1737,14 +1741,15 @@ error = ENETRESET; break; default: - if (ic->ic_opmode == IEEE80211_M_STA) { - if (ic->ic_des_chan != IEEE80211_CHAN_ANYC && - ic->ic_bss->ni_chan != ic->ic_des_chan) - error = ENETRESET; - } else { - if (ic->ic_bss->ni_chan != ic->ic_ibss_chan) - error = ENETRESET; - } + /* + * If the desired channel has changed (to something + * other than any) and we're not already scanning, + * then kick the state machine. + */ + if (ic->ic_des_chan != IEEE80211_CHAN_ANYC && + ic->ic_bss->ni_chan != ic->ic_des_chan && + (ic->ic_flags & IEEE80211_F_SCAN) == 0) + error = ENETRESET; break; } if (error == ENETRESET && ic->ic_opmode == IEEE80211_M_MONITOR) @@ -1959,7 +1964,7 @@ if (ic->ic_opmode == IEEE80211_M_HOSTAP) break; error = ieee80211_setupscan(ic, ic->ic_chan_avail); - if (error == 0) + if (error == 0) /* XXX background scan */ error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; case IEEE80211_IOC_MACCMD: From owner-p4-projects@FreeBSD.ORG Fri Nov 12 23:40:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A04916A4F8; Fri, 12 Nov 2004 23:40:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B771216A4D0 for ; Fri, 12 Nov 2004 23:40:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A024243D2F for ; Fri, 12 Nov 2004 23:40:30 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACNeU4S042156 for ; Fri, 12 Nov 2004 23:40:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACNeUrp042153 for perforce@freebsd.org; Fri, 12 Nov 2004 23:40:30 GMT (envelope-from peter@freebsd.org) Date: Fri, 12 Nov 2004 23:40:30 GMT Message-Id: <200411122340.iACNeUrp042153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 23:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=64983 Change 64983 by peter@peter_daintree on 2004/11/12 23:39:51 Pave way for providing an alternate #include Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED97016A4D1; Fri, 12 Nov 2004 23:41:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC74A16A4CE for ; Fri, 12 Nov 2004 23:41:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9197A43D1D for ; Fri, 12 Nov 2004 23:41:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACNfWso042207 for ; Fri, 12 Nov 2004 23:41:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACNfWBO042204 for perforce@freebsd.org; Fri, 12 Nov 2004 23:41:32 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Nov 2004 23:41:32 GMT Message-Id: <200411122341.iACNfWBO042204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 23:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=64984 Change 64984 by sam@sam_ebb on 2004/11/12 23:40:42 checkpoint background scanning work; ready to detach from the state machine Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#13 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#9 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#12 (text+ko) ==== @@ -69,7 +69,7 @@ { switch (subtype) { case IEEE80211_FC0_SUBTYPE_BEACON: - return (ic->ic_state == IEEE80211_S_SCAN); + return (ic->ic_flags & IEEE80211_F_SCAN); case IEEE80211_FC0_SUBTYPE_PROBE_REQ: return (ic->ic_opmode == IEEE80211_M_IBSS); } @@ -160,7 +160,7 @@ 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_state != IEEE80211_S_SCAN) { + if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { switch (ic->ic_opmode) { case IEEE80211_M_STA: bssid = wh->i_addr2; @@ -1644,17 +1644,16 @@ } else IEEE80211_NODE_STAT(ni, rx_proberesp); /* - * We process beacon/probe response frames for: - * o station mode when associated: to collect state - * updates such as 802.11g slot time - * o adhoc mode: to discover neighbors - * o when scanning + * We process beacon/probe response frames: + * o when scanning, or + * o station mode when associated (to collect state + * updates such as 802.11g slot time), or + * o adhoc mode (to discover neighbors) * Frames otherwise received are discarded. */ - if (!((ic->ic_opmode == IEEE80211_M_STA && ni->ni_associd != 0) - || ic->ic_opmode == IEEE80211_M_IBSS - || ic->ic_state == IEEE80211_S_SCAN)) { - /* XXX: may be useful for background scan */ + if (!((ic->ic_flags & IEEE80211_F_SCAN) || + (ic->ic_opmode == IEEE80211_M_STA && ni->ni_associd) || + ic->ic_opmode != IEEE80211_M_IBSS)) { ic->ic_stats.is_rx_mgtdiscard++; return; } @@ -1785,10 +1784,17 @@ } /* - * Station mode, check for state updates. We - * consider only 11g stuff right now. + * When operating in station mode, check for state updates. + * Be careful to ignore beacons received while doing a + * background scan. We consider only 11g stuff right now + * (XXX WME to come). */ - if (ic->ic_opmode == IEEE80211_M_STA && ni->ni_associd != 0) { + if (ni->ni_associd != 0 && + ((ic->ic_flags & IEEE80211_F_SCAN) == 0 || + IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid))) { + KASSERT(ic->ic_opmode == IEEE80211_M_STA, + ("beacon in %u mode with associd 0x%x?", + ic->ic_opmode, ni->ni_associd)); if (ni->ni_erp != erp) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, "erp change from %s: was 0x%x, now 0x%x\n", @@ -1817,6 +1823,7 @@ /* XXX statistic */ } ni->ni_inact = ic->ic_inact_run; + /* NB: don't need the rest of this */ return; } @@ -1834,7 +1841,7 @@ * as ibss participants so we don't populate our * neighbor table with unintersting sta's. */ - if (ic->ic_state != IEEE80211_S_SCAN) { + if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { if ((capinfo & IEEE80211_CAPINFO_IBSS) == 0) return; ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#13 (text+ko) ==== @@ -274,16 +274,14 @@ (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive", ic->ic_scan.nt_scangen); /* - * Clear scan state and flush any previously seen - * AP's. Note that the latter assumes we don't act - * as both an AP and a station, otherwise we'll - * potentially flush state of stations associated - * with us. + * Clear scan state and flush any previously seen AP's. */ ieee80211_reset_scan(ic); if (reset) ieee80211_free_allnodes(&ic->ic_scan); + ic->ic_flags |= IEEE80211_F_SCAN; + /* Scan the next channel. */ ieee80211_next_scan(ic); } @@ -314,7 +312,22 @@ ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan), ieee80211_chan2ieee(ic, chan)); ieee80211_set_chan(ic, ic->ic_bss, chan); +#ifdef notyet + /* XXX driver state change */ + /* + * Scan next channel. If doing an active scan + * and the channel is not marked passive-only + * then send a probe request. Otherwise just + * listen for beacons on the channel. + */ + if ((ic->ic_flags & IEEE80211_F_ASCAN) && + (ni->ni_chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0) { + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_PROBE_REQ, 0); + } +#else ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); +#endif return 1; } } while (chan != ic->ic_bss->ni_chan); @@ -505,7 +518,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "end %s scan\n", (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive"); - ic->ic_flags &= ~IEEE80211_F_ASCAN; + ic->ic_flags &= ~(IEEE80211_F_SCAN | IEEE80211_F_ASCAN); nt = &ic->ic_scan; ni = TAILQ_FIRST(&nt->nt_node); @@ -583,6 +596,7 @@ * Reset the list of channels to scan and start again. */ ieee80211_reset_scan(ic); + ic->ic_flags |= IEEE80211_F_SCAN; ieee80211_next_scan(ic); return; } @@ -960,7 +974,7 @@ /* XXX may want scanned nodes in the neighbor table for adhoc */ if (ic->ic_opmode == IEEE80211_M_STA || ic->ic_opmode == IEEE80211_M_MONITOR || - ic->ic_state == IEEE80211_S_SCAN /*XXX*/) + (ic->ic_flags & IEEE80211_F_SCAN)) nt = &ic->ic_scan; else nt = ic->ic_sta; ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#8 (text+ko) ==== @@ -126,7 +126,8 @@ * to communicate this directly rather than do something * implicit based on surrounding state. */ - if (ni == ic->ic_bss && ic->ic_state == IEEE80211_S_SCAN) { + if (type == IEEE80211_FC0_SUBTYPE_PROBE_REQ && + (ic->ic_flags & IEEE80211_F_SCAN)) { IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr); IEEE80211_ADDR_COPY(wh->i_addr2, ic->ic_myaddr); IEEE80211_ADDR_COPY(wh->i_addr3, ifp->if_broadcastaddr); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#6 (text+ko) ==== @@ -559,12 +559,6 @@ ic->ic_auth->ia_detach(ic); break; case IEEE80211_S_SCAN: - ic->ic_flags &= ~IEEE80211_F_SIBSS; - /* XXX initialize bss for probe request */ - ni->ni_rates = ic->ic_sup_rates[ - ieee80211_chan2mode(ic, ni->ni_chan)]; - ni->ni_associd = 0; /* XXX? */ - ni->ni_rstamp = 0; /* XXX? */ switch (ostate) { case IEEE80211_S_INIT: if ((ic->ic_opmode == IEEE80211_M_HOSTAP || @@ -599,6 +593,7 @@ "no recent beacons from %s; rescanning\n", ether_sprintf(ic->ic_bss->ni_bssid)); ieee80211_sta_leave(ic, ni); + ic->ic_flags &= ~IEEE80211_F_SIBSS; /* XXX */ /* FALLTHRU */ case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#9 (text+ko) ==== @@ -291,8 +291,10 @@ #define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN) /* ic_flags */ +/* NB: bits 0x6f available */ /* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */ #define IEEE80211_F_PRIVACY 0x00000010 /* CONF: privacy enabled */ +#define IEEE80211_F_SCAN 0x00000080 /* STATUS: scanning */ #define IEEE80211_F_ASCAN 0x00000100 /* STATUS: active scan */ #define IEEE80211_F_SIBSS 0x00000200 /* STATUS: start IBSS */ /* NB: this is intentionally setup to be IEEE80211_CAPINFO_SHORT_SLOTTIME */ @@ -300,7 +302,7 @@ #define IEEE80211_F_PMGTON 0x00000800 /* CONF: Power mgmt enable */ #define IEEE80211_F_DESBSSID 0x00001000 /* CONF: des_bssid is set */ #define IEEE80211_F_WME 0x00002000 /* CONF: enable WME use */ -#define IEEE80211_F_ROAMING 0x00004000 /* CONF: roaming enabled */ +#define IEEE80211_F_ROAMING 0x00004000 /* CONF: roaming enabled (???)*/ #define IEEE80211_F_SWRETRY 0x00008000 /* CONF: sw tx retry enabled */ #define IEEE80211_F_TXPOW_FIXED 0x00010000 /* TX Power: fixed rate */ #define IEEE80211_F_IBSSON 0x00020000 /* CONF: IBSS creation enable */ @@ -333,6 +335,9 @@ #define IEEE80211_C_SHPREAMBLE 0x00008000 /* CAPABILITY: short preamble */ #define IEEE80211_C_MONITOR 0x00010000 /* CAPABILITY: monitor mode */ #define IEEE80211_C_TKIPMIC 0x00020000 /* CAPABILITY: TKIP MIC avail */ +#define IEEE80211_C_WPA1 0x00800000 /* CAPABILITY: WPA1 avail */ +#define IEEE80211_C_WPA2 0x01000000 /* CAPABILITY: WPA2 avail */ +#define IEEE80211_C_WPA 0x01800000 /* CAPABILITY: WPA1+WPA2 avail*/ /* XXX protection/barker? */ #define IEEE80211_C_CRYPTO 0x0000002f /* CAPABILITY: crypto alg's */ From owner-p4-projects@FreeBSD.ORG Sat Nov 13 01:23:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8E616A4D1; Sat, 13 Nov 2004 01:23:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1E8C16A4CE for ; Sat, 13 Nov 2004 01:23:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B495B43D39 for ; Sat, 13 Nov 2004 01:23:36 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAD1NaKm052269 for ; Sat, 13 Nov 2004 01:23:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAD1NafY052266 for perforce@freebsd.org; Sat, 13 Nov 2004 01:23:36 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 01:23:36 GMT Message-Id: <200411130123.iAD1NafY052266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 01:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=64987 Change 64987 by sam@sam_ebb on 2004/11/13 01:23:23 list chan list caps Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#10 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#10 (text+ko) ==== @@ -767,9 +767,88 @@ } while (len >= sizeof(struct ieee80211req_sta_info)); } +#include + +/* + * Useful combinations of channel characteristics. + */ +#define IEEE80211_CHAN_FHSS \ + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK) +#define IEEE80211_CHAN_A \ + (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM) +#define IEEE80211_CHAN_B \ + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK) +#define IEEE80211_CHAN_PUREG \ + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM) +#define IEEE80211_CHAN_G \ + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN) +#define IEEE80211_CHAN_T \ + (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) + +#define IEEE80211_IS_CHAN_FHSS(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS) +#define IEEE80211_IS_CHAN_A(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) +#define IEEE80211_IS_CHAN_B(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) +#define IEEE80211_IS_CHAN_PUREG(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG) +#define IEEE80211_IS_CHAN_G(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) +#define IEEE80211_IS_CHAN_T(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T) +#define IEEE80211_IS_CHAN_PASSIVE(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE)) + +static void +print_chaninfo(const struct ieee80211_chaninfo *c) +{ + char buf[14]; + + buf[0] = '\0'; + if (IEEE80211_IS_CHAN_FHSS(c)) + strlcat(buf, " FHSS", sizeof(buf)); + if (IEEE80211_IS_CHAN_A(c)) + strlcat(buf, " 11a", sizeof(buf)); + /* XXX 11g schizophrenia */ + if (IEEE80211_IS_CHAN_G(c) || + IEEE80211_IS_CHAN_PUREG(c)) + strlcat(buf, " 11g", sizeof(buf)); + else if (IEEE80211_IS_CHAN_B(c)) + strlcat(buf, " 11b", sizeof(buf)); + if (IEEE80211_IS_CHAN_T(c)) + strlcat(buf, " Turbo", sizeof(buf)); + printf("Channel %3u : %u%c Mhz%-14.14s", + ieee80211_mhz2ieee(c->ic_freq), c->ic_freq, + IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', buf); +} + static void list_channels(int s) { + struct ieee80211req ireq; + struct ieee80211req_chaninfo chans; + int i, half; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_CHANINFO; + ireq.i_data = &chans; + ireq.i_len = sizeof(chans); + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get channel information"); + half = chans.ic_nchans / 2; + if (chans.ic_nchans % 2) + half++; + for (i = 0; i < chans.ic_nchans / 2; i++) { + print_chaninfo(&chans.ic_chans[i]); + print_chaninfo(&chans.ic_chans[half+i]); + printf("\n"); + } + if (chans.ic_nchans % 2) { + print_chaninfo(&chans.ic_chans[i]); + printf("\n"); + } } static void @@ -777,9 +856,24 @@ { } +#define IEEE80211_C_BITS \ +"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\7IBSS\12PMGT\13HOSTAP\14AHDEMO\15SWRETRY" \ +"\16TXPMGT\17SHSLOT\20SHPREAMBLE\21MONITOR\22TKIPMIC\30WPA1\31WPA2" + static void list_capabilities(int s) { + struct ieee80211req ireq; + u_int32_t caps; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_DRIVER_CAPS; + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get driver capabilities"); + caps = (((u_int16_t) ireq.i_val) << 16) | ((u_int16_t) ireq.i_len); + printb(name, caps, IEEE80211_C_BITS); + putchar('\n'); } static void From owner-p4-projects@FreeBSD.ORG Sat Nov 13 01:24:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F373916A4D2; Sat, 13 Nov 2004 01:24:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DB2916A4CE for ; Sat, 13 Nov 2004 01:24:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 877DD43D1F for ; Sat, 13 Nov 2004 01:24:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAD1Oc5L052292 for ; Sat, 13 Nov 2004 01:24:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAD1Oc9o052289 for perforce@freebsd.org; Sat, 13 Nov 2004 01:24:38 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 01:24:38 GMT Message-Id: <200411130124.iAD1Oc9o052289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 01:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=64988 Change 64988 by sam@sam_ebb on 2004/11/13 01:23:52 fill in some more ioctls Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#14 (text+ko) ==== @@ -866,14 +866,13 @@ } static int -ieee80211_ioctl_getchanlist(struct ieee80211com *ic, struct ieee80211req *ireq) +ieee80211_ioctl_getchaninfo(struct ieee80211com *ic, struct ieee80211req *ireq) { - struct ieee80211req_chanlist chans; - int i, j; + struct ieee80211req_chaninfo chans; /* XXX off stack? */ + int i, space; if (ireq->i_len != sizeof(chans)) return EINVAL; - memset(&chans, 0, sizeof(chans)); /* * Since channel 0 is not available for DS, channel 1 * is assigned to LSB on WaveLAN. @@ -882,10 +881,19 @@ i = 1; else i = 0; - for (j = 0; i <= IEEE80211_CHAN_MAX; i++, j++) - if (isset(ic->ic_chan_active, i)) - setbit(chans.ic_channels, j); - return copyout(&chans, ireq->i_data, sizeof(chans)); + memset(&chans, 0, sizeof(chans)); + for (; i <= IEEE80211_CHAN_MAX; i++) + if (isset(ic->ic_chan_active, i)) { + struct ieee80211_channel *c = &ic->ic_channels[i]; + chans.ic_chans[chans.ic_nchans].ic_freq = c->ic_freq; + chans.ic_chans[chans.ic_nchans].ic_flags = c->ic_flags; + chans.ic_nchans++; + } + space = __offsetof(struct ieee80211req_chaninfo, + ic_chans[chans.ic_nchans]); + if (space > ireq->i_len) + space = ireq->i_len; + return copyout(&chans, ireq->i_data, space); } static int @@ -1245,7 +1253,8 @@ ireq->i_val = (ic->ic_flags & IEEE80211_F_COUNTERM) != 0; break; case IEEE80211_IOC_DRIVER_CAPS: - ireq->i_val = ic->ic_caps; + ireq->i_val = ic->ic_caps>>16; + ireq->i_len = ic->ic_caps&0xffff; break; case IEEE80211_IOC_WME: ireq->i_val = (ic->ic_flags & IEEE80211_F_WME) != 0; @@ -1267,8 +1276,8 @@ case IEEE80211_IOC_WPAKEY: error = ieee80211_ioctl_getkey(ic, ireq); break; - case IEEE80211_IOC_CHANLIST: - error = ieee80211_ioctl_getchanlist(ic, ireq); + case IEEE80211_IOC_CHANINFO: + error = ieee80211_ioctl_getchaninfo(ic, ireq); break; case IEEE80211_IOC_BSSID: if (ireq->i_len != IEEE80211_ADDR_LEN) @@ -1929,7 +1938,9 @@ rsn->rsn_ucastkeylen = ireq->i_val; break; case IEEE80211_IOC_DRIVER_CAPS: - ic->ic_caps = ireq->i_val; /* NB: for testing */ + /* NB: for testing */ + ic->ic_caps = (((u_int16_t) ireq->i_val) << 16) | + ((u_int16_t) ireq->i_len); break; case IEEE80211_IOC_KEYMGTALGS: /* XXX check */ ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#7 (text+ko) ==== @@ -247,6 +247,17 @@ }; /* + * Get the active channel list info. + */ +struct ieee80211req_chaninfo { + u_int ic_nchans; + struct ieee80211_chaninfo { + u_int16_t ic_freq; /* setting in Mhz */ + u_int16_t ic_flags; /* see below */ + } ic_chans[256]; +}; + +/* * Retrieve the WPA/RSN information element for an associated station. */ struct ieee80211req_wpaie { @@ -377,7 +388,8 @@ #define IEEE80211_IOC_WPAIE 39 /* WPA information element */ #define IEEE80211_IOC_STA_STATS 40 /* per-station statistics */ #define IEEE80211_IOC_MACCMD 41 /* MAC ACL operation */ -/* 42-44 available */ +#define IEEE80211_IOC_CHANINFO 42 /* channel info list */ +/* 43-44 available */ #define IEEE80211_IOC_STA_INFO 45 /* station/neighbor info */ #ifndef IEEE80211_CHAN_ANY From owner-p4-projects@FreeBSD.ORG Sat Nov 13 01:24:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4186516A4D0; Sat, 13 Nov 2004 01:24:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2D9D16A4D0 for ; Sat, 13 Nov 2004 01:24:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D837543D1F for ; Sat, 13 Nov 2004 01:24:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAD1OcIc052298 for ; Sat, 13 Nov 2004 01:24:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAD1OcEc052295 for perforce@freebsd.org; Sat, 13 Nov 2004 01:24:38 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 01:24:38 GMT Message-Id: <200411130124.iAD1OcEc052295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 01:24:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64989 Change 64989 by sam@sam_ebb on 2004/11/13 01:24:24 mark WPA capability; fix bogon curly brace Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#20 (text+ko) ==== @@ -460,6 +460,7 @@ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_TXPMGT /* transmit power control */ + | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ ; /* * Query the hal to figure out h/w crypto support. @@ -1678,7 +1679,6 @@ else ath_setslottime(sc); } -} /* * Allocate and setup an initial beacon frame. From owner-p4-projects@FreeBSD.ORG Sat Nov 13 01:33:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6A416A4D1; Sat, 13 Nov 2004 01:33:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69E6316A4CE for ; Sat, 13 Nov 2004 01:33:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FFB743D48 for ; Sat, 13 Nov 2004 01:33:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAD1XoEF052575 for ; Sat, 13 Nov 2004 01:33:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAD1XoKf052572 for perforce@freebsd.org; Sat, 13 Nov 2004 01:33:50 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 01:33:50 GMT Message-Id: <200411130133.iAD1XoKf052572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 01:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=64990 Change 64990 by sam@sam_ebb on 2004/11/13 01:33:13 gah, get the bit number correct Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#11 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#11 (text+ko) ==== @@ -857,8 +857,8 @@ } #define IEEE80211_C_BITS \ -"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\7IBSS\12PMGT\13HOSTAP\14AHDEMO\15SWRETRY" \ -"\16TXPMGT\17SHSLOT\20SHPREAMBLE\21MONITOR\22TKIPMIC\30WPA1\31WPA2" +"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\11IBSS\12PMGT\13HOSTAP\14AHDEMO" \ +"\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE\21MONITOR\22TKIPMIC\30WPA1\31WPA2" static void list_capabilities(int s) From owner-p4-projects@FreeBSD.ORG Sat Nov 13 14:36:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DDB516A4D1; Sat, 13 Nov 2004 14:36:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 270A216A4CE for ; Sat, 13 Nov 2004 14:36:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2F9743D1F for ; Sat, 13 Nov 2004 14:36:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iADEaiS8099446 for ; Sat, 13 Nov 2004 14:36:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iADEagO6099443 for perforce@freebsd.org; Sat, 13 Nov 2004 14:36:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 Nov 2004 14:36:42 GMT Message-Id: <200411131436.iADEagO6099443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 65013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 14:36:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=65013 Change 65013 by rwatson@rwatson_tislabs on 2004/11/13 14:35:43 Integrate TrustedBSD base branch from FreeBSD CVS HEAD. Pull in a broad range of changes, including OpenSSH update. Loop back System V IPC ABI work from trustedbsd_mac. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#37 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#56 integrate .. //depot/projects/trustedbsd/base/UPDATING#50 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#15 integrate .. //depot/projects/trustedbsd/base/bin/stty/key.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.1#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/.cvsignore#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/Makefile#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/README#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/README#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/buildbff.sh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/inventory.sh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/pam.conf#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/openssh.spec#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/ssh-host-keygen#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/sshd.init#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/sshd.pam#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/Makefile#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/README#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/ssh-host-config#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/ssh-user-config#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/findssl.sh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/gnome-ssh-askpass1.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/gnome-ssh-askpass2.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/README#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/egd#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/egd.rc#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/sshd#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/sshd.rc#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/openssh.spec#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/sshd.init#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/sshd.pam#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/README#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/buildpkg.sh#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/opensshd.in#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/ssh-copy-id#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/ssh-copy-id.1#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/sshd.pam.freebsd#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/sshd.pam.generic#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/suse/openssh.spec#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/suse/rc.config.sshd#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/suse/rc.sshd#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/.cvsignore#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/scard/.cvsignore#3 delete .. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#24 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#42 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#13 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/trustedbsd/base/etc/namedb/named.conf#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#23 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/swap1#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/tmp#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/var#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/vinum#4 delete .. //depot/projects/trustedbsd/base/etc/rc.subr#18 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#25 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.1#9 integrate .. //depot/projects/trustedbsd/base/include/Makefile#41 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#32 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string_sprintf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libbegemot/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/_ctx_start.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/alloca.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/divsi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/signalcontext.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/memcmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/memmove.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/strcmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/fork.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/getcontext.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/rand.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/arm/context.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/arm/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#19 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#28 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/popen.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#12 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/lockdflt.c#3 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/arm/lockdflt.c#2 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/lockdflt.c#2 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/lockdflt.c#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#25 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#56 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#17 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#14 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#27 integrate .. //depot/projects/trustedbsd/base/sbin/comcontrol/comcontrol.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/rule.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/gconcat.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/migrate.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#26 integrate .. //depot/projects/trustedbsd/base/sbin/init/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#34 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/slattach/slattach.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/Makefile#5 delete .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#15 delete .. //depot/projects/trustedbsd/base/sbin/vinum/list.c#9 delete .. //depot/projects/trustedbsd/base/sbin/vinum/v.c#8 delete .. //depot/projects/trustedbsd/base/sbin/vinum/vext.h#6 delete .. //depot/projects/trustedbsd/base/sbin/vinum/vinum.8#14 delete .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#31 integrate .. //depot/projects/trustedbsd/base/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#51 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_video.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/em.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gdb.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gx.4#8 delete .. //depot/projects/trustedbsd/base/share/man/man4/ixgb.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_asus.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mouse.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/polling.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/route.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ste.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#32 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#43 integrate .. //depot/projects/trustedbsd/base/share/man/man5/remote.5#5 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#22 integrate .. //depot/projects/trustedbsd/base/share/man/man9/condvar.9#6 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#20 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#19 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#38 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#32 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/smp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/critical.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/intr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/mem.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/support.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpu.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/endian.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/memdev.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/param.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/commands.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#23 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf.5#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_filio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#24 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#55 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#79 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#46 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#37 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#55 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_snc.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/lsi64854.c#3 delete .. //depot/projects/trustedbsd/base/sys/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/esp/lsi64854var.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gx.c#13 delete .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gxvar.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/snp/snp.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/streams/streams.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/request.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#14 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumconfig.c#19 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumdaemon.c#8 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumext.h#12 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumhdr.h#6 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#21 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#18 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumkw.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumlock.c#6 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinummemory.c#8 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumobj.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumparser.c#7 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrequest.c#15 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrevive.c#12 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumstate.c#5 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumvar.h#6 delete .. //depot/projects/trustedbsd/base/sys/fs/autofs/autofs.h#2 delete .. //depot/projects/trustedbsd/base/sys/fs/autofs/autofs_util.c#2 delete .. //depot/projects/trustedbsd/base/sys/fs/autofs/autofs_vfsops.c#2 delete .. //depot/projects/trustedbsd/base/sys/fs/autofs/autofs_vnops.c#2 delete .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#31 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#33 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs.h#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#36 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_mount.h#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_asus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#46 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/autoconf.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/atomic.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/sysarch.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pbio.c#2 delete .. //depot/projects/trustedbsd/base/sys/isa/vga_isa.c#10 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_physio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_param.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_cow.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_jumbo.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#48 integrate .. //depot/projects/trustedbsd/base/sys/libkern/arm/divsi3.S#3 integrate .. //depot/projects/trustedbsd/base/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#59 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/Makefile#18 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_snc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/autofs/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/esp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/gx/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/vinum/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_pppvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#27 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_tty.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_aal5.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/hci/ng_hci_main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/hci/ng_hci_misc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/hci/ng_hci_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#51 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_seq.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#38 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ah_core.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/keysock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netipx/spx_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netkey/key.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netkey/key.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netkey/keydb.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netkey/keysock.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_dev.c#13 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#24 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#35 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#32 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#36 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#18 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_de.c#18 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sfreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#34 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#24 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#40 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#47 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/_types.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/fdcio.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/kernel.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/ktr.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#37 integrate .. //depot/projects/trustedbsd/base/sys/sys/mdioctl.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/msg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#41 integrate .. //depot/projects/trustedbsd/base/sys/sys/pbioio.h#2 delete .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/resource.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/rman.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/sem.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/sf_buf.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/shm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/syslog.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/ttydefaults.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#50 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#40 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#40 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#49 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#49 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.h#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_param.h#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#37 integrate .. //depot/projects/trustedbsd/base/tools/debugscripts/dot.gdbinit#4 integrate .. //depot/projects/trustedbsd/base/tools/debugscripts/gdbinit.vinum#3 delete .. //depot/projects/trustedbsd/base/tools/regression/README#9 integrate .. //depot/projects/trustedbsd/base/tools/regression/TODO#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom/RunTest.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_concat/test-1.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_concat/test-2.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-1.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-2.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-3.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/include/tgmath/tgmath.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-btowc.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mblen.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrtowc.c#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbtowc.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-sputrune.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-towctrans.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcrtomb.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wctomb.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-perror.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/string/test-strerror.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/test-fenv.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/test-ilogb.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/pipe/bigpipetest.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/kqueue/kqueue.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/m4/regress.sh#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#14 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/regress.m4#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.sh#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.t#1 branch .. //depot/projects/trustedbsd/base/tools/tools/genericize/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/tools/raidtest/README#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/raidtest/raidtest.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_5.rc#5 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/cut/cut.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/ee/ee.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/fstat/fstat.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/ipcs/ipcs.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/limits/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/compat.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/config.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.h#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/opieinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/opiepasswd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/rlogin/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/rsh/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/extern.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/forward.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/misc.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/read.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/reverse.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpiconf/acpiconf.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.8#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/diskinfo/diskinfo.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/diskinfo/diskinfo.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fdread/fdutil.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/moused/moused.8#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/defs.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/nfsd/nfsd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpcbind/rpcbind.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpcbind/rpcbind.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/Makefile#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/index.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#37 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.8#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.c#23 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ +# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ # # The user-driven targets are: # @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + build32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/trustedbsd/base/Makefile.inc1#56 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,7 +83,7 @@ .endif CVS?= cvs -CVSFLAGS?= -A -P -d +CVSFLAGS?= -A -P -d -I! SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -201,6 +201,46 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +.if ${MACHINE_ARCH} == "amd64" +# 32 bit world +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 + +LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ + -L${LIB32TMP}/usr/lib32 \ + -B${LIB32TMP}/usr/lib32 +LIB32CC= ${LIB32PREFLAGS} \ + ${LIB32POSTFLAGS} +LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ + ${LIB32POSTFLAGS} +LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ + ${LIB32POSTFLAGS} + +# Yes, the flags are redundant. +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE_ARCH=i386 \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 + +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 +.endif + # install stage .if empty(.MAKEFLAGS:M-n) IMAKEENV= ${CROSSENV} \ @@ -338,6 +378,53 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +.if ${MACHINE_ARCH} == "amd64" +build32: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 5.1: building 32 bit shim libraries" + @echo "--------------------------------------------------------------" +.for _dir in \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ + usr/libexec usr/sbin usr/share/misc \ + usr/share/snmp/defs usr/share/snmp/mibs + mkdir -p ${LIB32TMP}/${_dir} +.endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${LIB32TMP}/usr/include >/dev/null + ln -sf ${.CURDIR}/sys ${WORLDTMP} +.for _t in obj includes + cd ${.CURDIR}/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/gnu/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif +.endfor +.for _dir in lib/libncurses lib/libmagic + cd ${.CURDIR}/${_dir}; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools +.endfor + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endfor + +install32: + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + cd ${.CURDIR}/lib; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install +.endif + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif WMAKE_TGTS= @@ -349,6 +436,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) +WMAKE_TGTS+= build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -479,6 +569,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.endif redistribute: @echo "--------------------------------------------------------------" ==== //depot/projects/trustedbsd/base/UPDATING#50 (text+ko) ==== @@ -23,6 +23,19 @@ developers choose to disable these features on build machines to maximize performance. +20041110: + We have had a hack which would mount the root filesystem + R/W if the device were named 'md*'. As part of the vnode + work I'm doing I have had to remove this hack. People + building systems which use preloaded MD root filesystems + may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in + their /etc/rc scripts. + +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ ==== //depot/projects/trustedbsd/base/bin/pax/tar.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $"); #include #include @@ -387,7 +387,13 @@ * copy out the name and values in the stat buffer */ hd = (HD_TAR *)buf; - arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1); + /* + * old tar format specifies the name always be null-terminated, + * but let's be robust to broken archives. + * the same applies to handling links below. + */ + arcn->nlen = l_strncpy(arcn->name, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name)) - 1); arcn->name[arcn->nlen] = '\0'; arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) & 0xfff); @@ -417,7 +423,7 @@ */ arcn->type = PAX_SLK; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; arcn->sb.st_mode |= S_IFLNK; break; @@ -429,7 +435,7 @@ arcn->type = PAX_HLK; arcn->sb.st_nlink = 2; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; /* @@ -533,7 +539,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { + if (arcn->ln_nlen >= (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -749,12 +755,19 @@ */ dest = arcn->name; if (*(hd->prefix) != '\0') { - cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2); + cnt = l_strncpy(dest, hd->prefix, + MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2)); dest += cnt; *dest++ = '/'; cnt++; } - arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt); + /* + * ustar format specifies the name may be unterminated + * if it fills the entire field. this also applies to + * the prefix and the linkname. + */ + arcn->nlen = cnt + l_strncpy(dest, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1)); arcn->name[arcn->nlen] = '\0'; /* @@ -848,7 +861,7 @@ * copy the link name */ arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1)); arcn->ln_name[arcn->ln_nlen] = '\0'; break; case CONTTYPE: @@ -900,7 +913,7 @@ */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || (arcn->type == PAX_HRG)) && - (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { + (arcn->ln_nlen > (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 13 14:51:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C42B16A4D1; Sat, 13 Nov 2004 14:51:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6470716A4CE for ; Sat, 13 Nov 2004 14:51:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CC7643D1D for ; Sat, 13 Nov 2004 14:51:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iADEp5q5000131 for ; Sat, 13 Nov 2004 14:51:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iADEp3oY000127 for perforce@freebsd.org; Sat, 13 Nov 2004 14:51:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 Nov 2004 14:51:03 GMT Message-Id: <200411131451.iADEp3oY000127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 65016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 14:51:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=65016 Change 65016 by rwatson@rwatson_tislabs on 2004/11/13 14:50:11 Integrate TrustedBSD MAC branch from TrustedBSD base branch, including OpenSSH upgrade. Loop back System V IPC ABI cleanup. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#51 integrate .. //depot/projects/trustedbsd/mac/UPDATING#42 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/stty/key.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.1#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/buildbff.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/inventory.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/pam.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/ssh-host-keygen#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/sshd.init#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/sshd.pam#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/ssh-host-config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/ssh-user-config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/findssl.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/gnome-ssh-askpass1.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/gnome-ssh-askpass2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/egd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/egd.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/sshd.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/sshd.init#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/sshd.pam#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/buildpkg.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/opensshd.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/ssh-copy-id#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/ssh-copy-id.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/sshd.pam.freebsd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/sshd.pam.generic#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/rc.config.sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/rc.sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/scard/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/etc/defaults/pccard.conf#20 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#38 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#11 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.conf#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#15 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/swap1#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/tmp#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/var#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/vinum#4 delete .. //depot/projects/trustedbsd/mac/etc/rc.subr#17 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#23 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.1#9 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#44 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/ksu/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string_sprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libbegemot/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/_ctx_start.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/alloca.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/divsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/signalcontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memcmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memmove.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/strcmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/fork.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/getcontext.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/rand.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#30 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/arm/context.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#18 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#27 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/popen.c#5 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/alpha/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/arm/lockdflt.c#2 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/ia64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/lockdflt.c#2 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/sparc64/lockdflt.c#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#21 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#49 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#73 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#13 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#28 integrate .. //depot/projects/trustedbsd/mac/sbin/comcontrol/comcontrol.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/rule.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/concat/gconcat.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/stripe/gstripe.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#25 integrate .. //depot/projects/trustedbsd/mac/sbin/init/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#29 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.8#13 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/route/route.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/slattach/slattach.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/Makefile#5 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#14 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/list.c#8 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/v.c#8 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/vext.h#6 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/vinum.8#14 delete .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#28 integrate .. //depot/projects/trustedbsd/mac/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi_video.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/em.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gdb.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gx.4#7 delete .. //depot/projects/trustedbsd/mac/share/man/man4/ixgb.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_asus.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mouse.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/route.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ste.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#29 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/remote.5#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/tuning.7#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/condvar.9#6 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#18 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#19 integrate .. //depot/projects/trustedbsd/mac/share/mk/sys.mk#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#31 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/smp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/critical.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/locore.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/mem.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/support.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/asm.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/endian.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/memdev.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/commands.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#26 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf.5#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#57 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#109 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#40 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#68 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_snc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854.c#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwmem.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#15 delete .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxvar.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/maestro.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/request.h#3 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinum.c#13 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumconfig.c#17 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumdaemon.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumext.h#10 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumhdr.h#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.c#19 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#17 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumkw.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumlock.c#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinummemory.c#7 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumobj.h#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumparser.c#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#15 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrevive.c#11 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumstate.c#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumvar.h#6 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs.h#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_util.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_vfsops.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_vnops.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#32 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/autoconf.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/atomic.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/sysarch.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pbio.c#2 delete .. //depot/projects/trustedbsd/mac/sys/isa/vga_isa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#74 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#442 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_param.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_jumbo.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#117 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#72 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/arm/divsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#73 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/acpi_snc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/autofs/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/modules/esp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/gx/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/modules/vinum/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_pppvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/raw_usrreq.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_aal5.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_usrreq.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_socket.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_seq.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/keysock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_usrreq.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/spx_usrreq.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/key.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/key.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/keydb.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#34 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/fd.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sfreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#36 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/vm_machdep.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_types.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/buf.h#24 integrate .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/fdcio.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/filedesc.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#219 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mdioctl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/msg.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#35 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pbioio.h#2 delete .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/resource.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/rman.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sem.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sf_buf.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/shm.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syslog.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#69 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#74 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#31 integrate .. //depot/projects/trustedbsd/mac/tools/debugscripts/dot.gdbinit#4 integrate .. //depot/projects/trustedbsd/mac/tools/debugscripts/gdbinit.vinum#3 delete .. //depot/projects/trustedbsd/mac/tools/regression/README#9 integrate .. //depot/projects/trustedbsd/mac/tools/regression/TODO#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom/RunTest.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_concat/test-1.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_concat/test-2.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-1.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-2.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-3.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/tgmath.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mblen.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbtowc.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sputrune.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-towctrans.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wctomb.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-perror.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/string/test-strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-fenv.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-ilogb.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/pipe/bigpipetest.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/kqueue/kqueue.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/m4/regress.sh#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/regress.m4#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/genericize/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/tools/raidtest/README#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/raidtest/raidtest.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/releng_5.rc#5 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/cut/cut.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ee/ee.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fstat/fstat.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ipcs/ipcs.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/limits/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/config.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#21 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/make.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/opieinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/opiepasswd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rlogin/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rsh/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/forward.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/read.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/reverse.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/tail.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/write.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpiconf/acpiconf.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ancontrol/ancontrol.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.8#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/diskinfo/diskinfo.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fdread/fdutil.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.8#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/nfsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.8#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpcbind/rpcbind.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpcbind/rpcbind.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#20 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/index.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#33 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.8#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#25 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ +# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ # # The user-driven targets are: # @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + build32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/trustedbsd/mac/Makefile.inc1#51 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,7 +83,7 @@ .endif CVS?= cvs -CVSFLAGS?= -A -P -d +CVSFLAGS?= -A -P -d -I! SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -201,6 +201,46 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +.if ${MACHINE_ARCH} == "amd64" +# 32 bit world +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 + +LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ + -L${LIB32TMP}/usr/lib32 \ + -B${LIB32TMP}/usr/lib32 +LIB32CC= ${LIB32PREFLAGS} \ + ${LIB32POSTFLAGS} +LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ + ${LIB32POSTFLAGS} +LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ + ${LIB32POSTFLAGS} + +# Yes, the flags are redundant. +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE_ARCH=i386 \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 + +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 +.endif + # install stage .if empty(.MAKEFLAGS:M-n) IMAKEENV= ${CROSSENV} \ @@ -338,6 +378,53 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +.if ${MACHINE_ARCH} == "amd64" +build32: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 5.1: building 32 bit shim libraries" + @echo "--------------------------------------------------------------" +.for _dir in \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ + usr/libexec usr/sbin usr/share/misc \ + usr/share/snmp/defs usr/share/snmp/mibs + mkdir -p ${LIB32TMP}/${_dir} +.endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${LIB32TMP}/usr/include >/dev/null + ln -sf ${.CURDIR}/sys ${WORLDTMP} +.for _t in obj includes + cd ${.CURDIR}/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/gnu/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif +.endfor +.for _dir in lib/libncurses lib/libmagic + cd ${.CURDIR}/${_dir}; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools +.endfor + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endfor + +install32: + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + cd ${.CURDIR}/lib; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install +.endif + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif WMAKE_TGTS= @@ -349,6 +436,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) +WMAKE_TGTS+= build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -479,6 +569,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.endif redistribute: @echo "--------------------------------------------------------------" ==== //depot/projects/trustedbsd/mac/UPDATING#42 (text+ko) ==== @@ -23,6 +23,19 @@ developers choose to disable these features on build machines to maximize performance. +20041110: + We have had a hack which would mount the root filesystem + R/W if the device were named 'md*'. As part of the vnode + work I'm doing I have had to remove this hack. People + building systems which use preloaded MD root filesystems + may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in + their /etc/rc scripts. + +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ ==== //depot/projects/trustedbsd/mac/bin/pax/tar.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $"); #include #include @@ -387,7 +387,13 @@ * copy out the name and values in the stat buffer */ hd = (HD_TAR *)buf; - arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1); + /* + * old tar format specifies the name always be null-terminated, + * but let's be robust to broken archives. + * the same applies to handling links below. + */ + arcn->nlen = l_strncpy(arcn->name, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name)) - 1); arcn->name[arcn->nlen] = '\0'; arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) & 0xfff); @@ -417,7 +423,7 @@ */ arcn->type = PAX_SLK; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; arcn->sb.st_mode |= S_IFLNK; break; @@ -429,7 +435,7 @@ arcn->type = PAX_HLK; arcn->sb.st_nlink = 2; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; /* @@ -533,7 +539,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { + if (arcn->ln_nlen >= (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -749,12 +755,19 @@ */ dest = arcn->name; if (*(hd->prefix) != '\0') { - cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2); + cnt = l_strncpy(dest, hd->prefix, + MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2)); dest += cnt; *dest++ = '/'; cnt++; } - arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt); + /* + * ustar format specifies the name may be unterminated + * if it fills the entire field. this also applies to + * the prefix and the linkname. + */ + arcn->nlen = cnt + l_strncpy(dest, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1)); arcn->name[arcn->nlen] = '\0'; /* @@ -848,7 +861,7 @@ * copy the link name */ arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1)); arcn->ln_name[arcn->ln_nlen] = '\0'; break; case CONTTYPE: @@ -900,7 +913,7 @@ */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || (arcn->type == PAX_HRG)) && - (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { + (arcn->ln_nlen > (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } @@ -925,17 +938,16 @@ * occur, we remove the / and copy the first part to the prefix >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 13 23:39:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C80F16A4D1; Sat, 13 Nov 2004 23:39:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD6A716A4CE for ; Sat, 13 Nov 2004 23:39:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A05EA43D1D for ; Sat, 13 Nov 2004 23:39:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iADNd2sd033309 for ; Sat, 13 Nov 2004 23:39:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iADNd2Or033306 for perforce@freebsd.org; Sat, 13 Nov 2004 23:39:02 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 23:39:02 GMT Message-Id: <200411132339.iADNd2Or033306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 65059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 23:39:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=65059 Change 65059 by sam@sam_ebb on 2004/11/13 23:38:54 move ieee80211_set11gbasicrates to the rest of the 11g code and make it public Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#7 (text+ko) ==== @@ -51,9 +51,6 @@ #include -static void ieee80211_set11gbasicrates(struct ieee80211_rateset *, - enum ieee80211_phymode); - static const char *ieee80211_phymode_name[] = { "auto", /* IEEE80211_MODE_AUTO */ "11a", /* IEEE80211_MODE_11A */ @@ -676,37 +673,6 @@ } /* - * Mark the basic rates for the 11g rate table based on the - * operating mode. For real 11g we mark all the 11b rates - * and 6, 12, and 24 OFDM. For 11b compatibility we mark only - * 11b rates. There's also a pseudo 11a-mode used to mark only - * the basic OFDM rates. - */ -static void -ieee80211_set11gbasicrates(struct ieee80211_rateset *rs, enum ieee80211_phymode mode) -{ - static const struct ieee80211_rateset basic[] = { - { 0 }, /* IEEE80211_MODE_AUTO */ - { 3, { 12, 24, 48 } }, /* IEEE80211_MODE_11A */ - { 2, { 2, 4 } }, /* IEEE80211_MODE_11B */ - { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_11G (mixed b/g) */ - { 0 }, /* IEEE80211_MODE_FH */ - /* IEEE80211_MODE_PUREG (not yet) */ - { 7, { 2, 4, 11, 22, 12, 24, 48 } }, - }; - int i, j; - - for (i = 0; i < rs->rs_nrates; i++) { - rs->rs_rates[i] &= IEEE80211_RATE_VAL; - for (j = 0; j < basic[mode].rs_nrates; j++) - if (basic[mode].rs_rates[j] == rs->rs_rates[i]) { - rs->rs_rates[i] |= IEEE80211_RATE_BASIC; - break; - } - } -} - -/* * Set the current phy mode and recalculate the active channel * set based on the available channels for this mode. Also * select a new default/current channel if the current one is ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#7 (text+ko) ==== @@ -480,6 +480,37 @@ #undef N } +/* + * Mark the basic rates for the 11g rate table based on the + * operating mode. For real 11g we mark all the 11b rates + * and 6, 12, and 24 OFDM. For 11b compatibility we mark only + * 11b rates. There's also a pseudo 11a-mode used to mark only + * the basic OFDM rates. + */ +void +ieee80211_set11gbasicrates(struct ieee80211_rateset *rs, enum ieee80211_phymode mode) +{ + static const struct ieee80211_rateset basic[] = { + { 0 }, /* IEEE80211_MODE_AUTO */ + { 3, { 12, 24, 48 } }, /* IEEE80211_MODE_11A */ + { 2, { 2, 4 } }, /* IEEE80211_MODE_11B */ + { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_11G (mixed b/g) */ + { 0 }, /* IEEE80211_MODE_FH */ + /* IEEE80211_MODE_PUREG (not yet) */ + { 7, { 2, 4, 11, 22, 12, 24, 48 } }, + }; + int i, j; + + for (i = 0; i < rs->rs_nrates; i++) { + rs->rs_rates[i] &= IEEE80211_RATE_VAL; + for (j = 0; j < basic[mode].rs_nrates; j++) + if (basic[mode].rs_rates[j] == rs->rs_rates[i]) { + rs->rs_rates[i] |= IEEE80211_RATE_BASIC; + break; + } + } +} + static int ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#5 (text+ko) ==== @@ -69,6 +69,10 @@ extern void ieee80211_reset_erp(struct ieee80211com *); extern void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); +extern int ieee80211_iserp_rateset(struct ieee80211com *, + struct ieee80211_rateset *); +extern void ieee80211_set11gbasicrates(struct ieee80211_rateset *, + enum ieee80211_phymode); /* * Return the size of the 802.11 header for a management or data frame. @@ -159,8 +163,6 @@ extern int ieee80211_fix_rate(struct ieee80211com *, struct ieee80211_node *, int); -extern int ieee80211_iserp_rateset(struct ieee80211com *, - struct ieee80211_rateset *); #define ieee80211_new_state(_ic, _nstate, _arg) \ (((_ic)->ic_newstate)((_ic), (_nstate), (_arg))) extern void ieee80211_print_essid(const u_int8_t *, int); From owner-p4-projects@FreeBSD.ORG Sat Nov 13 23:42:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4C2F16A4D1; Sat, 13 Nov 2004 23:42:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B001816A4CE for ; Sat, 13 Nov 2004 23:42:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8550143D31 for ; Sat, 13 Nov 2004 23:42:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iADNg7ux033513 for ; Sat, 13 Nov 2004 23:42:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iADNg7Ne033510 for perforce@freebsd.org; Sat, 13 Nov 2004 23:42:07 GMT (envelope-from sam@freebsd.org) Date: Sat, 13 Nov 2004 23:42:07 GMT Message-Id: <200411132342.iADNg7Ne033510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 65063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 23:42:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=65063 Change 65063 by sam@sam_ebb on 2004/11/13 23:41:07 Cleanup common definitions: add _ieee80211.h to hold intrinsic types and move some types around. This resolves various issues with the ioctl and radiotap support needing to duplicate definitions because it wasn't feasible to include ieee80211_var.h. Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#1 add .. //depot/projects/wifi/sys/net80211/ieee80211.h#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#3 (text+ko) ==== @@ -609,14 +609,4 @@ #define IEEE80211_RTS_MIN 1 #define IEEE80211_RTS_MAX IEEE80211_MAX_LEN -enum { - IEEE80211_AUTH_NONE = 0, - IEEE80211_AUTH_OPEN = 1, /* open */ - IEEE80211_AUTH_SHARED = 2, /* shared-key */ - IEEE80211_AUTH_8021X = 3, /* 802.1x */ - IEEE80211_AUTH_AUTO = 4, /* auto-select/accept */ - /* NB: these are used only for ioctls */ - IEEE80211_AUTH_WPA = 5, /* WPA/RSN w/ 802.1x/PSK */ -}; - #endif /* _NET80211_IEEE80211_H_ */ ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#8 (text+ko) ==== @@ -37,6 +37,7 @@ /* * IEEE 802.11 ioctls. */ +#include #include #include @@ -243,7 +244,7 @@ * scanning. */ struct ieee80211req_chanlist { - u_int8_t ic_channels[32]; /* 256 channels */ + u_int8_t ic_channels[IEEE80211_CHAN_BYTES]; }; /* @@ -251,10 +252,7 @@ */ struct ieee80211req_chaninfo { u_int ic_nchans; - struct ieee80211_chaninfo { - u_int16_t ic_freq; /* setting in Mhz */ - u_int16_t ic_flags; /* see below */ - } ic_chans[256]; + struct ieee80211_channel ic_chans[IEEE80211_CHAN_MAX]; }; /* @@ -292,7 +290,8 @@ u_int8_t isi_erp; /* ERP element */ u_int8_t isi_macaddr[IEEE80211_ADDR_LEN]; u_int8_t isi_nrates; - u_int8_t isi_rates[15]; /* negotiated rates */ + /* negotiated rates */ + u_int8_t isi_rates[IEEE80211_RATE_MAXSIZE]; u_int8_t isi_txrate; /* index to isi_rates[] */ u_int8_t isi_ie_len; /* IE length */ u_int16_t isi_associd; /* assoc response */ @@ -392,10 +391,6 @@ /* 43-44 available */ #define IEEE80211_IOC_STA_INFO 45 /* station/neighbor info */ -#ifndef IEEE80211_CHAN_ANY -#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */ -#endif - /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. */ @@ -410,7 +405,7 @@ u_int8_t isr_erp; /* ERP element */ u_int8_t isr_bssid[IEEE80211_ADDR_LEN]; u_int8_t isr_nrates; - u_int8_t isr_rates[15]; /* XXX */ + u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE]; u_int8_t isr_ssid_len; /* SSID length */ u_int8_t isr_ie_len; /* IE length */ u_int8_t isr_pad[5]; ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#10 (text+ko) ==== @@ -65,14 +65,6 @@ (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \ IEEE80211_NODE_HASHSIZE) -#define IEEE80211_RATE_SIZE 8 /* 802.11 standard */ -#define IEEE80211_RATE_MAXSIZE 15 /* max rates we'll handle */ - -struct ieee80211_rateset { - u_int8_t rs_nrates; - u_int8_t rs_rates[IEEE80211_RATE_MAXSIZE]; -}; - struct ieee80211_rsnparms { u_int8_t rsn_mcastcipher; /* mcast/group cipher */ u_int8_t rsn_mcastkeylen; /* mcast key length */ ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#10 (text+ko) ==== @@ -51,139 +51,17 @@ #error "No support for your operating system!" #endif +#include #include #include #include /* for ieee80211_stats */ #include #include -#define IEEE80211_CHAN_MAX 255 -#define IEEE80211_CHAN_BYTES howmany(IEEE80211_CHAN_MAX, NBBY) -#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */ -#define IEEE80211_CHAN_ANYC \ - ((struct ieee80211_channel *) IEEE80211_CHAN_ANY) - #define IEEE80211_TXPOWER_MAX 100 /* .5 dbM (XXX units?) */ #define IEEE80211_TXPOWER_MIN 0 /* kill radio */ -enum ieee80211_phytype { - IEEE80211_T_DS, /* direct sequence spread spectrum */ - IEEE80211_T_FH, /* frequency hopping */ - IEEE80211_T_OFDM, /* frequency division multiplexing */ - IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */ -}; -#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */ - -/* XXX not really a mode; there are really multiple PHY's */ -enum ieee80211_phymode { - IEEE80211_MODE_AUTO = 0, /* autoselect */ - IEEE80211_MODE_11A = 1, /* 5GHz, OFDM */ - IEEE80211_MODE_11B = 2, /* 2GHz, CCK */ - IEEE80211_MODE_11G = 3, /* 2GHz, OFDM */ - IEEE80211_MODE_FH = 4, /* 2GHz, GFSK */ - IEEE80211_MODE_TURBO = 5, /* 5GHz, OFDM, 2x clock */ -}; -#define IEEE80211_MODE_MAX (IEEE80211_MODE_TURBO+1) - -enum ieee80211_opmode { - IEEE80211_M_STA = 1, /* infrastructure station */ - IEEE80211_M_IBSS = 0, /* IBSS (adhoc) station */ - IEEE80211_M_AHDEMO = 3, /* Old lucent compatible adhoc demo */ - IEEE80211_M_HOSTAP = 6, /* Software Access Point */ - IEEE80211_M_MONITOR = 8 /* Monitor mode */ -}; - -/* - * 802.11g protection mode. - */ -enum ieee80211_protmode { - IEEE80211_PROT_NONE = 0, /* no protection */ - IEEE80211_PROT_CTSONLY = 1, /* CTS to self */ - IEEE80211_PROT_RTSCTS = 2, /* RTS-CTS */ -}; - -/* - * Roaming mode is effectively who controls the operation - * of the 802.11 state machine when operating as a station. - * State transitions are controlled either by the driver - * (typically when management frames are processed by the - * hardware/firmware), the host (auto/normal operation of - * the 802.11 layer), or explicitly through ioctl requests - * when applications like wpa_supplicant want control. - */ -enum ieee80211_roamingmode { - IEEE80211_ROAMING_DEVICE= 0, /* driver/hardware control */ - IEEE80211_ROAMING_AUTO = 1, /* 802.11 layer control */ - IEEE80211_ROAMING_MANUAL= 2, /* application control */ -}; - -/* - * Channels are specified by frequency and attributes. - */ -struct ieee80211_channel { - u_int16_t ic_freq; /* setting in Mhz */ - u_int16_t ic_flags; /* see below */ -}; - -/* bits 0-3 are for private use by drivers */ -/* channel attributes */ -#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */ -#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */ -#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */ -#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */ -#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */ -#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */ -#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */ -#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */ - -/* - * Useful combinations of channel characteristics. - */ -#define IEEE80211_CHAN_FHSS \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK) -#define IEEE80211_CHAN_A \ - (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM) -#define IEEE80211_CHAN_B \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK) -#define IEEE80211_CHAN_PUREG \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM) -#define IEEE80211_CHAN_G \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN) -#define IEEE80211_CHAN_T \ - (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) - -#define IEEE80211_IS_CHAN_FHSS(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS) -#define IEEE80211_IS_CHAN_A(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) -#define IEEE80211_IS_CHAN_B(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) -#define IEEE80211_IS_CHAN_PUREG(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG) -#define IEEE80211_IS_CHAN_G(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) -#define IEEE80211_IS_CHAN_T(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T) - -#define IEEE80211_IS_CHAN_2GHZ(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0) -#define IEEE80211_IS_CHAN_5GHZ(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0) -#define IEEE80211_IS_CHAN_OFDM(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0) -#define IEEE80211_IS_CHAN_CCK(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_CCK) != 0) -#define IEEE80211_IS_CHAN_GFSK(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_GFSK) != 0) - -/* ni_chan encoding for FH phy */ -#define IEEE80211_FH_CHANMOD 80 -#define IEEE80211_FH_CHAN(set,pat) (((set)-1)*IEEE80211_FH_CHANMOD+(pat)) -#define IEEE80211_FH_CHANSET(chan) ((chan)/IEEE80211_FH_CHANMOD+1) -#define IEEE80211_FH_CHANPAT(chan) ((chan)%IEEE80211_FH_CHANMOD) - #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ - #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ struct ieee80211_aclator;