Date: Thu, 27 Jul 2006 09:14:16 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 102537 for review Message-ID: <200607270914.k6R9EGu1055289@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102537 Change 102537 by piso@piso_newluxor on 2006/07/27 09:13:16 IFC Affected files ... .. //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libftpio/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/soc2005/libalias/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/nanobsd/FlashDevice.sub#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.9 2006/03/28 06:06:38 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.10 2006/07/26 16:56:56 imp Exp $ */ /* @@ -40,8 +40,6 @@ #include "libc_private.h" -/* XXX not sure what variants to use for arm. */ - __weak_reference(__libc_allocate_tls, _rtld_allocate_tls); __weak_reference(__libc_free_tls, _rtld_free_tls); ==== //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#3 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.129 2006/07/01 16:51:10 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.130 2006/07/27 04:00:12 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -835,15 +835,13 @@ static arena_chunk_t *arena_chunk_alloc(arena_t *arena); static void arena_chunk_dealloc(arena_chunk_t *chunk); static void arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static void arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static arena_run_t *arena_run_alloc(arena_t *arena, bool large, size_t size); static void arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size); -static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, - size_t size); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, - size_t size); +static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); static void *arena_malloc(arena_t *arena, size_t size); static size_t arena_salloc(const void *ptr); static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); @@ -1778,8 +1776,7 @@ } static void -arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -1850,8 +1847,7 @@ } static void -arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -2057,7 +2053,7 @@ } static arena_run_t * -arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin) { arena_run_t *run; unsigned i, remainder; @@ -2118,8 +2114,7 @@ /* bin->runcur must have space available before this function is called. */ static inline void * -arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { void *ret; @@ -2131,7 +2126,7 @@ run->nfree--; if (run->nfree < run->free_min) { /* Promote run to higher fullness quartile. */ - arena_bin_run_promote(arena, bin, run, size); + arena_bin_run_promote(arena, bin, run); } return (ret); @@ -2139,18 +2134,18 @@ /* Re-fill bin->runcur, then call arena_bin_malloc_easy(). */ static void * -arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin) { assert(bin->runcur == NULL || bin->runcur->quartile == RUN_Q100); - bin->runcur = arena_bin_nonfull_run_get(arena, bin, size); + bin->runcur = arena_bin_nonfull_run_get(arena, bin); if (bin->runcur == NULL) return (NULL); assert(bin->runcur->magic == ARENA_RUN_MAGIC); assert(bin->runcur->nfree > 0); - return (arena_bin_malloc_easy(arena, bin, bin->runcur, size)); + return (arena_bin_malloc_easy(arena, bin, bin->runcur)); } static void * @@ -2173,10 +2168,11 @@ /* Tiny. */ size = pow2_ceil(size); bin = &arena->bins[ffs(size >> (tiny_min_2pow + 1))]; -#ifdef MALLOC_STATS +#if (!defined(NDEBUG) || defined(MALLOC_STATS)) /* - * Bin calculation is always correct, but we may need to - * fix size for the purposes of stats accuracy. + * Bin calculation is always correct, but we may need + * to fix size for the purposes of assertions and/or + * stats accuracy. */ if (size < (1 << tiny_min_2pow)) size = (1 << tiny_min_2pow); @@ -2196,9 +2192,9 @@ malloc_mutex_lock(&arena->mtx); if ((run = bin->runcur) != NULL) - ret = arena_bin_malloc_easy(arena, bin, run, size); + ret = arena_bin_malloc_easy(arena, bin, run); else - ret = arena_bin_malloc_hard(arena, bin, size); + ret = arena_bin_malloc_hard(arena, bin); #ifdef MALLOC_STATS bin->stats.nrequests++; @@ -2343,7 +2339,7 @@ run->nfree++; if (run->nfree > run->free_max) { /* Demote run to lower fullness quartile. */ - arena_bin_run_demote(arena, bin, run, size); + arena_bin_run_demote(arena, bin, run); } } else { /* Medium allocation. */ ==== //depot/projects/soc2005/libalias/lib/libfetch/Makefile#2 (text+ko) ==== @@ -1,16 +1,19 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.46 2006/03/17 18:54:26 ru Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.47 2006/07/27 04:54:03 yar Exp $ .include <bsd.own.mk> LIB= fetch CFLAGS+= -I. -CFLAGS+= -DINET6 SRCS= fetch.c common.c ftp.c http.c file.c \ ftperr.h httperr.h INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} ==== //depot/projects/soc2005/libalias/lib/libftpio/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libftpio/Makefile,v 1.15 2006/07/27 04:54:03 yar Exp $ + +.include <bsd.own.mk> LIB= ftpio SHLIB_MAJOR= 6 @@ -6,10 +8,13 @@ SRCS= ftpio.c ftperr.c INCS= ftpio.h CFLAGS+= -I${.CURDIR} -Wall -CFLAGS+= -DINET6 MAN= ftpio.3 CLEANFILES= ftperr.c +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + ftperr.c: ftp.errors @echo '#include <stdio.h>' > ${.TARGET} @echo '#include "ftpio.h"' >> ${.TARGET} ==== //depot/projects/soc2005/libalias/sys/conf/files.powerpc#2 (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.powerpc,v 1.54 2006/06/08 23:38:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -125,8 +125,6 @@ powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim -powerpc/psim/sio_iobus.c optional sio psim +powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac -dev/zs/zs.c optional powermac zs -dev/zs/zs_macio.c optional powermac zs ==== //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.122 2006/07/27 00:43:34 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1388,13 +1388,13 @@ struct ifnet *ifp = sc->ifp; bus_dma_segment_t segs[EM_MAX_SCATTER]; bus_dmamap_t map; - struct em_buffer *tx_buffer; + struct em_buffer *tx_buffer, *tx_buffer_last; struct em_tx_desc *current_tx_desc; struct mbuf *m_head; struct m_tag *mtag; uint32_t txd_upper, txd_lower, txd_used, txd_saved; int nsegs, i, j; - int error = 0; + int error; m_head = *m_headp; current_tx_desc = NULL; @@ -1412,30 +1412,6 @@ } } - /* - * Map the packet for DMA. - */ - tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; - error = bus_dmamap_load_mbuf_sg(sc->txtag, tx_buffer->map, m_head, - segs, &nsegs, BUS_DMA_NOWAIT); - map = tx_buffer->map; - if (error != 0) { - sc->no_tx_dma_setup++; - return (error); - } - KASSERT(nsegs != 0, ("em_encap: empty packet")); - - if (nsegs > sc->num_tx_desc_avail) { - sc->no_tx_desc_avail2++; - error = ENOBUFS; - goto encap_fail; - } - - if (ifp->if_hwassist > 0) - em_transmit_checksum_setup(sc, m_head, &txd_upper, &txd_lower); - else - txd_upper = txd_lower = 0; - /* Find out if we are in vlan mode. */ mtag = VLAN_OUTPUT_TAG(ifp, m_head); @@ -1452,21 +1428,18 @@ m_head = m_pullup(m_head, sizeof(eh)); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } eh = *mtod(m_head, struct ether_header *); M_PREPEND(m_head, sizeof(*evl), M_DONTWAIT); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } m_head = m_pullup(m_head, sizeof(*evl)); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } evl = mtod(m_head, struct ether_vlan_header *); bcopy(&eh, evl, sizeof(*evl)); @@ -1478,6 +1451,31 @@ *m_headp = m_head; } + /* + * Map the packet for DMA. + */ + tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; + tx_buffer_last = tx_buffer; + map = tx_buffer->map; + error = bus_dmamap_load_mbuf_sg(sc->txtag, map, m_head, segs, &nsegs, + BUS_DMA_NOWAIT); + if (error != 0) { + sc->no_tx_dma_setup++; + return (error); + } + KASSERT(nsegs != 0, ("em_encap: empty packet")); + + if (nsegs > sc->num_tx_desc_avail) { + sc->no_tx_desc_avail2++; + error = ENOBUFS; + goto encap_fail; + } + + if (ifp->if_hwassist > 0) + em_transmit_checksum_setup(sc, m_head, &txd_upper, &txd_lower); + else + txd_upper = txd_lower = 0; + i = sc->next_avail_tx_desc; if (sc->pcix_82544) { txd_saved = i; @@ -1548,6 +1546,8 @@ } tx_buffer->m_head = m_head; + tx_buffer_last->map = tx_buffer->map; + tx_buffer->map = map; bus_dmamap_sync(sc->txtag, map, BUS_DMASYNC_PREWRITE); /* @@ -1572,7 +1572,7 @@ return (0); encap_fail: - bus_dmamap_unload(sc->txtag, tx_buffer->map); + bus_dmamap_unload(sc->txtag, map); return (error); } @@ -2808,7 +2808,7 @@ MCLBYTES, /* maxsize */ 1, /* nsegments */ MCLBYTES, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &sc->rxtag); ==== //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#3 (text) ==== @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.127 2006/07/19 04:12:59 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -140,7 +140,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.127 2006/07/19 04:12:59 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -193,7 +193,12 @@ }, { VENDORID_DLINK, - DEVICEID_DLINK_DGE530T, + DEVICEID_DLINK_DGE530T_A1, + "D-Link DGE-530T Gigabit Ethernet" + }, + { + VENDORID_DLINK, + DEVICEID_DLINK_DGE530T_B1, "D-Link DGE-530T Gigabit Ethernet" }, { 0, 0, NULL } @@ -1805,7 +1810,8 @@ case DEVICEID_BELKIN_5005: case DEVICEID_3COM_3C940: case DEVICEID_LINKSYS_EG1032: - case DEVICEID_DLINK_DGE530T: + case DEVICEID_DLINK_DGE530T_A1: + case DEVICEID_DLINK_DGE530T_B1: /* Stay with VPD PN. */ pname = sc->sk_vpd_prodname; break; ==== //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#3 (text) ==== @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sk/if_skreg.h,v 1.37 2006/07/19 04:12:59 yongari Exp $ + * $FreeBSD: src/sys/dev/sk/if_skreg.h,v 1.38 2006/07/27 05:06:43 yongari Exp $ */ /*- @@ -133,7 +133,8 @@ /* * D-Link gigabit ethernet device ID */ -#define DEVICEID_DLINK_DGE530T 0x4c00 +#define DEVICEID_DLINK_DGE530T_A1 0x4c00 +#define DEVICEID_DLINK_DGE530T_B1 0x4b01 /* * GEnesis registers. The GEnesis chip has a 256-byte I/O window ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_tty.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.28 2006/05/26 13:53:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.29 2006/07/27 00:07:10 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -313,6 +313,8 @@ c = xc & 0xff; if (xc & UART_STAT_FRAMERR) c |= TTY_FE; + if (xc & UART_STAT_OVERRUN) + c |= TTY_OE; if (xc & UART_STAT_PARERR) c |= TTY_PE; ttyld_rint(tp, c); ==== //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.181 2006/07/24 15:20:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.182 2006/07/26 19:16:34 rwatson Exp $"); #include "opt_mac.h" @@ -443,7 +443,6 @@ struct unpcb *ref = LIST_FIRST(&unp->unp_refs); unp_drop(ref, ECONNRESET); } - soisdisconnected(unp->unp_socket); unp->unp_socket->so_pcb = NULL; local_unp_rights = unp_rights; UNP_UNLOCK(); ==== //depot/projects/soc2005/libalias/sys/modules/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.503 2006/07/25 00:45:54 yongari Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.504 2006/07/26 22:10:10 thompsa Exp $ .include <bsd.own.mk> @@ -38,6 +38,7 @@ bge \ ${_bios} \ ${_bktr} \ + bridgestp \ cam \ ${_canbepm} \ ${_canbus} \ ==== //depot/projects/soc2005/libalias/sys/modules/if_bridge/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.5 2006/06/08 23:40:16 thompsa Exp $ +# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.6 2006/07/26 22:15:14 thompsa Exp $ .include <bsd.own.mk> .PATH: ${.CURDIR}/../../net KMOD= if_bridge -SRCS= if_bridge.c bridgestp.c opt_inet.h opt_inet6.h opt_carp.h +SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h .if !defined(KERNBUILDDIR) opt_inet.h: ==== //depot/projects/soc2005/libalias/sys/net/if_bridge.c#3 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.69 2006/07/26 10:45:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.71 2006/07/26 22:15:15 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -404,6 +404,7 @@ }; DECLARE_MODULE(if_bridge, bridge_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +MODULE_DEPEND(if_bridge, bridgestp, 1, 1, 1); /* * handler for net.link.bridge.pfil_ipfw @@ -461,11 +462,6 @@ sc->sc_brtmax = BRIDGE_RTABLE_MAX; sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT; - sc->sc_stp.bs_bridge_max_age = BSTP_DEFAULT_MAX_AGE; - sc->sc_stp.bs_bridge_hello_time = BSTP_DEFAULT_HELLO_TIME; - sc->sc_stp.bs_bridge_forward_delay = BSTP_DEFAULT_FORWARD_DELAY; - sc->sc_stp.bs_bridge_priority = BSTP_DEFAULT_BRIDGE_PRIORITY; - sc->sc_stp.bs_hold_time = BSTP_DEFAULT_HOLD_TIME; /* Initialize our routing table. */ bridge_rtable_init(sc); ==== //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.215 2006/03/03 17:21:08 csjp Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.216 2006/07/27 03:50:38 avatar Exp $ */ #include "opt_atalk.h" @@ -59,6 +59,7 @@ #include <net/if_types.h> #include <net/bpf.h> #include <net/ethernet.h> +#include <net/bridgestp.h> #include <net/if_bridgevar.h> #include <net/if_vlan_var.h> ==== //depot/projects/soc2005/libalias/sys/net/if_gif.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.62 2006/07/09 06:04:00 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.63 2006/07/27 03:50:38 avatar Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -81,6 +81,7 @@ #include <netinet/ip_encap.h> #include <net/ethernet.h> +#include <net/bridgestp.h> #include <net/if_bridgevar.h> #include <net/if_gif.h> ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_ether.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * Authors: Archie Cobbs <archie@freebsd.org> * Julian Elischer <julian@freebsd.org> * - * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.58 2006/01/12 21:09:12 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.59 2006/07/27 06:15:37 avatar Exp $ */ /* @@ -61,6 +61,7 @@ #include <net/if_arp.h> #include <net/if_var.h> #include <net/ethernet.h> +#include <net/bridgestp.h> #include <net/if_bridgevar.h> #include <netgraph/ng_message.h> ==== //depot/projects/soc2005/libalias/tools/tools/nanobsd/FlashDevice.sub#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/tools/tools/nanobsd/FlashDevice.sub,v 1.6 2006/04/18 12:37:44 ru Exp $ +# $FreeBSD: src/tools/tools/nanobsd/FlashDevice.sub,v 1.7 2006/07/26 20:35:52 simon Exp $ # # Convenience function for commonly used Flash devices. # @@ -55,6 +55,21 @@ ;; esac ;; + memorycorp) + # Source: simon@FreeBSD.org + case $a2 in + 512|512mb) + # MC512CFLS2 + NANO_MEDIASIZE=`expr 519192576 / 512` + NANO_HEADS=16 + NANO_SECTS=63 + ;; + *) + echo "Unknown Memory Corp Flash capacity" + exit 2 + ;; + esac + ;; sandisk) # Source: # SanDisk CompactFlash Memory Card
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607270914.k6R9EGu1055289>