From owner-p4-projects@FreeBSD.ORG Fri Dec 1 20:55:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B4BE16A47C; Fri, 1 Dec 2006 20:55:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0869A16A415 for ; Fri, 1 Dec 2006 20:55:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71FD443CAE for ; Fri, 1 Dec 2006 20:55:14 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB1KtUOl041301 for ; Fri, 1 Dec 2006 20:55:30 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB1KtUd3041298 for perforce@freebsd.org; Fri, 1 Dec 2006 20:55:30 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Dec 2006 20:55:30 GMT Message-Id: <200612012055.kB1KtUd3041298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 110832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2006 20:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=110832 Change 110832 by piso@piso_newluxor on 2006/12/01 20:54:58 IFC@110830 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#15 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.h#5 integrate .. //depot/projects/soc2005/libalias/sys/net/if_llc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#22 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#7 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.65 2006/11/26 15:04:30 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.66 2006/12/01 16:23:25 piso Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently ==== //depot/projects/soc2005/libalias/share/man/man4/man4.i386/acpi_ibm.4#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/share/man/man4/man4.i386/acpi_ibm.4,v 1.14 2006/04/05 21:51:40 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_ibm.4,v 1.15 2006/12/01 09:00:38 ru Exp $ .\" .Dd January 14, 2006 .Dt ACPI_IBM 4 i386 @@ -393,6 +393,7 @@ sysctl dev.acpi_${OEM}.0.bluetooth=1 MESSAGE="bluetooth enabled" fi + ;; 0x10|0x11) LEVEL=`sysctl -n dev.acpi_${OEM}.0.lcd_brightness` PERCENT=`${ECHO} "${BC_PRECOMMANDS} ; \\ ==== //depot/projects/soc2005/libalias/share/man/man9/LOCK_PROFILING.9#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/LOCK_PROFILING.9,v 1.1 2006/11/11 06:29:36 kmacy Exp $ +.\" $FreeBSD: src/share/man/man9/LOCK_PROFILING.9,v 1.2 2006/12/01 17:46:25 ru Exp $ .\" .Dd November 11, 2006 .Dt LOCK_PROFILING 9 @@ -67,7 +67,8 @@ while it was held after having been acquired at this point. .El .Pp -In addition, the average hold time and average wait time are derived from the total hold time +In addition, the average hold time and average wait time are derived +from the total hold time and total wait time respectively and the number of acquisitions. .Pp The @@ -143,18 +144,18 @@ Mutex profiling support appeared in .Fx 5.0 . Generalized lock profiling support appeared in -.Fx 5.0 . +.Fx 7.0 . .Sh AUTHORS .An -nosplit The -.Nm MUTEX_PROFILING +.Nm MUTEX_PROFILING code was written by .An Eivind Eklund Aq eivind@FreeBSD.org , .An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org and -.An Robert Watson Aq rwatson@FreeBSD.org . +.An Robert Watson Aq rwatson@FreeBSD.org . The -.Nm LOCK_PROFILING +.Nm code was written by .An Kip Macy Aq kmacy@FreeBSD.org . This manual page was written by @@ -170,7 +171,8 @@ The .Dv LOCK_PROFILING option also prevents inlining of the mutex code, which can result in a -fairly severe performance penalty. This is, however, not always the case. +fairly severe performance penalty. +This is, however, not always the case. .Dv LOCK_PROFILING can introduce a substantial performance overhead that is easily monitorable using other profiling tools, so combining profiling tools ==== //depot/projects/soc2005/libalias/sys/dev/ath/if_ath_pci.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.15 2006/06/07 20:37:14 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.16 2006/12/01 16:03:39 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -196,8 +196,8 @@ ATH_LOCK_INIT(sc); error = ath_attach(pci_get_device(dev), sc); - if (error == 0) - return error; + if (error == 0) /* success */ + return 0; ATH_LOCK_DESTROY(sc); bus_dma_tag_destroy(sc->sc_dmat); ==== //depot/projects/soc2005/libalias/sys/dev/ep/if_ep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.147 2006/02/04 08:16:07 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.148 2006/12/01 20:29:55 mlaier Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -304,7 +304,9 @@ ifp->if_ioctl = epioctl; ifp->if_watchdog = epwatchdog; ifp->if_init = epinit; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); if (!sc->epb.mii_trans) { ifmedia_init(&sc->ifmedia, 0, ep_ifmedia_upd, ep_ifmedia_sts); @@ -482,7 +484,7 @@ return; startagain: /* Sneak a peek at the next packet */ - IF_DEQUEUE(&ifp->if_snd, m0); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) return; for (len = 0, m = m0; m != NULL; m = m->m_next) @@ -507,7 +509,7 @@ /* make sure */ if (CSR_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; - IF_PREPEND(&ifp->if_snd, m0); + IFQ_DRV_PREPEND(&ifp->if_snd, m0); goto done; } } else @@ -562,7 +564,7 @@ * we check if we have packets left, in that case * we prepare to come back later */ - if (ifp->if_snd.ifq_head) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); goto done; } @@ -672,7 +674,7 @@ * To have a tx_avail_int but giving * the chance to the Reception */ - if (ifp->if_snd.ifq_head) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); } ==== //depot/projects/soc2005/libalias/sys/dev/fxp/if_fxp.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.261 2006/11/30 14:58:01 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.262 2006/12/01 13:07:52 ru Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -1816,7 +1816,7 @@ mii_tick(device_get_softc(sc->miibus)); /* - * Check that chip hasn't hang. + * Check that chip hasn't hung. */ fxp_watchdog(sc); ==== //depot/projects/soc2005/libalias/sys/net/bridgestp.h#5 (text+ko) ==== @@ -67,7 +67,7 @@ * * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp * - * $FreeBSD: src/sys/net/bridgestp.h,v 1.8 2006/11/27 00:35:40 thompsa Exp $ + * $FreeBSD: src/sys/net/bridgestp.h,v 1.10 2006/12/01 18:25:18 imp Exp $ */ /* @@ -217,7 +217,7 @@ uint16_t cbu_hellotime; /* hello time */ uint16_t cbu_forwarddelay; /* forwarding delay */ uint8_t cbu_versionlen; /* version 1 length */ -} __attribute__((__packed__)); +} __packed; #define BSTP_BPDU_STP_LEN (3 + 35) /* LLC + STP pdu */ #define BSTP_BPDU_RSTP_LEN (3 + 36) /* LLC + RSTP pdu */ @@ -229,7 +229,7 @@ uint16_t tbu_protoid; /* protocol id */ uint8_t tbu_protover; /* protocol version */ uint8_t tbu_bpdutype; /* message type */ -} __attribute__((__packed__)); +} __packed; /* * Timekeeping structure used in spanning tree code. ==== //depot/projects/soc2005/libalias/sys/net/if_llc.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)if_llc.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_llc.h,v 1.12 2005/06/05 03:13:12 thompsa Exp $ + * $FreeBSD: src/sys/net/if_llc.h,v 1.13 2006/12/01 17:50:11 imp Exp $ */ #ifndef _NET_IF_LLC_H_ @@ -52,15 +52,15 @@ u_int8_t format_id; u_int8_t class; u_int8_t window_x2; - } type_u __packed; + } __packed type_u; struct { u_int8_t num_snd_x2; u_int8_t num_rcv_x2; - } type_i __packed; + } __packed type_i; struct { u_int8_t control; u_int8_t num_rcv_x2; - } type_s __packed; + } __packed type_s; struct { u_int8_t control; /* @@ -72,17 +72,17 @@ u_int8_t frmr_control; u_int8_t frmr_control_ext; u_int8_t frmr_cause; - } type_frmr __packed; + } __packed type_frmr; struct { u_int8_t control; u_int8_t org_code[3]; u_int16_t ether_type; - } type_snap __packed; + } __packed type_snap; struct { u_int8_t control; u_int8_t control_ext; - } type_raw __packed; - } llc_un /* XXX __packed ??? */; + } __packed type_raw; + } __packed llc_un; } __packed; struct frmrinfo { @@ -114,6 +114,10 @@ #define LLC_FRMRLEN 7 #define LLC_SNAPFRAMELEN 8 +#ifdef CTASSERT +CTASSERT(sizeof (struct llc) == LLC_SNAPFRAMELEN); +#endif + /* * Unnumbered LLC format commands */ ==== //depot/projects/soc2005/libalias/sys/net80211/ieee80211.h#3 (text+ko) ==== @@ -29,7 +29,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/sys/net80211/ieee80211.h,v 1.11 2006/07/26 03:05:34 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.12 2006/12/01 18:40:51 imp Exp $ */ #ifndef _NET80211_IEEE80211_H_ #define _NET80211_IEEE80211_H_ @@ -428,7 +428,7 @@ u_int8_t schan; /* starting channel */ u_int8_t nchan; /* number channels */ u_int8_t maxtxpwr; /* tx power cap */ - } band[4] __packed; /* up to 4 sub bands */ + } __packed band[4]; /* up to 4 sub bands */ } __packed; #define IEEE80211_CHALLENGE_LEN 128 ==== //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.96 2006/12/01 05:48:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.97 2006/12/01 17:58:33 sam Exp $"); #include #include @@ -746,7 +746,7 @@ if (llc->llc_dsap == LLC_SNAP_LSAP && llc->llc_ssap == LLC_SNAP_LSAP && llc->llc_control == LLC_UI && llc->llc_snap.org_code[0] == 0 && llc->llc_snap.org_code[1] == 0 && llc->llc_snap.org_code[2] == 0) { - m_adj(m, hdrlen + LLC_SNAPFRAMELEN - sizeof(*eh)); + m_adj(m, hdrlen + sizeof(struct llc) - sizeof(*eh)); llc = NULL; } else { m_adj(m, hdrlen - sizeof(*eh)); ==== //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.44 2006/12/01 05:48:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.45 2006/12/01 17:58:33 sam Exp $"); #include "opt_inet.h" @@ -500,7 +500,7 @@ ieee80211_mbuf_adjust(struct ieee80211com *ic, int hdrsize, struct ieee80211_key *key, struct mbuf *m) { -#define TO_BE_RECLAIMED (sizeof(struct ether_header) - LLC_SNAPFRAMELEN) +#define TO_BE_RECLAIMED (sizeof(struct ether_header) - sizeof(struct llc)) int needed_space = hdrsize; if (key != NULL) { @@ -527,7 +527,7 @@ * We know we are called just before stripping an Ethernet * header and prepending an LLC header. This means we know * there will be - * sizeof(struct ether_header) - LLC_SNAPFRAMELEN + * sizeof(struct ether_header) - sizeof(struct llc) * bytes recovered to which we need additional space for the * 802.11 header and any crypto header. */ @@ -675,7 +675,7 @@ } /* NB: this could be optimized because of ieee80211_mbuf_adjust */ - m_adj(m, sizeof(struct ether_header) - LLC_SNAPFRAMELEN); + m_adj(m, sizeof(struct ether_header) - sizeof(struct llc)); llc = mtod(m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#4 (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/netgraph/ng_nat.c,v 1.5 2006/10/13 09:11:12 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.6 2006/12/01 16:27:11 piso Exp $ */ #include ==== //depot/projects/soc2005/libalias/sys/netinet/ip_carp.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.h,v 1.2 2006/03/21 14:29:48 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.h,v 1.3 2006/12/01 18:37:41 imp Exp $ */ /* $OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $ */ /* @@ -76,6 +76,10 @@ unsigned char carp_md[20]; /* SHA1 HMAC */ } __packed; +#ifdef CTASSERT +CTASSERT(sizeof(struct carp_header) == 36); +#endif + #define CARP_DFLTTL 255 /* carp_version */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.54 2006/09/26 23:26:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.56 2006/12/01 16:34:53 piso Exp $"); /* Alias.c provides supervisory control for the functions of the @@ -1547,7 +1547,7 @@ break; len = strlen(buf); if (len > 1) { - for (i=0; i