From owner-p4-projects@FreeBSD.ORG Sun Feb 4 01:02:13 2007 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 18F3A16A406; Sun, 4 Feb 2007 01:02:13 +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 E75F016A403 for ; Sun, 4 Feb 2007 01:02:12 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D8F5E13C481 for ; Sun, 4 Feb 2007 01:02:12 +0000 (UTC) (envelope-from csjp@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 l1412CdX029123 for ; Sun, 4 Feb 2007 01:02:12 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1412CK2029120 for perforce@freebsd.org; Sun, 4 Feb 2007 01:02:12 GMT (envelope-from csjp@freebsd.org) Date: Sun, 4 Feb 2007 01:02:12 GMT Message-Id: <200702040102.l1412CK2029120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 113971 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: Sun, 04 Feb 2007 01:02:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=113971 Change 113971 by csjp@csjp_rnd01 on 2007/02/04 01:01:29 Add a timed_out argument to bpf_ioctl_getznext(). We will use this argument to trigger the rotation of buffers in the event there was a read timeout. We need to do the initialization of this variable in bpfioctl() as we will clobber the descriptor state and set it to BPF_IDLE. This implements the buffer rotation in the event of a read timeout. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#11 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#11 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#3 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#11 (text+ko) ==== @@ -310,13 +310,14 @@ } static int -bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz, + int timed_out) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_getznext(td, d, bz)); + return (bpf_zerocopy_ioctl_getznext(td, d, bz, timed_out)); #else panic("bpf_ioctl_getznext"); #endif @@ -920,6 +921,7 @@ * BIOCSETZBUF Set current zero-copy buffer locations. * BIOCSETZBUF Acknowledge reading zero-copy buffers. * BIOCGETZMAX Get maximum zero-copy buffer size. + * BIOCGETZNEXT Get next ready zero-copy buffer location */ /* ARGSUSED */ static int @@ -927,8 +929,8 @@ struct thread *td) { struct bpf_d *d = dev->si_drv1; - int error = 0; - + int timed_out, error = 0; + /* * Refresh PID associated with this descriptor. */ @@ -936,6 +938,13 @@ d->bd_pid = td->td_proc->p_pid; if (d->bd_state == BPF_WAITING) callout_stop(&d->bd_callout); + /* + * Before we clobber the BPF state, check to see if this descriptor + * was timed out. If so, we capture that bit of information so we + * can pass it to bpf_ioctl_getznext() so that it knows to rotate + * the buffers. + */ + timed_out = (d->bd_state == BPF_TIMED_OUT) ? 1 : 0; d->bd_state = BPF_IDLE; BPFD_UNLOCK(d); @@ -1278,7 +1287,8 @@ return (bpf_ioctl_getzmax(td, d, (u_int *)addr)); case BIOCGETZNEXT: - return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr)); + return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr, + timed_out)); case BIOCSETZBUF: return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#11 (text+ko) ==== @@ -548,7 +548,7 @@ */ int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz) + struct bpf_zbuf *bz, int timed_out) { struct zbuf *zb; @@ -564,7 +564,8 @@ * held buffer. */ BPFD_LOCK(d); - if (d->bd_immediate && d->bd_hbuf == NULL && d->bd_slen != 0) + if ((timed_out || d->bd_immediate) && d->bd_hbuf == NULL + && d->bd_slen != 0) ROTATE_BUFFERS(d); bzero(bz, sizeof(*bz)); if (d->bd_hbuf != NULL) { ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#3 (text+ko) ==== @@ -50,7 +50,7 @@ int bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, u_int *i); int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz); + struct bpf_zbuf *bz, int timed_out); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, From owner-p4-projects@FreeBSD.ORG Sun Feb 4 04:57:07 2007 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 DE33C16A406; Sun, 4 Feb 2007 04:57:06 +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 9285916A403 for ; Sun, 4 Feb 2007 04:57:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 836B813C461 for ; Sun, 4 Feb 2007 04:57:06 +0000 (UTC) (envelope-from sam@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 l144v6Lv087984 for ; Sun, 4 Feb 2007 04:57:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l144v6UP087981 for perforce@freebsd.org; Sun, 4 Feb 2007 04:57:06 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 04:57:06 GMT Message-Id: <200702040457.l144v6UP087981@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 Cc: Subject: PERFORCE change 113974 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: Sun, 04 Feb 2007 04:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=113974 Change 113974 by sam@sam_ebb on 2007/02/04 04:56:12 reduce default roaming thresholds Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#9 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#9 (text+ko) ==== @@ -80,12 +80,12 @@ * driver (dBm). Transmit rate thresholds are IEEE rate codes (i.e * .5M units). */ -#define ROAM_RSSI_11A_DEFAULT 24 /* rssi threshold for 11a bss */ -#define ROAM_RSSI_11B_DEFAULT 24 /* rssi threshold for 11b bss */ -#define ROAM_RSSI_11BONLY_DEFAULT 24 /* rssi threshold for 11b-only bss */ -#define ROAM_RATE_11A_DEFAULT 2*24 /* tx rate thresh for 11a bss */ -#define ROAM_RATE_11B_DEFAULT 2*9 /* tx rate thresh for 11b bss */ -#define ROAM_RATE_11BONLY_DEFAULT 2*5 /* tx rate thresh for 11b-only bss */ +#define ROAM_RSSI_11A_DEFAULT 14 /* rssi threshold for 11a bss */ +#define ROAM_RSSI_11B_DEFAULT 14 /* rssi threshold for 11b bss */ +#define ROAM_RSSI_11BONLY_DEFAULT 14 /* rssi threshold for 11b-only bss */ +#define ROAM_RATE_11A_DEFAULT 2*12 /* tx rate thresh for 11a bss */ +#define ROAM_RATE_11B_DEFAULT 2*5 /* tx rate thresh for 11b bss */ +#define ROAM_RATE_11BONLY_DEFAULT 2*1 /* tx rate thresh for 11b-only bss */ static void scan_restart_pwrsav(void *); static void scan_next(void *); From owner-p4-projects@FreeBSD.ORG Sun Feb 4 06:41:18 2007 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 292F116A406; Sun, 4 Feb 2007 06:41:18 +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 DE61416A400 for ; Sun, 4 Feb 2007 06:41:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CE2D013C48E for ; Sun, 4 Feb 2007 06:41:17 +0000 (UTC) (envelope-from sam@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 l146fHQv007331 for ; Sun, 4 Feb 2007 06:41:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l146fHaC007320 for perforce@freebsd.org; Sun, 4 Feb 2007 06:41:17 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 06:41:17 GMT Message-Id: <200702040641.l146fHaC007320@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 Cc: Subject: PERFORCE change 113979 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: Sun, 04 Feb 2007 06:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=113979 Change 113979 by sam@sam_ebb on 2007/02/04 06:40:34 IFC Affected files ... .. //depot/projects/wifi/sys/modules/ath/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/ath_rate_sample/Makefile#4 integrate Differences ... ==== //depot/projects/wifi/sys/modules/ath/Makefile#5 (text+ko) ==== @@ -33,14 +33,14 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath/Makefile,v 1.4 2006/09/18 16:49:15 sam Exp $ +# $FreeBSD: src/sys/modules/ath/Makefile,v 1.5 2007/01/28 04:38:35 sam Exp $ # .PATH: ${.CURDIR}/../../dev/ath KMOD= if_ath SRCS= if_ath.c if_ath_pci.c -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h HAL= ${.CURDIR}/../../contrib/dev/ath CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} @@ -48,4 +48,18 @@ opt_ath.h: echo > $@ +# patch for hal naming difference +.if ${MACHINE_ARCH} == "amd64" +ATH_MODULE_ARCH=x86_64 +.elif ${MACHINE_ARCH} == "sparc64" +ATH_MODULE_ARCH=sparc64-be +.elif ${MACHINE_ARCH} == "powerpc" +ATH_MODULE_ARCH=powerpc-be +.else +ATH_MODULE_ARCH=${MACHINE_ARCH} +.endif + +opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h + cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} + .include ==== //depot/projects/wifi/sys/modules/ath_rate_sample/Makefile#4 (text+ko) ==== @@ -33,16 +33,30 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.3 2006/09/18 16:49:15 sam Exp $ +# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.4 2007/01/28 04:36:05 sam Exp $ # .PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample KMOD= ath_rate SRCS= sample.c -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h HAL= ${.CURDIR}/../../contrib/dev/ath CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} +# patch for hal naming difference +.if ${MACHINE_ARCH} == "amd64" +ATH_MODULE_ARCH=x86_64 +.elif ${MACHINE_ARCH} == "sparc64" +ATH_MODULE_ARCH=sparc64-be +.elif ${MACHINE_ARCH} == "powerpc" +ATH_MODULE_ARCH=powerpc-be +.else +ATH_MODULE_ARCH=${MACHINE_ARCH} +.endif + +opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h + cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} + .include From owner-p4-projects@FreeBSD.ORG Sun Feb 4 06:52:33 2007 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 B51EA16A405; Sun, 4 Feb 2007 06:52:33 +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 5FD5516A401 for ; Sun, 4 Feb 2007 06:52:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5017713C47E for ; Sun, 4 Feb 2007 06:52:33 +0000 (UTC) (envelope-from sam@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 l146qXmP009516 for ; Sun, 4 Feb 2007 06:52:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l146qXUP009499 for perforce@freebsd.org; Sun, 4 Feb 2007 06:52:33 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 06:52:33 GMT Message-Id: <200702040652.l146qXUP009499@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 Cc: Subject: PERFORCE change 113981 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: Sun, 04 Feb 2007 06:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113981 Change 113981 by sam@sam_ebb on 2007/02/04 06:52:16 duh, checking ssid is very wrong Obtained from: atheros Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#80 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#80 (text+ko) ==== @@ -519,13 +519,6 @@ return ieee80211_sta_join1(ieee80211_ref_node(ni)); } -static __inline int -ssid_equal(const struct ieee80211_node *a, const struct ieee80211_node *b) -{ - return (a->ni_esslen == b->ni_esslen && - memcmp(a->ni_essid, b->ni_essid, a->ni_esslen) == 0); -} - /* * Join the specified IBSS/BSS network. The node is assumed to * be passed in with a held reference. @@ -556,11 +549,12 @@ */ obss = ic->ic_bss; /* - * Check if old+new node have the same ssid in which + * Check if old+new node have the same address in which * case we can reassociate when operating in sta mode. */ canreassoc = (obss != NULL && - ic->ic_state == IEEE80211_S_RUN && ssid_equal(obss, selbs)); + ic->ic_state == IEEE80211_S_RUN && + IEEE80211_ADDR_EQ(obss->ni_macaddr, selbs->ni_macaddr)); ic->ic_bss = selbs; /* NB: caller assumed to bump refcnt */ if (obss != NULL) { copy_bss(selbs, obss); From owner-p4-projects@FreeBSD.ORG Sun Feb 4 07:03:50 2007 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 11A1B16A403; Sun, 4 Feb 2007 07:03:50 +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 BF1B316A401 for ; Sun, 4 Feb 2007 07:03:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AFAE813C467 for ; Sun, 4 Feb 2007 07:03:49 +0000 (UTC) (envelope-from sam@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 l1473nwG012527 for ; Sun, 4 Feb 2007 07:03:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1473ncH012522 for perforce@freebsd.org; Sun, 4 Feb 2007 07:03:49 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 07:03:49 GMT Message-Id: <200702040703.l1473ncH012522@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 Cc: Subject: PERFORCE change 113984 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: Sun, 04 Feb 2007 07:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=113984 Change 113984 by sam@sam_ebb on 2007/02/04 07:03:16 some small bits of 11n Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#15 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#15 (text+ko) ==== @@ -129,7 +129,9 @@ #define IEEE80211_FC0_SUBTYPE_DISASSOC 0xa0 #define IEEE80211_FC0_SUBTYPE_AUTH 0xb0 #define IEEE80211_FC0_SUBTYPE_DEAUTH 0xc0 +#define IEEE80211_FC0_SUBTYPE_ACTION 0xd0 /* for TYPE_CTL */ +#define IEEE80211_FC0_SUBTYPE_BAR 0x80 #define IEEE80211_FC0_SUBTYPE_PS_POLL 0xa0 #define IEEE80211_FC0_SUBTYPE_RTS 0xb0 #define IEEE80211_FC0_SUBTYPE_CTS 0xc0 @@ -233,6 +235,7 @@ } __packed; #define WME_NUM_AC 4 /* 4 AC categories */ +#define WME_NUM_TID 16 /* 16 tids */ #define WME_PARAM_ACI 0x60 /* Mask for ACI field */ #define WME_PARAM_ACI_S 5 /* Shift for ACI field */ @@ -286,6 +289,103 @@ #define MNF_SETUP_RESP 1 #define MNF_TEARDOWN 2 +/* + * 802.11n Management Action Frames + */ +/* generic frame format */ +struct ieee80211_action { + u_int8_t ia_category; + u_int8_t ia_action; +} __packed; + +#define IEEE80211_ACTION_CAT_QOS 0 /* QoS */ +#define IEEE80211_ACTION_CAT_BA 3 /* BA */ +#define IEEE80211_ACTION_CAT_HT 5 /* HT */ + +#define IEEE80211_ACTION_HT_TXCHWIDTH 0 /* recommended xmit chan width*/ +#define IEEE80211_ACTION_HT_MIMOPWRSAVE 1 /* MIMO power save */ + +/* HT - recommended transmission channel width */ +struct ieee80211_action_ht_txchwidth { + struct ieee80211_action at_header; + u_int8_t at_chwidth; +} __packed; + +#define IEEE80211_A_HT_TXCHWIDTH_20 0 +#define IEEE80211_A_HT_TXCHWIDTH_2040 1 + +/* HT - MIMO Power Save */ +struct ieee80211_action_ht_mimopowersave { + struct ieee80211_action am_header; + u_int8_t am_enable; + u_int8_t am_mode; +} __packed; + +/* Block Ack actions */ +#define IEEE80211_ACTION_BA_ADDBA_REQUEST 0 /* ADDBA request */ +#define IEEE80211_ACTION_BA_ADDBA_RESPONSE 1 /* ADDBA response */ +#define IEEE80211_ACTION_BA_DELBA 2 /* DELBA */ + +/* Block Ack Parameter Set */ +#define IEEE80211_BAPS_BUFSIZ 0xffc0 /* buffer size */ +#define IEEE80211_BAPS_BUFSIZ_S 6 +#define IEEE80211_BAPS_TID 0x003c /* TID */ +#define IEEE80211_BAPS_TID_S 2 +#define IEEE80211_BAPS_POLICY 0x0002 /* block ack policy */ +#define IEEE80211_BAPS_POLICY_S 1 + +#define IEEE80211_BAPS_POLICY_DELAYED (0< X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48FDB16A403; Sun, 4 Feb 2007 13:44:16 +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 E71EC16A400 for ; Sun, 4 Feb 2007 13:44:15 +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 D809913C4B4 for ; Sun, 4 Feb 2007 13:44:15 +0000 (UTC) (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 l14DiFq0003526 for ; Sun, 4 Feb 2007 13:44:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14DiFRx003523 for perforce@freebsd.org; Sun, 4 Feb 2007 13:44:15 GMT (envelope-from piso@freebsd.org) Date: Sun, 4 Feb 2007 13:44:15 GMT Message-Id: <200702041344.l14DiFRx003523@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 113996 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: Sun, 04 Feb 2007 13:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=113996 Change 113996 by piso@piso_newluxor on 2007/02/04 13:43:51 o move the PULLUP* macros to alias_local.h (so they can be used anywhere in libalias) o teach mbuf to ProxyEncodeIpHeader() Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#53 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#18 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#53 (text+ko) ==== @@ -143,53 +143,6 @@ #include "alias_mod.h" #endif -#ifdef _KERNEL - -#define PULLUP_IPHDR(pip, ptr) do { \ - struct mbuf *m; \ - m = m_pullup((ptr), sizeof(struct ip)); \ - (pip) = mtod(m, struct ip *); \ -} while (0) - -#define PULLUP_UDPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = mtod(m, struct ip *); \ -} while (0) - -#define PULLUP_TCPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(m, struct ip *); \ -} while (0) - -#define PULLUP_ICMPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = (struct ip *)ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ - (pip) = mtod(m, struct ip *); \ -} while (0) - -#define PULLUP_ICMPIP64(pip, ptr, ic) do { \ - struct mbuf *m; \ - int s; \ - pip = ptr; \ - s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ - (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ - m = m_pullup((ptr), s); \ - (pip) = mtod(m, struct ip *); \ -} while (0) - -#else -#define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr -#define PULLUP_UDPHDR(pip, ptr) pip = ptr -#define PULLUP_TCPHDR(pip, ptr) pip = ptr -#define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr -#define PULLUP_ICMPIP64(pip, ptr, ic) pip = ptr -#endif - static __inline int twowords(void *p) { @@ -1102,7 +1055,7 @@ SetProxyPort(lnk, dest_port); SetProxyAddress(lnk, dest_address); // XXX broken - ProxyModify(la, lnk, pip, maxpacketsize, proxy_type, + ProxyModify(la, lnk, ptr, maxpacketsize, proxy_type, src_port); // XXX m_pullup() tc = (struct tcphdr *)ip_next(pip); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#18 (text+ko) ==== @@ -54,6 +54,8 @@ #include #include #include +#include +#include /* XXX: LibAliasSetTarget() uses this constant. */ #define INADDR_NONE 0xffffffff @@ -174,6 +176,53 @@ #define LIBALIAS_LOCK_DESTROY(l) #endif +#ifdef _KERNEL + +#define PULLUP_IPHDR(pip, ptr) do { \ + struct mbuf *m; \ + m = m_pullup((ptr), sizeof(struct ip)); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + +#define PULLUP_UDPHDR(pip, ptr) do { \ + struct mbuf *m; \ + pip = ptr; \ + m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + +#define PULLUP_TCPHDR(pip, ptr) do { \ + struct mbuf *m; \ + pip = ptr; \ + m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + +#define PULLUP_ICMPHDR(pip, ptr) do { \ + struct mbuf *m; \ + pip = (struct ip *)ptr; \ + m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + +#define PULLUP_ICMPIP64(pip, ptr, ic) do { \ + struct mbuf *m; \ + int s; \ + pip = ptr; \ + s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ + (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ + m = m_pullup((ptr), s); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + +#else +#define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_UDPHDR(pip, ptr) pip = ptr +#define PULLUP_TCPHDR(pip, ptr) pip = ptr +#define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_ICMPIP64(pip, ptr, ic) pip = ptr +#endif + /* * The following macro is used to update an * internet checksum. "delta" is a 32-bit @@ -329,7 +378,7 @@ ProxyCheck(struct libalias *la, struct ip *_pip, struct in_addr *_proxy_server_addr, u_short * _proxy_server_port, u_short dst_port); void -ProxyModify(struct libalias *la, struct alias_link *_lnk, struct ip *_pip, +ProxyModify(struct libalias *la, struct alias_link *_lnk, void *_pip, int _maxpacketsize, int _proxy_type, u_short src_port); enum alias_tcp_state { ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#18 (text+ko) ==== @@ -147,7 +147,7 @@ static void RuleDelete(struct proxy_entry *); static int RuleNumberDelete(struct libalias *la, int); static void ProxyEncodeTcpStream(struct alias_link *, struct ip *, int); -static void ProxyEncodeIpHeader(struct ip *, u_short sport); +static void ProxyEncodeIpHeader(void *, u_short sport); #ifdef _KERNEL static int @@ -480,13 +480,18 @@ } static void -ProxyEncodeIpHeader(struct ip *pip, u_short sport) +ProxyEncodeIpHeader(void *_ptr, u_short sport) { + struct ip *pip; #define OPTION_LEN_BYTES 8 #define OPTION_LEN_INT16 4 #define OPTION_LEN_INT32 2 u_char option[OPTION_LEN_BYTES]; + PULLUP_IPHDR(pip, _ptr); + if (pip == NULL) + return; + #ifdef LIBALIAS_DEBUG fprintf(stdout, " ip cksum 1 = %x\n", (u_int) IpChecksum(pip)); fprintf(stdout, "tcp cksum 1 = %x\n", (u_int) TcpChecksum(pip)); @@ -498,11 +503,15 @@ /* Build option and copy into packet */ { +#ifdef _KERNEL + struct mbuf *m; +#else u_char *ptr; ptr = (u_char *) pip; ptr += 20; memcpy(ptr + OPTION_LEN_BYTES, ptr, ntohs(pip->ip_len) - 20); +#endif option[0] = 0x64; /* class: 3 (reserved), option 4 */ option[1] = OPTION_LEN_BYTES; @@ -511,7 +520,17 @@ memcpy(&option[6], (u_char *) & sport, 2); +#ifdef _KERNEL + // XXX - here i assume after an m_split() there's always enough + // XXX - space to append option[] to _ptr + m = m_split(_ptr, 20, M_TRYWAIT); + if (m == NULL) + return; + m_copyback(_ptr, 20, 8, option); + m_cat(_ptr, m); +#else memcpy(ptr, option, 8); +#endif } /* Update checksum, header length and packet length */ @@ -520,12 +539,19 @@ int accumulate; u_short *sptr; + PULLUP_IPHDR(pip, _ptr); + if (pip == NULL) + return; + sptr = (u_short *) option; accumulate = 0; for (i = 0; i < OPTION_LEN_INT16; i++) accumulate -= *(sptr++); - +#ifdef _KERNEL + sptr = mtod((struct mbuf *)_ptr, u_short *); +#else sptr = (u_short *) pip; +#endif accumulate += *sptr; pip->ip_hl += OPTION_LEN_INT32; accumulate -= *sptr; @@ -597,19 +623,21 @@ } void -ProxyModify(struct libalias *la, struct alias_link *lnk, struct ip *pip, +ProxyModify(struct libalias *la, struct alias_link *lnk, void *ptr, int maxpacketsize, int proxy_type, u_short src_port) { + struct ip *pip; LIBALIAS_LOCK_ASSERT(la); (void)la; switch (proxy_type) { case PROXY_TYPE_ENCODE_IPHDR: - ProxyEncodeIpHeader(pip, src_port); + ProxyEncodeIpHeader(ptr, src_port); break; case PROXY_TYPE_ENCODE_TCPSTREAM: + PULLUP_IPHDR(pip, ptr); ProxyEncodeTcpStream(lnk, pip, maxpacketsize); break; } From owner-p4-projects@FreeBSD.ORG Sun Feb 4 14:38:25 2007 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 8A5F716A401; Sun, 4 Feb 2007 14:38:25 +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 655BB16A403 for ; Sun, 4 Feb 2007 14:38:25 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 57D2C13C4A3 for ; Sun, 4 Feb 2007 14:38:25 +0000 (UTC) (envelope-from sephe@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 l14EcP5j013085 for ; Sun, 4 Feb 2007 14:38:25 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14EcPt3013082 for perforce@freebsd.org; Sun, 4 Feb 2007 14:38:25 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 4 Feb 2007 14:38:25 GMT Message-Id: <200702041438.l14EcPt3013082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 113999 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: Sun, 04 Feb 2007 14:38:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113999 Change 113999 by sephe@sephe_zealot:sam_wifi on 2007/02/04 14:37:36 Don't set bg scan duration to mindwell, instead set it to maxdwell, so bg scan can be scheduled correctly. Reviewed-by: sam@ Approved-by: sam@ Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#10 (text+ko) ==== @@ -73,7 +73,7 @@ * XXX tunable * XXX check against configured listen interval */ -#define IEEE80211_SCAN_OFFCHANNEL msecs_to_ticks(150*1000/hz) +#define IEEE80211_SCAN_OFFCHANNEL msecs_to_ticks(150) /* * Roaming-related defaults. RSSI thresholds are as returned by the @@ -564,7 +564,7 @@ } /* NB: flush frames rx'd before 1st channel change */ SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_DISCARD; - ss->ss_mindwell = duration; + ss->ss_maxdwell = duration; if (scan_restart(SCAN_PRIVATE(ss), duration)) { ic->ic_flags |= IEEE80211_F_SCAN; ic->ic_flags_ext |= IEEE80211_FEXT_BGSCAN; From owner-p4-projects@FreeBSD.ORG Sun Feb 4 16:38:57 2007 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 6A52916A406; Sun, 4 Feb 2007 16:38:57 +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 29FEF16A401 for ; Sun, 4 Feb 2007 16:38:57 +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 1B68913C4A3 for ; Sun, 4 Feb 2007 16:38:57 +0000 (UTC) (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 l14Gcu0t034171 for ; Sun, 4 Feb 2007 16:38:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14GculD034168 for perforce@freebsd.org; Sun, 4 Feb 2007 16:38:56 GMT (envelope-from piso@freebsd.org) Date: Sun, 4 Feb 2007 16:38:56 GMT Message-Id: <200702041638.l14GculD034168@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 114002 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: Sun, 04 Feb 2007 16:38:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=114002 Change 114002 by piso@piso_newluxor on 2007/02/04 16:37:59 Teach mbuf to ProxyEncodeTcpStream(). Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#54 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#19 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#19 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#54 (text+ko) ==== @@ -1054,10 +1054,11 @@ if (proxy_type != 0) { SetProxyPort(lnk, dest_port); SetProxyAddress(lnk, dest_address); - // XXX broken ProxyModify(la, lnk, ptr, maxpacketsize, proxy_type, src_port); - // XXX m_pullup() + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); tc = (struct tcphdr *)ip_next(pip); } /* Get alias address and port */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#19 (text+ko) ==== @@ -215,12 +215,21 @@ (pip) = mtod(m, struct ip *); \ } while (0) +#define PULLUP_IPTCPHDR(pip, ptr) do { \ + struct mbuf *m; \ + m = m_pullup((ptr), sizeof(struct ip)); \ + (pip) = mtod(m, struct ip *); \ + m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod(m, struct ip *); \ +} while (0) + #else #define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_UDPHDR(pip, ptr) pip = ptr #define PULLUP_TCPHDR(pip, ptr) pip = ptr #define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_ICMPIP64(pip, ptr, ic) pip = ptr +#define PULLUP_IPTCPHDR(pip, ptr) pip = (struct ip *)ptr #endif /* ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#19 (text+ko) ==== @@ -146,7 +146,7 @@ static void RuleAdd(struct libalias *la, struct proxy_entry *); static void RuleDelete(struct proxy_entry *); static int RuleNumberDelete(struct libalias *la, int); -static void ProxyEncodeTcpStream(struct alias_link *, struct ip *, int); +static void ProxyEncodeTcpStream(struct alias_link *, void *, int); static void ProxyEncodeIpHeader(void *, u_short sport); #ifdef _KERNEL @@ -392,13 +392,17 @@ static void ProxyEncodeTcpStream(struct alias_link *lnk, - struct ip *pip, + void *ptr, int maxpacketsize) { int slen; char buffer[40]; + struct ip *pip; struct tcphdr *tc; + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; /* Compute pointer to tcp header */ tc = (struct tcphdr *)ip_next(pip); @@ -431,7 +435,11 @@ { int dlen; int hlen; +#ifdef _KERNEL + struct mbuf *m; +#else u_char *p; +#endif hlen = (pip->ip_hl + tc->th_off) << 2; dlen = ntohs(pip->ip_len) - hlen; @@ -440,14 +448,25 @@ if (dlen == 0) return; - +#ifdef _KERNEL + m = m_split(ptr, hlen, M_TRYWAIT); + if (m == NULL) + return; + m_copyback(ptr, hlen, slen, buffer); + m_cat(ptr, m); +#else p = (char *)pip; p += hlen; bcopy(p, p + slen, dlen); memcpy(p, buffer, slen); +#endif } + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return; + /* Save information about modfied sequence number */ { int delta; @@ -626,7 +645,6 @@ ProxyModify(struct libalias *la, struct alias_link *lnk, void *ptr, int maxpacketsize, int proxy_type, u_short src_port) { - struct ip *pip; LIBALIAS_LOCK_ASSERT(la); (void)la; @@ -637,8 +655,7 @@ break; case PROXY_TYPE_ENCODE_TCPSTREAM: - PULLUP_IPHDR(pip, ptr); - ProxyEncodeTcpStream(lnk, pip, maxpacketsize); + ProxyEncodeTcpStream(lnk, ptr, maxpacketsize); break; } } From owner-p4-projects@FreeBSD.ORG Sun Feb 4 17:39:14 2007 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 A55A316A406; Sun, 4 Feb 2007 17:39:14 +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 7FC9116A400 for ; Sun, 4 Feb 2007 17:39:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FC6E13C471 for ; Sun, 4 Feb 2007 17:39:14 +0000 (UTC) (envelope-from sam@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 l14HdEgI053271 for ; Sun, 4 Feb 2007 17:39:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14HdDw5053268 for perforce@freebsd.org; Sun, 4 Feb 2007 17:39:13 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 17:39:13 GMT Message-Id: <200702041739.l14HdDw5053268@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 Cc: Subject: PERFORCE change 114006 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: Sun, 04 Feb 2007 17:39:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=114006 Change 114006 by sam@sam_ebb on 2007/02/04 17:38:23 IFC Affected files ... .. //depot/projects/wifi/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/wifi/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/ath/athstats/athstats.c#2 integrate Differences ... ==== //depot/projects/wifi/tools/tools/ath/athdebug/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/tools/tools/iwi/Makefile,v 1.1 2005/10/07 18:27:21 damien Exp $ +# $FreeBSD: src/tools/tools/ath/athdebug/Makefile,v 1.2 2006/03/15 10:46:36 ru Exp $ -PROG = athdebug -BINDIR = /usr/local/bin -NO_MAN = noman +PROG= athdebug +BINDIR= /usr/local/bin +NO_MAN= .include ==== //depot/projects/wifi/tools/tools/ath/athdebug/athdebug.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/80211stats.c,v 1.2 2003/12/07 21:38:28 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athdebug/athdebug.c,v 1.2 2005/12/13 22:13:41 sam Exp $ */ /* @@ -73,6 +73,7 @@ ATH_DEBUG_NODE = 0x00080000, /* node management */ ATH_DEBUG_LED = 0x00100000, /* led management */ ATH_DEBUG_FF = 0x00200000, /* fast frames */ + ATH_DEBUG_DFS = 0x00400000, /* DFS processing */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -100,6 +101,7 @@ { "node", ATH_DEBUG_NODE }, { "led", ATH_DEBUG_LED }, { "ff", ATH_DEBUG_FF }, + { "dfs", ATH_DEBUG_DFS }, { "fatal", ATH_DEBUG_FATAL }, }; ==== //depot/projects/wifi/tools/tools/ath/athstats/Makefile#2 (text+ko) ==== @@ -1,7 +1,17 @@ -# $FreeBSD: src/tools/tools/iwi/Makefile,v 1.1 2005/10/07 18:27:21 damien Exp $ +# $FreeBSD: src/tools/tools/ath/athstats/Makefile,v 1.4 2007/02/02 02:39:56 sam Exp $ + +PROG= athstats +BINDIR= /usr/local/bin +NO_MAN= -PROG = athstats -BINDIR = /usr/local/bin -NO_MAN = noman +SRCS= main.c statfoo.c athstats.c .include + +CFLAGS+= -I. +CLEANFILES+= opt_ah.h + +athstats.o: opt_ah.h + +opt_ah.h: + touch opt_ah.h ==== //depot/projects/wifi/tools/tools/ath/athstats/athstats.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,17 +33,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.6 2005/03/30 20:21:44 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athstats/athstats.c,v 1.5 2006/08/10 19:01:16 sam Exp $ */ /* - * Simple Atheros-specific tool to inspect and monitor network traffic - * statistics. - * athstats [-i interface] [interval] - * (default interface is ath0). If interval is specified a rolling output - * a la netstat -i is displayed every interval seconds. - * - * To build: cc -o athstats athstats.c -lkvm + * ath statistics class. */ #include #include @@ -55,287 +49,697 @@ #include #include +#include +#include +#include #include "../../../../sys/contrib/dev/ath/ah_desc.h" #include "../../../../sys/net80211/ieee80211_ioctl.h" #include "../../../../sys/net80211/ieee80211_radiotap.h" #include "../../../../sys/dev/ath/if_athioctl.h" -static const struct { - u_int phyerr; - const char* desc; -} phyerrdescriptions[] = { - { HAL_PHYERR_UNDERRUN, "transmit underrun" }, - { HAL_PHYERR_TIMING, "timing error" }, - { HAL_PHYERR_PARITY, "illegal parity" }, - { HAL_PHYERR_RATE, "illegal rate" }, - { HAL_PHYERR_LENGTH, "illegal length" }, - { HAL_PHYERR_RADAR, "radar detect" }, - { HAL_PHYERR_SERVICE, "illegal service" }, - { HAL_PHYERR_TOR, "transmit override receive" }, - { HAL_PHYERR_OFDM_TIMING, "OFDM timing" }, - { HAL_PHYERR_OFDM_SIGNAL_PARITY,"OFDM illegal parity" }, - { HAL_PHYERR_OFDM_RATE_ILLEGAL, "OFDM illegal rate" }, - { HAL_PHYERR_OFDM_POWER_DROP, "OFDM power drop" }, - { HAL_PHYERR_OFDM_SERVICE, "OFDM illegal service" }, - { HAL_PHYERR_OFDM_RESTART, "OFDM restart" }, - { HAL_PHYERR_CCK_TIMING, "CCK timing" }, - { HAL_PHYERR_CCK_HEADER_CRC, "CCK header crc" }, - { HAL_PHYERR_CCK_RATE_ILLEGAL, "CCK illegal rate" }, - { HAL_PHYERR_CCK_SERVICE, "CCK illegal service" }, - { HAL_PHYERR_CCK_RESTART, "CCK restart" }, +#include "athstats.h" + +#define NOTPRESENT { 0, "", "" } + +static const struct fmt athstats[] = { +#define S_INPUT 0 + { 8, "input", "input", "data frames received" }, +#define S_OUTPUT 1 + { 8, "output", "output", "data frames transmit" }, +#define S_TX_ALTRATE 2 + { 7, "altrate", "altrate", "tx frames with an alternate rate" }, +#define S_TX_SHORTRETRY 3 + { 7, "short", "short", "short on-chip tx retries" }, +#define S_TX_LONGRETRY 4 + { 7, "long", "long", "long on-chip tx retries" }, +#define S_TX_XRETRIES 5 + { 6, "xretry", "xretry", "tx failed 'cuz too many retries" }, +#define S_MIB 6 + { 5, "mib", "mib", "mib overflow interrupts" }, +#ifndef __linux__ +#define S_TX_LINEAR 7 + { 5, "txlinear", "txlinear", "tx linearized to cluster" }, +#define S_BSTUCK 8 + { 5, "bstuck", "bstuck", "stuck beacon conditions" }, +#define S_INTRCOAL 9 + { 5, "intrcoal", "intrcoal", "interrupts coalesced" }, +#else + NOTPRESENT, NOTPRESENT, NOTPRESENT, +#endif +#define S_RATE 10 + { 4, "rate", "rate", "current transmit rate" }, +#define S_WATCHDOG 11 + { 5, "wdog", "wdog", "watchdog timeouts" }, +#define S_FATAL 12 + { 5, "fatal", "fatal", "hardware error interrupts" }, +#define S_BMISS 13 + { 5, "bmiss", "bmiss", "beacon miss interrupts" }, +#define S_RXORN 14 + { 5, "rxorn", "rxorn", "recv overrun interrupts" }, +#define S_RXEOL 15 + { 5, "rxeol", "rxeol", "recv eol interrupts" }, +#define S_TXURN 16 + { 5, "txurn", "txurn", "txmit underrun interrupts" }, +#define S_TX_MGMT 17 + { 5, "txmgt", "txmgt", "tx management frames" }, +#define S_TX_DISCARD 18 + { 5, "txdisc", "txdisc", "tx frames discarded prior to association" }, +#define S_TX_INVALID 19 + { 5, "txinv", "txinv", "tx invalid (19)" }, +#define S_TX_QSTOP 20 + { 5, "qstop", "qstop", "tx stopped 'cuz no xmit buffer" }, +#define S_TX_ENCAP 21 + { 5, "txencode", "txencode", "tx encapsulation failed" }, +#define S_TX_NONODE 22 + { 5, "txnonode", "txnonode", "tx failed 'cuz no node" }, +#define S_TX_NOMBUF 23 + { 5, "txnombuf", "txnombuf", "tx failed 'cuz mbuf allocation failed" }, +#ifndef __linux__ +#define S_TX_NOMCL 24 + { 5, "txnomcl", "txnomcl", "tx failed 'cuz cluster allocation failed" }, +#else + NOTPRESENT, +#endif +#define S_TX_FIFOERR 25 + { 5, "efifo", "efifo", "tx failed 'cuz FIFO underrun" }, +#define S_TX_FILTERED 26 + { 5, "efilt", "efilt", "tx failed 'cuz destination filtered" }, +#define S_TX_BADRATE 27 + { 5, "txbadrate", "txbadrate", "tx failed 'cuz bogus xmit rate" }, +#define S_TX_NOACK 28 + { 5, "noack", "noack", "tx frames with no ack marked" }, +#define S_TX_RTS 29 + { 5, "rts", "rts", "tx frames with rts enabled" }, +#define S_TX_CTS 30 + { 5, "cts", "cts", "tx frames with cts enabled" }, +#define S_TX_SHORTPRE 31 + { 5, "shpre", "shpre", "tx frames with short preamble" }, +#define S_TX_PROTECT 32 + { 5, "protect", "protect", "tx frames with 11g protection" }, +#define S_RX_ORN 33 + { 5, "rxorn", "rxorn", "rx failed 'cuz of desc overrun" }, +#define S_RX_CRC_ERR 34 + { 6, "crcerr", "crcerr", "rx failed 'cuz of bad CRC" }, +#define S_RX_FIFO_ERR 35 + { 5, "rxfifo", "rxfifo", "rx failed 'cuz of FIFO overrun" }, +#define S_RX_CRYPTO_ERR 36 + { 5, "crypt", "crypt", "rx failed 'cuz decryption" }, +#define S_RX_MIC_ERR 37 + { 4, "mic", "mic", "rx failed 'cuz MIC failure" }, +#define S_RX_TOOSHORT 38 + { 5, "rxshort", "rxshort", "rx failed 'cuz frame too short" }, +#define S_RX_NOMBUF 39 + { 5, "rxnombuf", "rxnombuf", "rx setup failed 'cuz no mbuf" }, +#define S_RX_MGT 40 + { 5, "rxmgt", "rxmgt", "rx management frames" }, +#define S_RX_CTL 41 + { 5, "rxctl", "rxctl", "rx control frames" }, +#define S_RX_PHY_ERR 42 + { 7, "phyerr", "phyerr", "rx failed 'cuz of PHY err" }, +#define S_RX_PHY_UNDERRUN 43 + { 6, "phyund", "phyund", "transmit underrun" }, +#define S_RX_PHY_TIMING 44 + { 6, "phytim", "phytim", "timing error" }, +#define S_RX_PHY_PARITY 45 + { 6, "phypar", "phypar", "illegal parity" }, +#define S_RX_PHY_RATE 46 + { 6, "phyrate", "phyrate", "illegal rate" }, +#define S_RX_PHY_LENGTH 47 + { 6, "phylen", "phylen", "illegal length" }, +#define S_RX_PHY_RADAR 48 + { 6, "phyradar", "phyradar", "radar detect" }, +#define S_RX_PHY_SERVICE 49 + { 6, "physervice", "physervice", "illegal service" }, +#define S_RX_PHY_TOR 50 + { 6, "phytor", "phytor", "transmit override receive" }, +#define S_RX_PHY_OFDM_TIMING 51 + { 6, "ofdmtim", "ofdmtim", "OFDM timing" }, +#define S_RX_PHY_OFDM_SIGNAL_PARITY 52 + { 6, "ofdmsig", "ofdmsig", "OFDM illegal parity" }, +#define S_RX_PHY_OFDM_RATE_ILLEGAL 53 + { 6, "ofdmrate", "ofdmrate", "OFDM illegal rate" }, +#define S_RX_PHY_OFDM_POWER_DROP 54 + { 6, "ofdmpow", "ofdmpow", "OFDM power drop" }, +#define S_RX_PHY_OFDM_SERVICE 55 + { 6, "ofdmservice", "ofdmservice", "OFDM illegal service" }, +#define S_RX_PHY_OFDM_RESTART 56 + { 6, "ofdmrestart", "ofdmrestart", "OFDM restart" }, +#define S_RX_PHY_CCK_TIMING 57 + { 6, "ccktim", "ccktim", "CCK timing" }, +#define S_RX_PHY_CCK_HEADER_CRC 58 + { 6, "cckhead", "cckhead", "CCK header crc" }, +#define S_RX_PHY_CCK_RATE_ILLEGAL 59 + { 6, "cckrate", "cckrate", "CCK illegal rate" }, +#define S_RX_PHY_CCK_SERVICE 60 + { 6, "cckservice", "cckservice", "CCK illegal service" }, +#define S_RX_PHY_CCK_RESTART 61 + { 6, "cckrestar", "cckrestar", "CCK restart" }, +#define S_BE_NOMBUF 62 + { 4, "benombuf", "benombuf", "beacon setup failed 'cuz no mbuf" }, +#define S_BE_XMIT 63 + { 7, "bexmit", "bexmit", "beacons transmitted" }, +#define S_PER_CAL 64 + { 4, "pcal", "pcal", "periodic calibrations" }, +#define S_PER_CALFAIL 65 + { 4, "pcalf", "pcalf", "periodic calibration failures" }, +#define S_PER_RFGAIN 66 + { 4, "prfga", "prfga", "rfgain value change" }, +#if 0 +#define S_TDMA_UPDATE 67 + { 5, "tdmau", "tdmau", "TDMA slot timing updates" }, +#define S_TDMA_TIMERS 68 + { 5, "tdmab", "tdmab", "TDMA slot update set beacon timers" }, +#define S_TDMA_TSF 69 + { 5, "tdmat", "tdmat", "TDMA slot update set TSF" }, +#else + NOTPRESENT, NOTPRESENT, NOTPRESENT, +#endif +#define S_RATE_CALLS 70 + { 5, "ratec", "ratec", "rate control checks" }, +#define S_RATE_RAISE 71 + { 5, "rate+", "rate+", "rate control raised xmit rate" }, +#define S_RATE_DROP 72 + { 5, "rate-", "rate-", "rate control dropped xmit rate" }, +#define S_TX_RSSI 73 + { 4, "arssi", "arssi", "rssi of last ack" }, +#define S_RX_RSSI 74 + { 4, "rssi", "rssi", "avg recv rssi" }, +#define S_RX_NOISE 75 + { 5, "noise", "noise", "rx noise floor" }, +#define S_BMISS_PHANTOM 76 + { 5, "bmissphantom", "bmissphantom", "phantom beacon misses" }, +#define S_TX_RAW 77 + { 5, "txraw", "txraw", "tx frames through raw api" }, +#define S_RX_TOOBIG 78 + { 5, "rx2big", "rx2big", "rx failed 'cuz frame too large" }, +#ifndef __linux__ +#define S_CABQ_XMIT 79 + { 5, "cabxmit", "cabxmit", "cabq frames transmitted" }, +#define S_CABQ_BUSY 80 + { 5, "cabqbusy", "cabqbusy", "cabq xmit overflowed beacon interval" }, +#define S_TX_NODATA 81 + { 5, "txnodata", "txnodata", "tx discarded empty frame" }, +#define S_TX_BUSDMA 82 + { 5, "txbusdma", "txbusdma", "tx failed for dma resrcs" }, +#define S_RX_BUSDMA 83 + { 5, "rxbusdma", "rxbusdma", "rx setup failed for dma resrcs" }, +#else + NOTPRESENT, NOTPRESENT, NOTPRESENT, NOTPRESENT, NOTPRESENT, +#endif +#if 0 +#define S_FF_TXOK 84 + { 5, "fftxok", "fftxok", "fast frames xmit successfully" }, +#define S_FF_TXERR 85 + { 5, "fftxerr", "fftxerr", "fast frames not xmit due to error" }, +#define S_FF_RX 86 + { 5, "ffrx", "ffrx", "fast frames received" }, +#define S_FF_FLUSH 87 + { 5, "ffflush", "ffflush", "fast frames flushed from staging q" }, +#else + NOTPRESENT, NOTPRESENT, NOTPRESENT, NOTPRESENT, +#endif +#define S_ANT_DEFSWITCH 88 + { 5, "defsw", "defsw", "switched default/rx antenna" }, +#define S_ANT_TXSWITCH 89 + { 5, "txsw", "txsw", "tx used alternate antenna" }, +#define S_ANT_TX0 90 + { 8, "tx0", "ant0(tx)", "frames tx on antenna 0" }, +#define S_ANT_TX1 91 + { 8, "tx1", "ant1(tx)", "frames tx on antenna 1" }, +#define S_ANT_TX2 92 + { 8, "tx2", "ant2(tx)", "frames tx on antenna 2" }, +#define S_ANT_TX3 93 + { 8, "tx3", "ant3(tx)", "frames tx on antenna 3" }, +#define S_ANT_TX4 94 + { 8, "tx4", "ant4(tx)", "frames tx on antenna 4" }, +#define S_ANT_TX5 95 + { 8, "tx5", "ant5(tx)", "frames tx on antenna 5" }, +#define S_ANT_TX6 96 + { 8, "tx6", "ant6(tx)", "frames tx on antenna 6" }, +#define S_ANT_TX7 97 + { 8, "tx7", "ant7(tx)", "frames tx on antenna 7" }, +#define S_ANT_RX0 98 + { 8, "rx0", "ant0(rx)", "frames rx on antenna 0" }, +#define S_ANT_RX1 99 + { 8, "rx1", "ant1(rx)", "frames rx on antenna 1" }, +#define S_ANT_RX2 100 + { 8, "rx2", "ant2(rx)", "frames rx on antenna 2" }, +#define S_ANT_RX3 101 + { 8, "rx3", "ant3(rx)", "frames rx on antenna 3" }, +#define S_ANT_RX4 102 + { 8, "rx4", "ant4(rx)", "frames rx on antenna 4" }, +#define S_ANT_RX5 103 + { 8, "rx5", "ant5(rx)", "frames rx on antenna 5" }, +#define S_ANT_RX6 104 + { 8, "rx6", "ant6(rx)", "frames rx on antenna 6" }, +#define S_ANT_RX7 105 + { 8, "rx7", "ant7(rx)", "frames rx on antenna 7" }, +#define S_TX_SIGNAL 106 + { 4, "asignal", "asig", "signal of last ack (dBm)" }, +#define S_RX_SIGNAL 107 + { 4, "signal", "sig", "avg recv signal (dBm)" }, +}; +#define S_PHY_MIN S_RX_PHY_UNDERRUN +#define S_PHY_MAX S_RX_PHY_CCK_RESTART +#define S_LAST S_ANT_TX0 +#define S_MAX S_ANT_RX7+1 + +struct athstatfoo_p { + struct athstatfoo base; + int s; + struct ifreq ifr; + struct ath_stats cur; + struct ath_stats total; }; static void -printstats(FILE *fd, const struct ath_stats *stats) +ath_setifname(struct athstatfoo *wf0, const char *ifname) { -#define N(a) (sizeof(a) / sizeof(a[0])) -#define STAT(x,fmt) \ - if (stats->ast_##x) fprintf(fd, "%u " fmt "\n", stats->ast_##x) - int i, j; + struct athstatfoo_p *wf = (struct athstatfoo_p *) wf0; - STAT(watchdog, "watchdog timeouts"); - STAT(hardware, "hardware error interrupts"); - STAT(bmiss, "beacon miss interrupts"); - STAT(bstuck, "stuck beacon conditions"); - STAT(rxorn, "recv overrun interrupts"); - STAT(rxeol, "recv eol interrupts"); - STAT(txurn, "txmit underrun interrupts"); - STAT(mib, "mib overflow interrupts"); - STAT(intrcoal, "interrupts coalesced"); - STAT(tx_mgmt, "tx management frames"); - STAT(tx_discard, "tx frames discarded prior to association"); - STAT(tx_qfull, "tx frames discarded 'cuz of queue limit"); - STAT(tx_qstop, "tx stopped 'cuz no xmit buffer"); - STAT(tx_encap, "tx encapsulation failed"); - STAT(tx_nonode, "tx failed 'cuz no node"); - STAT(tx_nombuf, "tx failed 'cuz no mbuf"); - STAT(tx_nomcl, "tx failed 'cuz no cluster"); - STAT(tx_linear, "tx linearized to cluster"); - STAT(tx_nodata, "tx discarded empty frame"); - STAT(tx_busdma, "tx failed for dma resrcs"); - STAT(tx_xretries, "tx failed 'cuz too many retries"); - STAT(tx_fifoerr, "tx failed 'cuz FIFO underrun"); - STAT(tx_filtered, "tx failed 'cuz xmit filtered"); - STAT(tx_shortretry, "short on-chip tx retries"); - STAT(tx_longretry, "long on-chip tx retries"); - STAT(tx_badrate, "tx failed 'cuz bogus xmit rate"); - STAT(tx_noack, "tx frames with no ack marked"); - STAT(tx_rts, "tx frames with rts enabled"); - STAT(tx_cts, "tx frames with cts enabled"); - STAT(tx_shortpre, "tx frames with short preamble"); - STAT(tx_altrate, "tx frames with an alternate rate"); - STAT(tx_protect, "tx frames with 11g protection"); - STAT(tx_ctsburst, "tx frames with 11g protection and bursting"); - STAT(tx_ctsext, "tx frames with 11g cts protection extended for bursting"); - STAT(ff_txok, "tx fast frames successful"); - STAT(ff_txerr, "tx fast frames with error"); - STAT(ff_flush, "frames flushed from fast frame staging queue"); - STAT(ff_rx, "rx fast frames"); - STAT(rx_nombuf, "rx setup failed 'cuz no mbuf"); - STAT(rx_busdma, "rx setup failed for dma resrcs"); - STAT(rx_orn, "rx failed 'cuz of desc overrun"); - STAT(rx_crcerr, "rx failed 'cuz of bad CRC"); - STAT(rx_fifoerr, "rx failed 'cuz of FIFO overrun"); - STAT(rx_badcrypt, "rx failed 'cuz decryption"); - STAT(rx_badmic, "rx failed 'cuz MIC failure"); - STAT(rx_tooshort, "rx failed 'cuz frame too short"); - STAT(rx_toobig, "rx failed 'cuz frame too large"); - STAT(rx_mgt, "rx management frames"); - STAT(rx_ctl, "rx control frames"); - STAT(rx_phyerr, "rx failed 'cuz of PHY err"); - if (stats->ast_rx_phyerr != 0) { - for (i = 0; i < 32; i++) { - if (stats->ast_rx_phy[i] == 0) - continue; - for (j = 0; j < N(phyerrdescriptions); j++) - if (phyerrdescriptions[j].phyerr == i) - break; - if (j == N(phyerrdescriptions)) - fprintf(fd, - " %u (unknown phy error code %u)\n", - stats->ast_rx_phy[i], i); - else - fprintf(fd, " %u %s\n", - stats->ast_rx_phy[i], - phyerrdescriptions[j].desc); - } - } - STAT(be_nombuf, "beacon setup failed 'cuz no mbuf"); - STAT(be_xmit, "beacons transmitted"); - STAT(per_cal, "periodic calibrations"); - STAT(per_calfail, "periodic calibration failures"); - STAT(per_rfgain, "rfgain value change"); - STAT(rate_calls, "rate control checks"); - STAT(rate_raise, "rate control raised xmit rate"); - STAT(rate_drop, "rate control dropped xmit rate"); - if (stats->ast_tx_rssi) - fprintf(fd, "rssi of last ack: %u\n", stats->ast_tx_rssi); - if (stats->ast_rx_rssi) - fprintf(fd, "avg recv rssi: %u\n", stats->ast_rx_rssi); - STAT(ant_defswitch, "switched default/rx antenna"); - STAT(ant_txswitch, "tx used alternate antenna"); - fprintf(fd, "Antenna profile:\n"); - for (i = 0; i < 8; i++) - if (stats->ast_ant_rx[i] || stats->ast_ant_tx[i]) - fprintf(fd, "[%u] tx %8u rx %8u\n", i, - stats->ast_ant_tx[i], stats->ast_ant_rx[i]); -#undef STAT -#undef N + strncpy(wf->ifr.ifr_name, ifname, sizeof (wf->ifr.ifr_name)); } -static u_int -getifrate(int s, const char* ifname) +static void +ath_collect(struct athstatfoo_p *wf, struct ath_stats *stats) { -#define N(a) (sizeof(a) / sizeof(a[0])) - static const int rates[] = { - 0, /* IFM_AUTO */ - 0, /* IFM_MANUAL */ - 0, /* IFM_NONE */ - 1, /* IFM_IEEE80211_FH1 */ - 2, /* IFM_IEEE80211_FH2 */ - 1, /* IFM_IEEE80211_DS1 */ - 2, /* IFM_IEEE80211_DS2 */ - 5, /* IFM_IEEE80211_DS5 */ - 11, /* IFM_IEEE80211_DS11 */ - 22, /* IFM_IEEE80211_DS22 */ - 6, /* IFM_IEEE80211_OFDM6 */ - 9, /* IFM_IEEE80211_OFDM9 */ - 12, /* IFM_IEEE80211_OFDM12 */ - 18, /* IFM_IEEE80211_OFDM18 */ - 24, /* IFM_IEEE80211_OFDM24 */ - 36, /* IFM_IEEE80211_OFDM36 */ - 48, /* IFM_IEEE80211_OFDM48 */ - 54, /* IFM_IEEE80211_OFDM54 */ - 72, /* IFM_IEEE80211_OFDM72 */ - }; - struct ifmediareq ifmr; - int *media_list, i; + wf->ifr.ifr_data = (caddr_t) stats; + if (ioctl(wf->s, SIOCGATHSTATS, &wf->ifr) < 0) + err(1, wf->ifr.ifr_name); +} - (void) memset(&ifmr, 0, sizeof(ifmr)); - (void) strncpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); +static void +ath_collect_cur(struct statfoo *sf) +{ + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; - if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) - return 0; - return IFM_SUBTYPE(ifmr.ifm_active) < N(rates) ? - rates[IFM_SUBTYPE(ifmr.ifm_active)] : 0; -#undef N + ath_collect(wf, &wf->cur); } -static int signalled; +static void +ath_collect_tot(struct statfoo *sf) +{ + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; + + ath_collect(wf, &wf->total); +} static void -catchalarm(int signo __unused) +ath_update_tot(struct statfoo *sf) +{ + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; + + wf->total = wf->cur; +} + +static int +ath_get_curstat(struct statfoo *sf, int s, char b[], size_t bs) +{ + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; +#define STAT(x) \ + snprintf(b, bs, "%u", wf->cur.ast_##x - wf->total.ast_##x); return 1 +#define PHY(x) \ + snprintf(b, bs, "%u", wf->cur.ast_rx_phy[x] - wf->total.ast_rx_phy[x]); return 1 +#define TXANT(x) \ + snprintf(b, bs, "%u", wf->cur.ast_ant_tx[x] - wf->total.ast_ant_tx[x]); return 1 +#define RXANT(x) \ + snprintf(b, bs, "%u", wf->cur.ast_ant_rx[x] - wf->total.ast_ant_rx[x]); return 1 + + switch (s) { + case S_INPUT: + snprintf(b, bs, "%lu", + (wf->cur.ast_rx_packets - wf->total.ast_rx_packets) - + (wf->cur.ast_rx_mgt - wf->total.ast_rx_mgt)); + return 1; + case S_OUTPUT: + snprintf(b, bs, "%lu", + wf->cur.ast_tx_packets - wf->total.ast_tx_packets); + return 1; + case S_RATE: + snprintf(b, bs, "%uM", wf->cur.ast_tx_rate / 2); + return 1; + case S_WATCHDOG: STAT(watchdog); + case S_FATAL: STAT(hardware); + case S_BMISS: STAT(bmiss); + case S_BMISS_PHANTOM: STAT(bmiss_phantom); +#ifdef S_BSTUCK + case S_BSTUCK: STAT(bstuck); +#endif + case S_RXORN: STAT(rxorn); + case S_RXEOL: STAT(rxeol); + case S_TXURN: STAT(txurn); + case S_MIB: STAT(mib); +#ifdef S_INTRCOAL + case S_INTRCOAL: STAT(intrcoal); +#endif + case S_TX_MGMT: STAT(tx_mgmt); + case S_TX_DISCARD: STAT(tx_discard); + case S_TX_QSTOP: STAT(tx_qstop); + case S_TX_ENCAP: STAT(tx_encap); + case S_TX_NONODE: STAT(tx_nonode); + case S_TX_NOMBUF: STAT(tx_nombuf); +#ifdef S_TX_NOMCL + case S_TX_NOMCL: STAT(tx_nomcl); + case S_TX_LINEAR: STAT(tx_linear); + case S_TX_NODATA: STAT(tx_nodata); + case S_TX_BUSDMA: STAT(tx_busdma); +#endif + case S_TX_XRETRIES: STAT(tx_xretries); + case S_TX_FIFOERR: STAT(tx_fifoerr); + case S_TX_FILTERED: STAT(tx_filtered); + case S_TX_SHORTRETRY: STAT(tx_shortretry); + case S_TX_LONGRETRY: STAT(tx_longretry); + case S_TX_BADRATE: STAT(tx_badrate); + case S_TX_NOACK: STAT(tx_noack); + case S_TX_RTS: STAT(tx_rts); + case S_TX_CTS: STAT(tx_cts); + case S_TX_SHORTPRE: STAT(tx_shortpre); + case S_TX_ALTRATE: STAT(tx_altrate); + case S_TX_PROTECT: STAT(tx_protect); + case S_RX_NOMBUF: STAT(rx_nombuf); +#ifdef S_RX_BUSDMA + case S_RX_BUSDMA: STAT(rx_busdma); +#endif + case S_RX_ORN: STAT(rx_orn); + case S_RX_CRC_ERR: STAT(rx_crcerr); + case S_RX_FIFO_ERR: STAT(rx_fifoerr); + case S_RX_CRYPTO_ERR: STAT(rx_badcrypt); + case S_RX_MIC_ERR: STAT(rx_badmic); + case S_RX_PHY_ERR: STAT(rx_phyerr); + case S_RX_PHY_UNDERRUN: PHY(HAL_PHYERR_UNDERRUN); + case S_RX_PHY_TIMING: PHY(HAL_PHYERR_TIMING); + case S_RX_PHY_PARITY: PHY(HAL_PHYERR_PARITY); + case S_RX_PHY_RATE: PHY(HAL_PHYERR_RATE); + case S_RX_PHY_LENGTH: PHY(HAL_PHYERR_LENGTH); + case S_RX_PHY_RADAR: PHY(HAL_PHYERR_RADAR); + case S_RX_PHY_SERVICE: PHY(HAL_PHYERR_SERVICE); + case S_RX_PHY_TOR: PHY(HAL_PHYERR_TOR); + case S_RX_PHY_OFDM_TIMING: PHY(HAL_PHYERR_OFDM_TIMING); + case S_RX_PHY_OFDM_SIGNAL_PARITY: PHY(HAL_PHYERR_OFDM_SIGNAL_PARITY); + case S_RX_PHY_OFDM_RATE_ILLEGAL: PHY(HAL_PHYERR_OFDM_RATE_ILLEGAL); + case S_RX_PHY_OFDM_POWER_DROP: PHY(HAL_PHYERR_OFDM_POWER_DROP); + case S_RX_PHY_OFDM_SERVICE: PHY(HAL_PHYERR_OFDM_SERVICE); + case S_RX_PHY_OFDM_RESTART: PHY(HAL_PHYERR_OFDM_RESTART); + case S_RX_PHY_CCK_TIMING: PHY(HAL_PHYERR_CCK_TIMING); + case S_RX_PHY_CCK_HEADER_CRC: PHY(HAL_PHYERR_CCK_HEADER_CRC); + case S_RX_PHY_CCK_RATE_ILLEGAL: PHY(HAL_PHYERR_CCK_RATE_ILLEGAL); + case S_RX_PHY_CCK_SERVICE: PHY(HAL_PHYERR_CCK_SERVICE); + case S_RX_PHY_CCK_RESTART: PHY(HAL_PHYERR_CCK_RESTART); + case S_RX_TOOSHORT: STAT(rx_tooshort); + case S_RX_TOOBIG: STAT(rx_toobig); + case S_RX_MGT: STAT(rx_mgt); + case S_RX_CTL: STAT(rx_ctl); + case S_TX_RSSI: + snprintf(b, bs, "%d", wf->cur.ast_tx_rssi); + return 1; + case S_RX_RSSI: + snprintf(b, bs, "%d", wf->cur.ast_rx_rssi); + return 1; + case S_BE_XMIT: STAT(be_xmit); + case S_BE_NOMBUF: STAT(be_nombuf); + case S_PER_CAL: STAT(per_cal); + case S_PER_CALFAIL: STAT(per_calfail); + case S_PER_RFGAIN: STAT(per_rfgain); +#ifdef S_TDMA_UPDATE + case S_TDMA_UPDATE: STAT(tdma_update); + case S_TDMA_TIMERS: STAT(tdma_timers); + case S_TDMA_TSF: STAT(tdma_tsf); +#endif + case S_RATE_CALLS: STAT(rate_calls); + case S_RATE_RAISE: STAT(rate_raise); + case S_RATE_DROP: STAT(rate_drop); + case S_ANT_DEFSWITCH: STAT(ant_defswitch); + case S_ANT_TXSWITCH: STAT(ant_txswitch); + case S_ANT_TX0: TXANT(0); + case S_ANT_TX1: TXANT(1); + case S_ANT_TX2: TXANT(2); + case S_ANT_TX3: TXANT(3); + case S_ANT_TX4: TXANT(4); + case S_ANT_TX5: TXANT(5); + case S_ANT_TX6: TXANT(6); + case S_ANT_TX7: TXANT(7); + case S_ANT_RX0: RXANT(0); + case S_ANT_RX1: RXANT(1); + case S_ANT_RX2: RXANT(2); + case S_ANT_RX3: RXANT(3); + case S_ANT_RX4: RXANT(4); + case S_ANT_RX5: RXANT(5); + case S_ANT_RX6: RXANT(6); + case S_ANT_RX7: RXANT(7); +#ifdef S_CABQ_XMIT + case S_CABQ_XMIT: STAT(cabq_xmit); + case S_CABQ_BUSY: STAT(cabq_busy); +#endif +#ifdef S_FF_TXOK + case S_FF_TXOK: STAT(ff_txok); + case S_FF_TXERR: STAT(ff_txerr); + case S_FF_FLUSH: STAT(ff_flush); + case S_FF_QFULL: STAT(ff_qfull); +#endif + case S_RX_NOISE: + snprintf(b, bs, "%d", wf->cur.ast_rx_noise); + return 1; + case S_TX_SIGNAL: + snprintf(b, bs, "%d", + wf->cur.ast_tx_rssi + wf->cur.ast_rx_noise); + return 1; + case S_RX_SIGNAL: + snprintf(b, bs, "%d", + wf->cur.ast_rx_rssi + wf->cur.ast_rx_noise); + return 1; + } + b[0] = '\0'; + return 0; +#undef RXANT +#undef TXANT +#undef PHY +#undef STAT +} + +static int +ath_get_totstat(struct statfoo *sf, int s, char b[], size_t bs) { - signalled = 1; + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; +#define STAT(x) \ + snprintf(b, bs, "%u", wf->total.ast_##x); return 1 +#define PHY(x) \ + snprintf(b, bs, "%u", wf->total.ast_rx_phy[x]); return 1 +#define TXANT(x) \ + snprintf(b, bs, "%u", wf->total.ast_ant_tx[x]); return 1 +#define RXANT(x) \ + snprintf(b, bs, "%u", wf->total.ast_ant_rx[x]); return 1 + + switch (s) { + case S_INPUT: + snprintf(b, bs, "%lu", + wf->total.ast_rx_packets - wf->total.ast_rx_mgt); + return 1; + case S_OUTPUT: + snprintf(b, bs, "%lu", wf->total.ast_tx_packets); + return 1; + case S_RATE: + snprintf(b, bs, "%uM", wf->total.ast_tx_rate / 2); + return 1; + case S_WATCHDOG: STAT(watchdog); + case S_FATAL: STAT(hardware); + case S_BMISS: STAT(bmiss); + case S_BMISS_PHANTOM: STAT(bmiss_phantom); +#ifdef S_BSTUCK + case S_BSTUCK: STAT(bstuck); +#endif + case S_RXORN: STAT(rxorn); + case S_RXEOL: STAT(rxeol); + case S_TXURN: STAT(txurn); + case S_MIB: STAT(mib); +#ifdef S_INTRCOAL + case S_INTRCOAL: STAT(intrcoal); +#endif + case S_TX_MGMT: STAT(tx_mgmt); + case S_TX_DISCARD: STAT(tx_discard); + case S_TX_QSTOP: STAT(tx_qstop); + case S_TX_ENCAP: STAT(tx_encap); + case S_TX_NONODE: STAT(tx_nonode); + case S_TX_NOMBUF: STAT(tx_nombuf); +#ifdef S_TX_NOMCL + case S_TX_NOMCL: STAT(tx_nomcl); + case S_TX_LINEAR: STAT(tx_linear); + case S_TX_NODATA: STAT(tx_nodata); + case S_TX_BUSDMA: STAT(tx_busdma); +#endif + case S_TX_XRETRIES: STAT(tx_xretries); + case S_TX_FIFOERR: STAT(tx_fifoerr); + case S_TX_FILTERED: STAT(tx_filtered); + case S_TX_SHORTRETRY: STAT(tx_shortretry); + case S_TX_LONGRETRY: STAT(tx_longretry); + case S_TX_BADRATE: STAT(tx_badrate); + case S_TX_NOACK: STAT(tx_noack); + case S_TX_RTS: STAT(tx_rts); + case S_TX_CTS: STAT(tx_cts); + case S_TX_SHORTPRE: STAT(tx_shortpre); + case S_TX_ALTRATE: STAT(tx_altrate); + case S_TX_PROTECT: STAT(tx_protect); + case S_RX_NOMBUF: STAT(rx_nombuf); +#ifdef S_RX_BUSDMA + case S_RX_BUSDMA: STAT(rx_busdma); +#endif + case S_RX_ORN: STAT(rx_orn); + case S_RX_CRC_ERR: STAT(rx_crcerr); + case S_RX_FIFO_ERR: STAT(rx_fifoerr); + case S_RX_CRYPTO_ERR: STAT(rx_badcrypt); + case S_RX_MIC_ERR: STAT(rx_badmic); + case S_RX_PHY_ERR: STAT(rx_phyerr); + case S_RX_PHY_UNDERRUN: PHY(HAL_PHYERR_UNDERRUN); + case S_RX_PHY_TIMING: PHY(HAL_PHYERR_TIMING); + case S_RX_PHY_PARITY: PHY(HAL_PHYERR_PARITY); + case S_RX_PHY_RATE: PHY(HAL_PHYERR_RATE); + case S_RX_PHY_LENGTH: PHY(HAL_PHYERR_LENGTH); + case S_RX_PHY_RADAR: PHY(HAL_PHYERR_RADAR); + case S_RX_PHY_SERVICE: PHY(HAL_PHYERR_SERVICE); + case S_RX_PHY_TOR: PHY(HAL_PHYERR_TOR); + case S_RX_PHY_OFDM_TIMING: PHY(HAL_PHYERR_OFDM_TIMING); + case S_RX_PHY_OFDM_SIGNAL_PARITY: PHY(HAL_PHYERR_OFDM_SIGNAL_PARITY); + case S_RX_PHY_OFDM_RATE_ILLEGAL: PHY(HAL_PHYERR_OFDM_RATE_ILLEGAL); + case S_RX_PHY_OFDM_POWER_DROP: PHY(HAL_PHYERR_OFDM_POWER_DROP); + case S_RX_PHY_OFDM_SERVICE: PHY(HAL_PHYERR_OFDM_SERVICE); + case S_RX_PHY_OFDM_RESTART: PHY(HAL_PHYERR_OFDM_RESTART); + case S_RX_PHY_CCK_TIMING: PHY(HAL_PHYERR_CCK_TIMING); + case S_RX_PHY_CCK_HEADER_CRC: PHY(HAL_PHYERR_CCK_HEADER_CRC); + case S_RX_PHY_CCK_RATE_ILLEGAL: PHY(HAL_PHYERR_CCK_RATE_ILLEGAL); + case S_RX_PHY_CCK_SERVICE: PHY(HAL_PHYERR_CCK_SERVICE); + case S_RX_PHY_CCK_RESTART: PHY(HAL_PHYERR_CCK_RESTART); + case S_RX_TOOSHORT: STAT(rx_tooshort); + case S_RX_TOOBIG: STAT(rx_toobig); + case S_RX_MGT: STAT(rx_mgt); + case S_RX_CTL: STAT(rx_ctl); + case S_TX_RSSI: + snprintf(b, bs, "%d", wf->total.ast_tx_rssi); + return 1; + case S_RX_RSSI: + snprintf(b, bs, "%d", wf->total.ast_rx_rssi); + return 1; + case S_BE_XMIT: STAT(be_xmit); + case S_BE_NOMBUF: STAT(be_nombuf); + case S_PER_CAL: STAT(per_cal); + case S_PER_CALFAIL: STAT(per_calfail); + case S_PER_RFGAIN: STAT(per_rfgain); +#ifdef S_TDMA_UPDATE + case S_TDMA_UPDATE: STAT(tdma_update); + case S_TDMA_TIMERS: STAT(tdma_timers); + case S_TDMA_TSF: STAT(tdma_tsf); +#endif + case S_RATE_CALLS: STAT(rate_calls); + case S_RATE_RAISE: STAT(rate_raise); + case S_RATE_DROP: STAT(rate_drop); + case S_ANT_DEFSWITCH: STAT(ant_defswitch); + case S_ANT_TXSWITCH: STAT(ant_txswitch); + case S_ANT_TX0: TXANT(0); + case S_ANT_TX1: TXANT(1); + case S_ANT_TX2: TXANT(2); + case S_ANT_TX3: TXANT(3); + case S_ANT_TX4: TXANT(4); + case S_ANT_TX5: TXANT(5); + case S_ANT_TX6: TXANT(6); + case S_ANT_TX7: TXANT(7); + case S_ANT_RX0: RXANT(0); + case S_ANT_RX1: RXANT(1); + case S_ANT_RX2: RXANT(2); + case S_ANT_RX3: RXANT(3); + case S_ANT_RX4: RXANT(4); + case S_ANT_RX5: RXANT(5); + case S_ANT_RX6: RXANT(6); + case S_ANT_RX7: RXANT(7); +#ifdef S_CABQ_XMIT + case S_CABQ_XMIT: STAT(cabq_xmit); + case S_CABQ_BUSY: STAT(cabq_busy); +#endif +#ifdef S_FF_TXOK + case S_FF_TXOK: STAT(ff_txok); + case S_FF_TXERR: STAT(ff_txerr); + case S_FF_FLUSH: STAT(ff_flush); + case S_FF_QFULL: STAT(ff_qfull); +#endif + case S_RX_NOISE: + snprintf(b, bs, "%d", wf->total.ast_rx_noise); + return 1; + case S_TX_SIGNAL: + snprintf(b, bs, "%d", + wf->total.ast_tx_rssi + wf->total.ast_rx_noise); + return 1; + case S_RX_SIGNAL: + snprintf(b, bs, "%d", + wf->total.ast_rx_rssi + wf->total.ast_rx_noise); + return 1; + } + b[0] = '\0'; + return 0; +#undef RXANT +#undef TXANT +#undef PHY +#undef STAT } -int -main(int argc, char *argv[]) +static void +ath_print_verbose(struct statfoo *sf, FILE *fd) { - int s; - struct ifreq ifr; + struct athstatfoo_p *wf = (struct athstatfoo_p *) sf; +#define isphyerr(i) (S_PHY_MIN <= i && i <= S_PHY_MAX) + char s[32]; + const char *indent; + int i; - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) - err(1, "socket"); - if (argc > 1 && strcmp(argv[1], "-i") == 0) { - if (argc < 2) { - fprintf(stderr, "%s: missing interface name for -i\n", - argv[0]); - exit(-1); + for (i = 0; i < S_LAST; i++) { + if (ath_get_totstat(sf, i, s, sizeof(s)) && strcmp(s, "0")) { + if (isphyerr(i)) + indent = " "; + else + indent = ""; + fprintf(fd, "%s%s %s\n", indent, s, athstats[i].desc); } - strncpy(ifr.ifr_name, argv[2], sizeof (ifr.ifr_name)); - argc -= 2, argv += 2; - } else - strncpy(ifr.ifr_name, "ath0", sizeof (ifr.ifr_name)); - if (argc > 1) { - u_long interval = strtoul(argv[1], NULL, 0); - int line, omask; - u_int rate = getifrate(s, ifr.ifr_name); - struct ath_stats cur, total; + } + fprintf(fd, "Antenna profile:\n"); + for (i = 0; i < 8; i++) + if (wf->total.ast_ant_rx[i] || wf->total.ast_ant_tx[i]) + fprintf(fd, "[%u] tx %8u rx %8u\n", i, + wf->total.ast_ant_tx[i], + wf->total.ast_ant_rx[i]); +#undef isphyerr +} + +STATFOO_DEFINE_BOUNCE(athstatfoo) + +struct athstatfoo * +athstats_new(const char *ifname, const char *fmtstring) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + struct athstatfoo_p *wf; + + wf = calloc(1, sizeof(struct athstatfoo_p)); + if (wf != NULL) { + statfoo_init(&wf->base.base, "athstats", athstats, N(athstats)); + /* override base methods */ + wf->base.base.collect_cur = ath_collect_cur; + wf->base.base.collect_tot = ath_collect_tot; + wf->base.base.get_curstat = ath_get_curstat; + wf->base.base.get_totstat = ath_get_totstat; + wf->base.base.update_tot = ath_update_tot; + wf->base.base.print_verbose = ath_print_verbose; + + /* setup bounce functions for public methods */ + STATFOO_BOUNCE(wf, athstatfoo); - if (interval < 1) - interval = 1; - signal(SIGALRM, catchalarm); - signalled = 0; - alarm(interval); - banner: - printf("%8s %8s %7s %7s %7s %6s %6s %5s %7s %4s %4s" - , "input" - , "output" - , "altrate" - , "short" - , "long" - , "xretry" - , "crcerr" - , "crypt" - , "phyerr" - , "rssi" - , "rate" - ); - putchar('\n'); - fflush(stdout); - line = 0; - loop: - if (line != 0) { - ifr.ifr_data = (caddr_t) &cur; - if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); - rate = getifrate(s, ifr.ifr_name); - printf("%8u %8u %7u %7u %7u %6u %6u %5u %7u %4u %3uM\n" - , cur.ast_rx_packets - total.ast_rx_packets - , cur.ast_tx_packets - total.ast_tx_packets - , cur.ast_tx_altrate - total.ast_tx_altrate - , cur.ast_tx_shortretry - total.ast_tx_shortretry - , cur.ast_tx_longretry - total.ast_tx_longretry >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 4 18:32:18 2007 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 D2ADD16A405; Sun, 4 Feb 2007 18:32:17 +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 9581116A400 for ; Sun, 4 Feb 2007 18:32:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8370713C428 for ; Sun, 4 Feb 2007 18:32:17 +0000 (UTC) (envelope-from sam@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 l14IWHau063550 for ; Sun, 4 Feb 2007 18:32:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14IWANk063525 for perforce@freebsd.org; Sun, 4 Feb 2007 18:32:10 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 18:32:10 GMT Message-Id: <200702041832.l14IWANk063525@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 Cc: Subject: PERFORCE change 114008 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: Sun, 04 Feb 2007 18:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=114008 Change 114008 by sam@sam_ebb on 2007/02/04 18:31:48 IFC @ 114007 Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#10 integrate .. //depot/projects/wifi/contrib/bind9/CHANGES#5 integrate .. //depot/projects/wifi/contrib/bind9/FAQ#5 integrate .. //depot/projects/wifi/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/wifi/contrib/bind9/README#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/wifi/contrib/bind9/version#5 integrate .. //depot/projects/wifi/contrib/ipfilter/todo#3 branch .. //depot/projects/wifi/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/wifi/etc/rc.d/ppp#3 branch .. //depot/projects/wifi/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/wifi/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/Makefile#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/gzip.c#3 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/gzip.h#3 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/inflate.c#3 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/match.S#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/unlzh.c#3 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/unpack.c#3 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/unzip.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/wifi/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/wifi/include/Makefile#22 integrate .. //depot/projects/wifi/include/objformat.h#2 delete .. //depot/projects/wifi/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/wifi/include/tgmath.h#2 integrate .. //depot/projects/wifi/lib/bind/bind/config.h#5 integrate .. //depot/projects/wifi/lib/bind/config.h#6 integrate .. //depot/projects/wifi/lib/bind/dns/code.h#4 integrate .. //depot/projects/wifi/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/wifi/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/wifi/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#19 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#12 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/wifi/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/wifi/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/wifi/lib/libc/gen/getobjformat.3#3 delete .. //depot/projects/wifi/lib/libc/gen/getobjformat.c#2 delete .. //depot/projects/wifi/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/wifi/lib/libc/sys/quotactl.2#4 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.1#6 integrate .. //depot/projects/wifi/release/Makefile#17 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#17 integrate .. //depot/projects/wifi/sbin/Makefile#12 integrate .. //depot/projects/wifi/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#15 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/wifi/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/wifi/sbin/geom/misc/subr.c#5 integrate .. //depot/projects/wifi/sbin/geom/misc/subr.h#6 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#9 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#12 integrate .. //depot/projects/wifi/sbin/init/init.c#5 integrate .. //depot/projects/wifi/sbin/ldconfig/ldconfig.c#5 integrate .. //depot/projects/wifi/sbin/mount/Makefile#5 integrate .. //depot/projects/wifi/sbin/mount/mount.c#10 integrate .. //depot/projects/wifi/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/wifi/sbin/mount_msdosfs/mount_msdosfs.c#6 integrate .. //depot/projects/wifi/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.8#5 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/wifi/sbin/mount_nfs4/Makefile#2 delete .. //depot/projects/wifi/sbin/mount_nfs4/mount_nfs4.8#3 delete .. //depot/projects/wifi/sbin/mount_nfs4/mount_nfs4.c#4 delete .. //depot/projects/wifi/sbin/quotacheck/quotacheck.8#4 integrate .. //depot/projects/wifi/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/wifi/share/examples/cvsup/ports-supfile#5 integrate .. //depot/projects/wifi/share/man/man4/altq.4#14 integrate .. //depot/projects/wifi/share/man/man4/an.4#5 integrate .. //depot/projects/wifi/share/man/man4/ath.4#17 integrate .. //depot/projects/wifi/share/man/man4/aue.4#7 integrate .. //depot/projects/wifi/share/man/man4/awi.4#7 integrate .. //depot/projects/wifi/share/man/man4/bce.4#3 integrate .. //depot/projects/wifi/share/man/man4/bfe.4#5 integrate .. //depot/projects/wifi/share/man/man4/bge.4#11 integrate .. //depot/projects/wifi/share/man/man4/dc.4#9 integrate .. //depot/projects/wifi/share/man/man4/de.4#7 integrate .. //depot/projects/wifi/share/man/man4/ed.4#11 integrate .. //depot/projects/wifi/share/man/man4/em.4#14 integrate .. //depot/projects/wifi/share/man/man4/fxp.4#9 integrate .. //depot/projects/wifi/share/man/man4/hme.4#5 integrate .. //depot/projects/wifi/share/man/man4/ipw.4#8 integrate .. //depot/projects/wifi/share/man/man4/iwi.4#11 integrate .. //depot/projects/wifi/share/man/man4/le.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#14 integrate .. //depot/projects/wifi/share/man/man4/msk.4#2 integrate .. //depot/projects/wifi/share/man/man4/mxge.4#3 integrate .. //depot/projects/wifi/share/man/man4/my.4#5 integrate .. //depot/projects/wifi/share/man/man4/ng_deflate.4#2 integrate .. //depot/projects/wifi/share/man/man4/nve.4#8 integrate .. //depot/projects/wifi/share/man/man4/ral.4#9 integrate .. //depot/projects/wifi/share/man/man4/re.4#11 integrate .. //depot/projects/wifi/share/man/man4/rl.4#9 integrate .. //depot/projects/wifi/share/man/man4/sf.4#6 integrate .. //depot/projects/wifi/share/man/man4/sis.4#7 integrate .. //depot/projects/wifi/share/man/man4/sk.4#8 integrate .. //depot/projects/wifi/share/man/man4/ste.4#8 integrate .. //depot/projects/wifi/share/man/man4/stge.4#3 integrate .. //depot/projects/wifi/share/man/man4/tap.4#4 integrate .. //depot/projects/wifi/share/man/man4/tcp.4#5 integrate .. //depot/projects/wifi/share/man/man4/tun.4#4 integrate .. //depot/projects/wifi/share/man/man4/udav.4#6 integrate .. //depot/projects/wifi/share/man/man4/ural.4#10 integrate .. //depot/projects/wifi/share/man/man4/vr.4#7 integrate .. //depot/projects/wifi/share/man/man4/wi.4#10 integrate .. //depot/projects/wifi/share/man/man4/xl.4#10 integrate .. //depot/projects/wifi/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/wifi/share/man/man5/nsswitch.conf.5#6 integrate .. //depot/projects/wifi/share/man/man5/quota.user.5#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#25 integrate .. //depot/projects/wifi/share/man/man5/src.conf.5#3 integrate .. //depot/projects/wifi/share/man/man9/Makefile#19 integrate .. //depot/projects/wifi/share/man/man9/disk.9#3 integrate .. //depot/projects/wifi/share/man/man9/hashinit.9#4 integrate .. //depot/projects/wifi/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/wifi/share/man/man9/sf_buf.9#1 branch .. //depot/projects/wifi/share/man/man9/style.9#10 integrate .. //depot/projects/wifi/share/man/man9/vm_map.9#4 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#15 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#9 integrate .. //depot/projects/wifi/share/mk/bsd.own.mk#6 integrate .. //depot/projects/wifi/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable_pci.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/wifi/sys/amd64/include/clock.h#6 integrate .. //depot/projects/wifi/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/wifi/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/wifi/sys/boot/common/loader.8#10 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/wifi/sys/boot/i386/loader/loader.rc#3 branch .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/wifi/sys/coda/coda_vfsops.h#4 integrate .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/wifi/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/wifi/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/wifi/sys/conf/NOTES#32 integrate .. //depot/projects/wifi/sys/conf/files#40 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#20 integrate .. //depot/projects/wifi/sys/conf/options#27 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#15 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#17 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#132 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#12 integrate .. //depot/projects/wifi/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/wifi/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/wifi/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/wifi/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/wifi/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/wifi/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/wifi/sys/dev/mii/miidevs#6 integrate .. //depot/projects/wifi/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#24 integrate .. //depot/projects/wifi/sys/dev/pci/pci_if.m#5 integrate .. //depot/projects/wifi/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/wifi/sys/dev/pci/pci_private.h#6 integrate .. //depot/projects/wifi/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/wifi/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/wifi/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/wifi/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/wifi/sys/dev/ral/if_ralvar.h#6 delete .. //depot/projects/wifi/sys/dev/re/if_re.c#17 integrate .. //depot/projects/wifi/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/driver.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.h#3 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97_patch.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#10 integrate .. //depot/projects/wifi/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/wifi/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/wifi/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/wifi/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#9 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/wifi/sys/geom/geom_io.c#7 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#9 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/wifi/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/wifi/sys/i386/i386/mptable_pci.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/msi.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/wifi/sys/i386/include/clock.h#8 integrate .. //depot/projects/wifi/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/wifi/sys/i386/isa/clock.c#10 integrate .. //depot/projects/wifi/sys/i386/linux/linux.h#5 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/wifi/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/wifi/sys/kern/init_main.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#18 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_idle.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_kse.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_switch.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_thr.c#11 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/wifi/sys/kern/sched_core.c#4 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#21 integrate .. //depot/projects/wifi/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/wifi/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#22 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/wifi/sys/kern/vfs_export.c#10 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#18 integrate .. //depot/projects/wifi/sys/modules/Makefile#33 integrate .. //depot/projects/wifi/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/wifi/sys/net/bpf.c#20 integrate .. //depot/projects/wifi/sys/net/bpf_compat.h#2 delete .. //depot/projects/wifi/sys/net/bpfdesc.h#7 integrate .. //depot/projects/wifi/sys/net/if_tap.c#14 integrate .. //depot/projects/wifi/sys/net/if_tun.c#11 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#16 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#79 integrate .. //depot/projects/wifi/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#16 integrate .. //depot/projects/wifi/sys/netinet/in.c#13 integrate .. //depot/projects/wifi/sys/netinet/in.h#9 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#15 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#9 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#11 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfs_subs.c#5 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfsops.c#11 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#15 integrate .. //depot/projects/wifi/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/wifi/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#13 integrate .. //depot/projects/wifi/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/wifi/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/wifi/sys/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/wifi/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/wifi/sys/sys/ata.h#10 integrate .. //depot/projects/wifi/sys/sys/buf.h#15 integrate .. //depot/projects/wifi/sys/sys/bufobj.h#8 integrate .. //depot/projects/wifi/sys/sys/conf.h#17 integrate .. //depot/projects/wifi/sys/sys/lock.h#7 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#20 integrate .. //depot/projects/wifi/sys/sys/param.h#22 integrate .. //depot/projects/wifi/sys/sys/proc.h#25 integrate .. //depot/projects/wifi/sys/sys/sched.h#6 integrate .. //depot/projects/wifi/sys/sys/socketvar.h#11 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#10 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#29 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vfsops.c#9 integrate .. //depot/projects/wifi/sys/vm/uma.h#10 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#21 integrate .. //depot/projects/wifi/sys/vm/vm_glue.c#12 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/wifi/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/wifi/tools/build/options/WITHOUT_BZIP2#1 branch .. //depot/projects/wifi/tools/build/options/WITHOUT_BZIP2_SUPPORT#1 branch .. //depot/projects/wifi/tools/regression/fstest/README#1 branch .. //depot/projects/wifi/tools/regression/fstest/tests/chmod/00.t#2 integrate .. //depot/projects/wifi/tools/regression/fstest/tests/mkdir/00.t#2 integrate .. //depot/projects/wifi/tools/regression/fstest/tests/mkfifo/00.t#2 integrate .. //depot/projects/wifi/tools/regression/fstest/tests/open/00.t#2 integrate .. //depot/projects/wifi/tools/regression/netinet/ipsockopt/ipsockopt.c#4 integrate .. //depot/projects/wifi/tools/sched/schedgraph.py#5 integrate .. //depot/projects/wifi/tools/tools/net80211/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlandebug/wlandebug.c#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/wifi/usr.bin/Makefile#13 integrate .. //depot/projects/wifi/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#4 integrate .. //depot/projects/wifi/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#3 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.music#4 integrate .. //depot/projects/wifi/usr.bin/gzip/Makefile#1 branch .. //depot/projects/wifi/usr.bin/gzip/gzexe#1 branch .. //depot/projects/wifi/usr.bin/gzip/gzexe.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/gzip.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/gzip.c#1 branch .. //depot/projects/wifi/usr.bin/gzip/unbzip2.c#1 branch .. //depot/projects/wifi/usr.bin/gzip/zdiff#1 branch .. //depot/projects/wifi/usr.bin/gzip/zdiff.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/zforce#1 branch .. //depot/projects/wifi/usr.bin/gzip/zforce.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/zgrep#1 branch .. //depot/projects/wifi/usr.bin/gzip/zgrep.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/zmore#1 branch .. //depot/projects/wifi/usr.bin/gzip/zmore.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/znew#1 branch .. //depot/projects/wifi/usr.bin/gzip/znew.1#1 branch .. //depot/projects/wifi/usr.bin/gzip/zuncompress.c#1 branch .. //depot/projects/wifi/usr.bin/objformat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/objformat/objformat.1#2 delete .. //depot/projects/wifi/usr.bin/objformat/objformat.c#2 delete .. //depot/projects/wifi/usr.bin/objformat/objformat.sh#1 branch .. //depot/projects/wifi/usr.bin/quota/quota.c#4 integrate .. //depot/projects/wifi/usr.sbin/Makefile#21 integrate .. //depot/projects/wifi/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#3 integrate .. //depot/projects/wifi/usr.sbin/edquota/edquota.8#3 integrate .. //depot/projects/wifi/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/wifi/usr.sbin/gstat/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/activate.c#3 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/portald.h#3 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/pt_file.c#4 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/pt_pipe.c#2 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/wifi/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/wifi/usr.sbin/mountd/mountd.8#3 integrate .. //depot/projects/wifi/usr.sbin/mountd/mountd.c#9 integrate .. //depot/projects/wifi/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/wifi/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/wifi/usr.sbin/pciconf/pciconf.c#4 integrate .. //depot/projects/wifi/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/wifi/usr.sbin/pkg_install/add/main.c#8 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/sign/main.c#2 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/sign/stand.c#2 integrate .. //depot/projects/wifi/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/wifi/usr.sbin/repquota/repquota.c#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/index.c#7 integrate .. //depot/projects/wifi/usr.sbin/vnconfig/Makefile#5 delete .. //depot/projects/wifi/usr.sbin/vnconfig/vnconfig.c#2 delete Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.68 2007/01/02 03:42:16 kientzle Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.71 2007/02/01 08:45:26 rafan Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,16 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070201: remove libmytinfo link +OLD_FILES+=usr/lib/libmytinfo.a +OLD_FILES+=usr/lib/libmytinfo.so +# 20070128: remove vnconfig +OLD_FILES+=usr/sbin/vnconfig +# 20070125: objformat bites the dust +OLD_FILES+=usr/bin/objformat +OLD_FILES+=usr/share/man/man1/objformat.1.gz +OLD_FILES+=usr/include/objformat.h +OLD_FILES+=usr/share/man/man3/getobjformat.3.gz # 20061201: remove symlink to *.so.4 libalias modules OLD_FILES+=usr/lib/libalias_cuseeme.so OLD_FILES+=usr/lib/libalias_dummy.so ==== //depot/projects/wifi/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.4 released --- + +2126. [security] Serialise validation of type ANY responses. [RT #16555] + +2124. [security] It was possible to dereference a freed fetch + context. [RT #16584] + --- 9.3.3 released --- 2107. [bug] dighost.c: more cleanup of buffers. [RT #16499] ==== //depot/projects/wifi/contrib/bind9/FAQ#5 (text+ko) ==== @@ -1,5 +1,9 @@ Frequently Asked Questions about BIND 9 +Copyright © 2004-2007 Internet Systems Consortium, Inc. ("ISC") + +Copyright © 2000-2003 Internet Software Consortium. + ------------------------------------------------------------------------------- Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? @@ -630,3 +634,42 @@ See these man-pages for more information : selinux(8), named_selinux(8), chcon (1), setsebool(8) +Q: I want to forward all DNS queries from my caching nameserver to another server. + But there are some domains which have to be served locally, via rbldnsd. + + How do I achieve this ? + +A: options { + forward only; + forwarders { ; }; + }; + + zone "sbl-xbl.spamhaus.org" { + type forward; forward only; + forwarders { port 530; }; + }; + + zone "list.dsbl.org" { + type forward; forward only; + forwarders { port 530; }; + }; + + +Q: Will named be affected by the 2007 changes to daylight savings rules in the US. + +A: No, so long as the machines internal clock (as reported by "date -u") remains + at UTC. The only visible change if you fail to upgrade your OS, if you are in a + affected area, will be that log messages will be a hour out during the period + where the old rules do not match the new rules. + + For most OS's this change just means that you need to update the conversion + rules from UTC to local time. Normally this involves updating a file in /etc + (which sets the default timezone for the machine) and possibly a directory + which has all the conversion rules for the world (e.g. /usr/share/zoneinfo). + When updating the OS do not forget to update any chroot areas as well. See your + OS's documetation for more details. + + The local timezone conversion rules can also be done on a individual basis by + setting the TZ envirionment variable appropriately. See your OS's documentation + for more details. + ==== //depot/projects/wifi/contrib/bind9/FAQ.xml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - +
Frequently Asked Questions about BIND 9 + + + 2004 + 2005 + 2006 + 2007 + Internet Systems Consortium, Inc. ("ISC") + + + 2000 + 2001 + 2002 + 2003 + Internet Software Consortium. + + @@ -1193,5 +1209,68 @@ + + + + I want to forward all DNS queries from my caching nameserver to + another server. But there are some domains which have to be + served locally, via rbldnsd. + + + How do I achieve this ? + + + + +options { + forward only; + forwarders { <ip.of.primary.nameserver>; }; +}; + +zone "sbl-xbl.spamhaus.org" { + type forward; forward only; + forwarders { <ip.of.rbldns.server> port 530; }; +}; + +zone "list.dsbl.org" { + type forward; forward only; + forwarders { <ip.of.rbldns.server> port 530; }; +}; + + + + + + + Will named be affected by the 2007 changes to daylight savings + rules in the US. + + + + + No, so long as the machines internal clock (as reported + by "date -u") remains at UTC. The only visible change + if you fail to upgrade your OS, if you are in a affected + area, will be that log messages will be a hour out during + the period where the old rules do not match the new rules. + + + For most OS's this change just means that you need to + update the conversion rules from UTC to local time. + Normally this involves updating a file in /etc (which + sets the default timezone for the machine) and possibly + a directory which has all the conversion rules for the + world (e.g. /usr/share/zoneinfo). When updating the OS + do not forget to update any chroot areas as well. + See your OS's documetation for more details. + + + The local timezone conversion rules can also be done on + a individual basis by setting the TZ envirionment variable + appropriately. See your OS's documentation for more + details. + + +
==== //depot/projects/wifi/contrib/bind9/README#5 (text+ko) ==== @@ -42,6 +42,14 @@ Stichting NLnet - NLnet Foundation Nominum, Inc. +BIND 9.3.4 + + BIND 9.3.4 is a security release. + +BIND 9.3.3 + + BIND 9.3.3 is a maintenance release, containing fixes for + a number of bugs in 9.3.2. BIND 9.3.2 ==== //depot/projects/wifi/contrib/bind9/lib/dns/api#5 (text+ko) ==== @@ -1,3 +1,3 @@ -LIBINTERFACE = 22 -LIBREVISION = 7 -LIBAGE = 0 +LIBINTERFACE = 23 +LIBREVISION = 0 +LIBAGE = 1 ==== //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.h,v 1.18.12.11 2006/01/06 00:01:42 marka Exp $ */ +/* $Id: validator.h,v 1.18.12.11.6.1 2007/01/11 04:51:39 marka Exp $ */ #ifndef DNS_VALIDATOR_H #define DNS_VALIDATOR_H 1 @@ -144,6 +144,7 @@ * dns_validator_create() options. */ #define DNS_VALIDATOR_DLV 1U +#define DNS_VALIDATOR_DEFER 2U ISC_LANG_BEGINDECLS @@ -192,6 +193,15 @@ */ void +dns_validator_send(dns_validator_t *validator); +/*%< + * Send a deferred validation request + * + * Requires: + * 'validator' to points to a valid DNSSEC validator. + */ + +void dns_validator_cancel(dns_validator_t *validator); /*%< * Cancel a DNSSEC validation in progress. ==== //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#6 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.64 2006/08/31 03:57:11 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.64.4.2 2007/01/11 05:05:10 marka Exp $ */ #include @@ -218,6 +218,11 @@ dns_name_t nsname; dns_fetch_t * nsfetch; dns_rdataset_t nsrrset; + + /*% + * Number of queries that reference this context. + */ + unsigned int nqueries; }; #define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!') @@ -351,6 +356,7 @@ dns_rdataset_t *ardataset, isc_result_t *eresultp); static void validated(isc_task_t *task, isc_event_t *event); +static void maybe_destroy(fetchctx_t *fctx); static isc_result_t valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name, @@ -369,6 +375,9 @@ valarg->fctx = fctx; valarg->addrinfo = addrinfo; + if (!ISC_LIST_EMPTY(fctx->validators)) + INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0); + result = dns_validator_create(fctx->res->view, name, type, rdataset, sigrdataset, fctx->rmessage, valoptions, task, validated, valarg, @@ -515,6 +524,9 @@ INSIST(query->tcpsocket == NULL); + query->fctx->nqueries--; + if (SHUTTINGDOWN(query->fctx)) + maybe_destroy(query->fctx); /* Locks bucket. */ query->magic = 0; isc_mem_put(query->mctx, query, sizeof(*query)); *queryp = NULL; @@ -973,6 +985,8 @@ if (result != ISC_R_SUCCESS) return (result); + INSIST(ISC_LIST_EMPTY(fctx->validators)); + dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE); query = isc_mem_get(res->mctx, sizeof(*query)); @@ -1088,6 +1102,7 @@ } ISC_LIST_APPEND(fctx->queries, query, link); + query->fctx->nqueries++; return (ISC_R_SUCCESS); @@ -1540,7 +1555,7 @@ want_done = ISC_TRUE; } } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 && - ISC_LIST_EMPTY(fctx->validators)) { + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) { bucketnum = fctx->bucketnum; LOCK(&res->buckets[bucketnum].lock); /* @@ -2394,8 +2409,8 @@ REQUIRE(ISC_LIST_EMPTY(fctx->finds)); REQUIRE(ISC_LIST_EMPTY(fctx->altfinds)); REQUIRE(fctx->pending == 0); + REQUIRE(fctx->references == 0); REQUIRE(ISC_LIST_EMPTY(fctx->validators)); - REQUIRE(fctx->references == 0); FCTXTRACE("destroy"); @@ -2569,7 +2584,7 @@ } if (fctx->references == 0 && fctx->pending == 0 && - ISC_LIST_EMPTY(fctx->validators)) + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) bucket_empty = fctx_destroy(fctx); UNLOCK(&res->buckets[bucketnum].lock); @@ -2610,6 +2625,7 @@ * pending ADB finds and no pending validations. */ INSIST(fctx->pending == 0); + INSIST(fctx->nqueries == 0); INSIST(ISC_LIST_EMPTY(fctx->validators)); if (fctx->references == 0) { /* @@ -2771,6 +2787,7 @@ fctx->restarts = 0; fctx->timeouts = 0; fctx->attributes = 0; + fctx->nqueries = 0; dns_name_init(&fctx->nsname, NULL); fctx->nsfetch = NULL; @@ -3093,12 +3110,21 @@ unsigned int bucketnum; isc_boolean_t bucket_empty = ISC_FALSE; dns_resolver_t *res = fctx->res; + dns_validator_t *validator; REQUIRE(SHUTTINGDOWN(fctx)); - if (fctx->pending != 0 || !ISC_LIST_EMPTY(fctx->validators)) + if (fctx->pending != 0 || fctx->nqueries != 0) return; + for (validator = ISC_LIST_HEAD(fctx->validators); + validator != NULL; + validator = ISC_LIST_HEAD(fctx->validators)) { + ISC_LIST_UNLINK(fctx->validators, validator, link); + dns_validator_cancel(validator); + dns_validator_destroy(&validator); + } + bucketnum = fctx->bucketnum; LOCK(&res->buckets[bucketnum].lock); if (fctx->references == 0) @@ -3232,7 +3258,9 @@ add_bad(fctx, &addrinfo->sockaddr, result); isc_event_free(&event); UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock); - if (sentresponse) + if (!ISC_LIST_EMPTY(fctx->validators)) + dns_validator_send(ISC_LIST_HEAD(fctx->validators)); + else if (sentresponse) fctx_done(fctx, result); /* Locks bucket. */ else fctx_try(fctx); /* Locks bucket. */ @@ -3330,6 +3358,7 @@ * be validated. */ UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock); + dns_validator_send(ISC_LIST_HEAD(fctx->validators)); goto cleanup_event; } @@ -3640,6 +3669,13 @@ rdataset, sigrdataset, valoptions, task); + /* + * Defer any further validations. + * This prevents multiple validators + * from manipulating fctx->rmessage + * simultaniously. + */ + valoptions |= DNS_VALIDATOR_DEFER; } } else if (CHAINING(rdataset)) { if (rdataset->type == dns_rdatatype_cname) @@ -6371,7 +6407,8 @@ /* * No one cares about the result of this fetch anymore. */ - if (fctx->pending == 0 && ISC_LIST_EMPTY(fctx->validators) && + if (fctx->pending == 0 && fctx->nqueries == 0 && + ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) { /* * This fctx is already shutdown; we were just ==== //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#5 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */ +/* $Id: validator.c,v 1.91.2.5.8.27.6.1 2007/01/11 04:51:39 marka Exp $ */ #include @@ -2825,7 +2825,8 @@ ISC_LINK_INIT(val, link); val->magic = VALIDATOR_MAGIC; - isc_task_send(task, ISC_EVENT_PTR(&event)); + if ((options & DNS_VALIDATOR_DEFER) == 0) + isc_task_send(task, ISC_EVENT_PTR(&event)); *validatorp = val; @@ -2843,6 +2844,21 @@ } void +dns_validator_send(dns_validator_t *validator) { + isc_event_t *event; + REQUIRE(VALID_VALIDATOR(validator)); + + LOCK(&validator->lock); + + INSIST((validator->options & DNS_VALIDATOR_DEFER) != 0); + event = (isc_event_t *)validator->event; + validator->options &= ~DNS_VALIDATOR_DEFER; + UNLOCK(&validator->lock); + + isc_task_send(validator->task, ISC_EVENT_PTR(&event)); +} + +void dns_validator_cancel(dns_validator_t *validator) { REQUIRE(VALID_VALIDATOR(validator)); @@ -2856,6 +2872,12 @@ if (validator->subvalidator != NULL) dns_validator_cancel(validator->subvalidator); + if ((validator->options & DNS_VALIDATOR_DEFER) != 0) { + isc_task_t *task = validator->event->ev_sender; + validator->options &= ~DNS_VALIDATOR_DEFER; + isc_event_free((isc_event_t **)&validator->event); + isc_task_detach(&task); + } } UNLOCK(&validator->lock); } ==== //depot/projects/wifi/contrib/bind9/version#5 (text+ko) ==== @@ -1,10 +1,10 @@ -# $Id: version,v 1.26.2.17.2.26 2006/11/28 00:52:38 marka Exp $ +# $Id: version,v 1.26.2.17.2.26.4.1 2007/01/11 05:06:25 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. # MAJORVER=9 MINORVER=3 -PATCHVER=3 +PATCHVER=4 RELEASETYPE= RELEASEVER= ==== //depot/projects/wifi/etc/etc.powerpc/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.3 2005/09/10 22:46:03 grehan Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.4 2007/01/26 06:22:34 marcel Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -32,12 +32,6 @@ # when going to single-user mode. console none unknown off secure # -# ofw_console(4) -#screen "/usr/libexec/getty Pc" cons25 on secure -# zs(4) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 4 21:52:27 2007 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 A753116A402; Sun, 4 Feb 2007 21:52:27 +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 60B5416A400 for ; Sun, 4 Feb 2007 21:52:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 50AD913C48D for ; Sun, 4 Feb 2007 21:52:27 +0000 (UTC) (envelope-from sam@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 l14LqR7e007960 for ; Sun, 4 Feb 2007 21:52:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14LqQNs007957 for perforce@freebsd.org; Sun, 4 Feb 2007 21:52:26 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 21:52:26 GMT Message-Id: <200702042152.l14LqQNs007957@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 Cc: Subject: PERFORCE change 114013 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: Sun, 04 Feb 2007 21:52:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=114013 Change 114013 by sam@sam_ebb on 2007/02/04 21:51:37 nuke some dead variables; probably can remove the 11g rateset too but leave it for now Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#7 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#7 (text) ==== @@ -163,18 +163,6 @@ static void rt2661_enable_tsf_sync(struct rt2661_softc *); static int rt2661_get_rssi(struct rt2661_softc *, uint8_t); -/* - * Supported rates for 802.11a/b/g modes (in 500Kbps unit). - */ -static const struct ieee80211_rateset rt2661_rateset_11a = - { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } }; - -static const struct ieee80211_rateset rt2661_rateset_11b = - { 4, { 2, 4, 11, 22 } }; - -static const struct ieee80211_rateset rt2661_rateset_11g = - { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; - static const struct { uint32_t reg; uint32_t val; @@ -2034,6 +2022,12 @@ RAL_WRITE(sc, RT2661_TXRX_CSR4, tmp); } +/* + * Supported rates for 802.11g. XXX should use ic_sup_rates. + */ +static const struct ieee80211_rateset rt2661_rateset_11g = + { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; + static void rt2661_set_basicrates(struct rt2661_softc *sc, const struct ieee80211_rateset *rs) From owner-p4-projects@FreeBSD.ORG Sun Feb 4 22:59:53 2007 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 3A83416A405; Sun, 4 Feb 2007 22:59:53 +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 EC29716A403 for ; Sun, 4 Feb 2007 22:59:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA5CF13C471 for ; Sun, 4 Feb 2007 22:59:52 +0000 (UTC) (envelope-from sam@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 l14MxqpF031129 for ; Sun, 4 Feb 2007 22:59:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l14MxqbB031126 for perforce@freebsd.org; Sun, 4 Feb 2007 22:59:52 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 22:59:52 GMT Message-Id: <200702042259.l14MxqbB031126@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 Cc: Subject: PERFORCE change 114016 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: Sun, 04 Feb 2007 22:59:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=114016 Change 114016 by sam@sam_ebb on 2007/02/04 22:59:50 checkpoint AX772 support; needs a bit more work Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_axe.c#12 edit .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#7 edit .. //depot/projects/wifi/sys/dev/usb/usbdevs#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_axe.c#12 (text+ko) ==== @@ -111,14 +111,17 @@ * Various supported device vendors/products. */ static struct axe_type axe_devs[] = { - { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172 }, - { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100 }, - { USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1 }, - { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M }, - { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX }, - { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120 }, - { USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL }, - { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029 }, + { AX172, USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172 }, + { AX172, USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100 }, + { AX172, USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1 }, + { AX172, USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M }, + { AX172, USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX }, + { AX172, USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120 }, + { AX172, USB_VENDOR_SYSTEMTALKS,USB_PRODUCT_SYSTEMTALKS_SGCX2UL }, + { AX172, USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029 }, + + { AX772, USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772 }, + { AX772, USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB200MV2 }, { 0, 0 } }; @@ -146,6 +149,8 @@ static void axe_ifmedia_sts(struct ifnet *, struct ifmediareq *); static void axe_setmulti(struct axe_softc *); +static void axe_ax88178_init(struct axe_softc *); +static void axe_ax88772_init(struct axe_softc *); static device_method_t axe_methods[] = { /* Device interface */ @@ -276,13 +281,36 @@ static void axe_miibus_statchg(device_t dev) { -#ifdef notdef struct axe_softc *sc = USBGETSOFTC(dev); struct mii_data *mii = GET_MII(sc); -#endif - /* doesn't seem to be necessary */ + int val, err; + + if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) + val = AXE_MEDIA_FULL_DUPLEX; + else + val = 0; + + if ((sc->axe_flags & AX178) || (sc->axe_flags & AX772)) { + val |= (AXE_178_MEDIA_RX_EN | AXE_178_MEDIA_MAGIC); + + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_1000_T: + val |= AXE_178_MEDIA_GMII | AXE_178_MEDIA_ENCK; + break; + case IFM_100_TX: + val |= AXE_178_MEDIA_100TX; + break; + case IFM_10_T: + /* doesn't need to be handled */ + break; + } + } - return; + err = axe_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL); + if (err) { + printf("axe%d: media change failed\n", sc->axe_unit); + return; + } } /* @@ -317,8 +345,6 @@ mii_pollstat(mii); ifmr->ifm_active = mii->mii_media_active; ifmr->ifm_status = mii->mii_media_status; - - return; } static void @@ -344,12 +370,7 @@ rxmode &= ~AXE_RXCMD_ALLMULTI; IF_ADDR_LOCK(ifp); -#if __FreeBSD_version >= 500000 - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#else - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#endif - { + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; h = ether_crc32_be(LLADDR((struct sockaddr_dl *) @@ -361,8 +382,80 @@ axe_cmd(sc, AXE_CMD_WRITE_MCAST, 0, 0, (void *)&hashtbl); axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL); AXE_UNLOCK(sc); +} + +static void +axe_ax88178_init(struct axe_softc *sc) +{ + int gpio0 = 0, phymode = 0; + u_int16_t eeprom; - return; + axe_cmd(sc, AXE_CMD_SROM_WR_ENABLE, 0, 0, NULL); + /* XXX magic */ + axe_cmd(sc, AXE_CMD_SROM_READ, 0, 0x0017, &eeprom); + axe_cmd(sc, AXE_CMD_SROM_WR_DISABLE, 0, 0, NULL); + + /* if EEPROM is invalid we have to use to GPIO0 */ + if (eeprom == 0xffff) { + phymode = 0; + gpio0 = 1; + } else { + phymode = eeprom & 7; + gpio0 = (eeprom & 0x80) ? 0 : 1; + } + + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x008c, NULL); + usbd_delay_ms(sc->axe_udev, 40); + if ((eeprom >> 8) != 1) { + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x003c, NULL); + usbd_delay_ms(sc->axe_udev, 30); + + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x001c, NULL); + usbd_delay_ms(sc->axe_udev, 300); + + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x003c, NULL); + usbd_delay_ms(sc->axe_udev, 30); + } else { + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x0004, NULL); + usbd_delay_ms(sc->axe_udev, 30); + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x000c, NULL); + usbd_delay_ms(sc->axe_udev, 30); + } + + /* soft reset */ + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, 0, NULL); + usbd_delay_ms(sc->axe_udev, 150); + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_178_RESET_PRL | AXE_178_RESET_MAGIC, NULL); + usbd_delay_ms(sc->axe_udev, 150); + axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); +} + +static void +axe_ax88772_init(struct axe_softc *sc) +{ + axe_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x00b0, NULL); + usbd_delay_ms(sc->axe_udev, 40); + + /* ask for embedded PHY */ + axe_cmd(sc, AXE_CMD_SW_PHY_SELECT, 0, 0x01, NULL); + usbd_delay_ms(sc->axe_udev, 10); + + /* power down and reset state, pin reset state */ + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, 0x00, NULL); + usbd_delay_ms(sc->axe_udev, 60); + + /* power down/reset state, pin operating state */ + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, 0x48, NULL); + usbd_delay_ms(sc->axe_udev, 150); + + /* power up, reset */ + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, 0x08, NULL); + + /* power up, operating */ + axe_cmd(sc, AXE_CMD_SW_RESET_REG, 0, 0x28, NULL); + + axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); } static void @@ -383,27 +476,26 @@ return; } +static int +axe_devflags(int vendor, int product) +{ + struct axe_type *t; + + for (t = axe_devs; t->axe_vid != 0; t++) + if (t->axe_vid == vendor && t->axe_did == product) + return t->axe_flags; + return 0; +} + /* * Probe for a AX88172 chip. */ USB_MATCH(axe) { USB_MATCH_START(axe, uaa); - struct axe_type *t; - if (!uaa->iface) - return(UMATCH_NONE); - - t = axe_devs; - while(t->axe_vid) { - if (uaa->vendor == t->axe_vid && - uaa->product == t->axe_did) { - return(UMATCH_VENDOR_PRODUCT); - } - t++; - } - - return(UMATCH_NONE); + return (!uaa->iface || axe_devflags(uaa->vendor, uaa->product) == 0 ? + UMATCH_NONE : UMATCH_VENDOR_PRODUCT); } /* @@ -424,6 +516,7 @@ sc->axe_udev = uaa->device; sc->axe_dev = self; sc->axe_unit = device_get_unit(self); + sc->axe_flags = axe_devflags(uaa->vendor, uaa->product); if (usbd_set_config_no(sc->axe_udev, AXE_CONFIG_NO, 1)) { printf("axe%d: getting interface handle failed\n", @@ -444,7 +537,9 @@ usbd_devinfo(uaa->device, 0, devinfo); device_set_desc_copy(self, devinfo); - printf("%s: %s\n", device_get_nameunit(self), devinfo); + printf("%s: %s%s\n", device_get_nameunit(self), devinfo, + sc->axe_flags & AX178 ? ", AX88178" : + sc->axe_flags & AX772 ? ", AX88772" : ""); /* Find endpoints. */ for (i = 0; i < id->bNumEndpoints; i++) { @@ -466,18 +561,24 @@ } } -#if __FreeBSD_version >= 500000 mtx_init(&sc->axe_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#endif sx_init(&sc->axe_sleeplock, device_get_nameunit(self)); AXE_SLEEPLOCK(sc); AXE_LOCK(sc); + if (sc->axe_flags & AX178) + axe_ax88178_init(sc); + else if (sc->axe_flags & AX772) + axe_ax88772_init(sc); + /* * Get station address. */ - axe_cmd(sc, AXE_CMD_READ_NODEID, 0, 0, &eaddr); + if (sc->axe_flags & (AX178|AX772)) + axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, &eaddr); + else + axe_cmd(sc, AXE_CMD_READ_NODEID, 0, 0, &eaddr); /* * Load IPG values and PHY indexes. @@ -497,9 +598,7 @@ AXE_UNLOCK(sc); AXE_SLEEPUNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif USB_ATTACH_ERROR_RETURN; } ifp->if_softc = sc; @@ -523,9 +622,7 @@ AXE_UNLOCK(sc); AXE_SLEEPUNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif USB_ATTACH_ERROR_RETURN; } @@ -533,11 +630,7 @@ * Call MI attach routine. */ -#if __FreeBSD_version >= 500000 ether_ifattach(ifp, eaddr); -#else - ether_ifattach(ifp, ETHER_BPF_SUPPORTED); -#endif callout_handle_init(&sc->axe_stat_ch); usb_register_netisr(); @@ -563,12 +656,8 @@ untimeout(axe_tick, sc, sc->axe_stat_ch); usb_rem_task(sc->axe_udev, &sc->axe_tick_task); -#if __FreeBSD_version >= 500000 ether_ifdetach(ifp); if_free(ifp); -#else - ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); -#endif if (sc->axe_ep[AXE_ENDPT_TX] != NULL) usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_TX]); @@ -579,9 +668,7 @@ AXE_UNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif return(0); } @@ -915,12 +1002,24 @@ } /* Set transmitter IPG values */ - axe_cmd(sc, AXE_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL); - axe_cmd(sc, AXE_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL); - axe_cmd(sc, AXE_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL); + if (sc->axe_flags & (AX178|AX772)) { + axe_cmd(sc, AXE_178_CMD_WRITE_IPG012, sc->axe_ipgs[2], + (sc->axe_ipgs[1]<<8) | sc->axe_ipgs[0], NULL); + } else { + axe_cmd(sc, AXE_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL); + axe_cmd(sc, AXE_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL); + axe_cmd(sc, AXE_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL); + } /* Enable receiver, set RX mode */ - rxmode = AXE_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE; + rxmode = AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE; + if (sc->axe_flags & (AX178|AX772)) { +#ifdef notyet + if (sc->axe_udev->speed == USB_SPEED_HIGH) + rxmode |= AXE_178_RXCMD_MFB; +#endif + } else + rxmode |= AXE_RXCMD_UNICAST; /* If we want promiscuous mode, set the allframes bit. */ if (ifp->if_flags & IFF_PROMISC) ==== //depot/projects/wifi/sys/dev/usb/if_axereg.h#7 (text+ko) ==== @@ -82,7 +82,32 @@ #define AXE_CMD_WRITE_MONITOR_MODE 0x011D #define AXE_CMD_READ_GPIO 0x101E #define AXE_CMD_WRITE_GPIO 0x011F +#define AXE_CMD_SW_RESET_REG 0x0120 +#define AXE_CMD_SW_PHY_STATUS 0x0021 +#define AXE_CMD_SW_PHY_SELECT 0x0122 +#define AXE_172_CMD_WRITE_RX_SRAM 0x0103 +#define AXE_172_CMD_WRITE_TX_SRAM 0x0104 +#define AXE_172_CMD_WRITE_IPG0 0x0112 +#define AXE_172_CMD_WRITE_IPG1 0x0113 +#define AXE_172_CMD_WRITE_IPG2 0x0114 +#define AXE_172_CMD_READ_NODEID 0x6017 +#define AXE_172_CMD_WRITE_NODEID 0x6118 +#define AXE_172_CMD_READ_MEDIA 0x101A + +#define AXE_178_CMD_WRITE_IPG012 0x0112 +#define AXE_178_CMD_READ_NODEID 0x6013 +#define AXE_178_CMD_WRITE_NODEID 0x6014 +#define AXE_178_CMD_READ_MEDIA 0x201A + +#define AXE_178_RESET_RR 0x01 +#define AXE_178_RESET_RT 0x02 +#define AXE_178_RESET_PRTE 0x04 +#define AXE_178_RESET_PRL 0x08 +#define AXE_178_RESET_BZ 0x10 +/* AX88178 documentation says to always write this bit... */ +#define AXE_178_RESET_MAGIC 0x40 + #define AXE_RXCMD_PROMISC 0x0001 #define AXE_RXCMD_ALLMULTI 0x0002 #define AXE_RXCMD_UNICAST 0x0004 @@ -90,6 +115,22 @@ #define AXE_RXCMD_MULTICAST 0x0010 #define AXE_RXCMD_ENABLE 0x0080 +#define AXE_178_MEDIA_GMII 0x0001 +#define AXE_MEDIA_FULL_DUPLEX 0x0002 +#define AXE_172_MEDIA_TX_ABORT_ALLOW 0x0004 +/* AX88178 documentation says to always write 1 to reserved bit... */ +#define AXE_178_MEDIA_MAGIC 0x0004 +#define AXE_178_MEDIA_ENCK 0x0008 +#define AXE_172_MEDIA_FLOW_CONTROL_EN 0x0010 +#define AXE_178_MEDIA_RXFLOW_CONTROL_EN 0x0010 +#define AXE_178_MEDIA_TXFLOW_CONTROL_EN 0x0020 +#define AXE_178_MEDIA_JUMBO_EN 0x0040 +#define AXE_178_MEDIA_LTPF_ONLY 0x0080 +#define AXE_178_MEDIA_RX_EN 0x0100 +#define AXE_178_MEDIA_100TX 0x0200 +#define AXE_178_MEDIA_SBP 0x0800 +#define AXE_178_MEDIA_SUPERMAC 0x1000 + #define AXE_NOPHY 0xE0 #define AXE_TIMEOUT 1000 @@ -113,6 +154,10 @@ #define AXE_ENDPT_MAX 0x3 struct axe_type { + int axe_flags; +#define AX172 0x0001 /* AX88172 */ +#define AX178 0x0002 /* AX88178 */ +#define AX772 0x0004 /* AX88772 */ u_int16_t axe_vid; u_int16_t axe_did; }; @@ -120,13 +165,6 @@ #define AXE_INC(x, y) (x) = (x + 1) % y struct axe_softc { -#if defined(__FreeBSD__) -#define GET_MII(sc) (device_get_softc((sc)->axe_miibus)) -#elif defined(__NetBSD__) -#define GET_MII(sc) (&(sc)->axe_mii) -#elif defined(__OpenBSD__) -#define GET_MII(sc) (&(sc)->axe_mii) -#endif struct ifnet *axe_ifp; device_t axe_miibus; device_t axe_dev; @@ -136,11 +174,10 @@ usbd_pipe_handle axe_ep[AXE_ENDPT_MAX]; int axe_unit; int axe_if_flags; + int axe_flags; struct ue_cdata axe_cdata; struct callout_handle axe_stat_ch; -#if __FreeBSD_version >= 500000 struct mtx axe_mtx; -#endif struct sx axe_sleeplock; char axe_dying; int axe_link; @@ -151,6 +188,8 @@ struct usb_task axe_tick_task; }; +#define GET_MII(sc) device_get_softc((sc)->axe_miibus) + #if 0 #define AXE_LOCK(_sc) mtx_lock(&(_sc)->axe_mtx) #define AXE_UNLOCK(_sc) mtx_unlock(&(_sc)->axe_mtx) ==== //depot/projects/wifi/sys/dev/usb/usbdevs#20 (text+ko) ==== @@ -696,6 +696,7 @@ /* ASIX Electronics products */ product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88772 0x7720 AX88772 /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -1226,6 +1227,7 @@ product LINKSYS4 WUSB54G 0x000d WUSB54G wireless adapter product LINKSYS4 WUSB54GP 0x0011 WUSB54GP wireless adapter product LINKSYS4 HU200TS 0x001a HU200TS wireless adapter +product LINKSYS4 USB200MV2 0x0018 USB 2.0 10/100 ethernet /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard From owner-p4-projects@FreeBSD.ORG Mon Feb 5 00:20:37 2007 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 2B82216A405; Mon, 5 Feb 2007 00:20:37 +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 6A9DD16A4A7 for ; Mon, 5 Feb 2007 00:20:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D7EC13C461 for ; Mon, 5 Feb 2007 00:20:35 +0000 (UTC) (envelope-from sam@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 l150KZrO047008 for ; Mon, 5 Feb 2007 00:20:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l150KYKX047005 for perforce@freebsd.org; Mon, 5 Feb 2007 00:20:34 GMT (envelope-from sam@freebsd.org) Date: Mon, 5 Feb 2007 00:20:34 GMT Message-Id: <200702050020.l150KYKX047005@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 Cc: Subject: PERFORCE change 114022 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: Mon, 05 Feb 2007 00:20:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114022 Change 114022 by sam@sam_ebb on 2007/02/05 00:19:59 rx works; tx still not right Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_axe.c#13 edit .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#8 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_axe.c#13 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include +#include #include #include #include @@ -290,7 +291,7 @@ else val = 0; - if ((sc->axe_flags & AX178) || (sc->axe_flags & AX772)) { + if (sc->axe_flags & (AX178|AX772)) { val |= (AXE_178_MEDIA_RX_EN | AXE_178_MEDIA_MAGIC); switch (IFM_SUBTYPE(mii->mii_media_active)) { @@ -306,6 +307,7 @@ } } +printf("axe%d: write media 0x%x\n", sc->axe_unit, val);/*XXX*/ err = axe_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL); if (err) { printf("axe%d: media change failed\n", sc->axe_unit); @@ -713,7 +715,8 @@ struct ue_chain *c; struct mbuf *m; struct ifnet *ifp; - int total_len = 0; + int total_len, pktlen; + struct axe_sframe_hdr hdr; c = priv; sc = c->ue_sc; @@ -741,15 +744,39 @@ usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL); m = c->ue_mbuf; + /* XXX don't handle multiple packets in one transfer */ + if (sc->axe_flags & (AX178|AX772)) { + if (total_len < sizeof(hdr)) { +printf("axe%d: total_len %d\n", sc->axe_unit, total_len);/*XXX*/ + ifp->if_ierrors++; + goto done; + } + m_copydata(m, 0, sizeof(hdr), (caddr_t) &hdr); + total_len -= sizeof(hdr); - if (total_len < sizeof(struct ether_header)) { - ifp->if_ierrors++; - goto done; + if ((hdr.len ^ hdr.ilen) != 0xffff) { +printf("axe%d: len %d ilen %d\n", sc->axe_unit, hdr.len, hdr.ilen);/*XXX*/ + ifp->if_ierrors++; + goto done; + } + pktlen = le16toh(hdr.len); + if (pktlen > total_len) { +printf("axe%d: pktlen %d total_len %d\n", sc->axe_unit, pktlen, total_len);/*XXX*/ + ifp->if_ierrors++; + goto done; + } + m_adj(m, sizeof(hdr)); + } else { + if (total_len < sizeof(struct ether_header)) { + ifp->if_ierrors++; + goto done; + } + pktlen = total_len; } ifp->if_ipackets++; m->m_pkthdr.rcvif = (void *)&sc->axe_qdat; - m->m_pkthdr.len = m->m_len = total_len; + m->m_pkthdr.len = m->m_len = pktlen; /* Put the packet on the special USB input queue. */ usb_ether_input(m); @@ -875,20 +902,38 @@ axe_encap(struct axe_softc *sc, struct mbuf *m, int idx) { struct ue_chain *c; - usbd_status err; + struct axe_sframe_hdr hdr; + usbd_status err; + int length, boundary; c = &sc->axe_cdata.ue_tx_chain[idx]; - /* - * Copy the mbuf data into a contiguous buffer, leaving two - * bytes at the beginning to hold the frame length. - */ - m_copydata(m, 0, m->m_pkthdr.len, c->ue_buf); + if (sc->axe_flags & (AX178|AX772)) { + hdr.len = htole16(m->m_pkthdr.len); + hdr.ilen = -hdr.len; +printf("axe%d: %s len %d\n", sc->axe_unit, __func__, m->m_pkthdr.len); + memcpy(c->ue_buf, &hdr, sizeof(hdr)); + + m_copydata(m, 0, m->m_pkthdr.len, c->ue_buf + sizeof(hdr)); + length = sizeof(hdr) + m->m_pkthdr.len; + + boundary = 64; + if ((length % boundary) == 0) { + hdr.len = 0; + hdr.ilen = 0xffff; +printf("axe%d: %s add null segment\n", sc->axe_unit, __func__); + memcpy(c->ue_buf + length, &hdr, sizeof(hdr)); + length += sizeof(hdr); + } + } else { + m_copydata(m, 0, m->m_pkthdr.len, c->ue_buf); + length = m->m_pkthdr.len; + } c->ue_mbuf = m; +printf("axe%d: %s length %d\n", sc->axe_unit, __func__, length); usbd_setup_xfer(c->ue_xfer, sc->axe_ep[AXE_ENDPT_TX], - c, c->ue_buf, m->m_pkthdr.len, USBD_FORCE_SHORT_XFER, - 10000, axe_txeof); + c, c->ue_buf, length, USBD_FORCE_SHORT_XFER, 10000, axe_txeof); /* Transmit */ err = usbd_transfer(c->ue_xfer); @@ -915,6 +960,7 @@ AXE_LOCK(sc); if (!sc->axe_link) { +if_printf(ifp, "%s: no link\n", __func__);/*XXX*/ AXE_UNLOCK(sc); return; } @@ -950,8 +996,6 @@ */ ifp->if_timer = 5; AXE_UNLOCK(sc); - - return; } static void @@ -1070,8 +1114,6 @@ AXE_SLEEPUNLOCK(sc); sc->axe_stat_ch = timeout(axe_tick, sc, hz); - - return; } static int @@ -1158,7 +1200,7 @@ AXE_LOCK(sc); ifp->if_oerrors++; - printf("axe%d: watchdog timeout\n", sc->axe_unit); + if_printf(ifp, "watchdog timeout\n"); c = &sc->axe_cdata.ue_tx_chain[0]; usbd_get_xfer_status(c->ue_xfer, NULL, NULL, NULL, &stat); @@ -1168,8 +1210,6 @@ if (ifp->if_snd.ifq_head != NULL) axe_start(ifp); - - return; } /* @@ -1243,8 +1283,6 @@ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); sc->axe_link = 0; AXE_UNLOCK(sc); - - return; } /* @@ -1261,6 +1299,4 @@ AXE_SLEEPLOCK(sc); axe_stop(sc); AXE_SLEEPUNLOCK(sc); - - return; } ==== //depot/projects/wifi/sys/dev/usb/if_axereg.h#8 (text+ko) ==== @@ -153,6 +153,11 @@ #define AXE_ENDPT_INTR 0x2 #define AXE_ENDPT_MAX 0x3 +struct axe_sframe_hdr { + uint16_t len; + uint16_t ilen; +} __packed; + struct axe_type { int axe_flags; #define AX172 0x0001 /* AX88172 */ From owner-p4-projects@FreeBSD.ORG Mon Feb 5 05:26:12 2007 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 DB89716A405; Mon, 5 Feb 2007 05:26:11 +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 35F3516A400 for ; Mon, 5 Feb 2007 05:26:11 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2476713C494 for ; Mon, 5 Feb 2007 05:26:11 +0000 (UTC) (envelope-from mjacob@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 l155QBL8025789 for ; Mon, 5 Feb 2007 05:26:11 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l155Q7QM025786 for perforce@freebsd.org; Mon, 5 Feb 2007 05:26:07 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 5 Feb 2007 05:26:07 GMT Message-Id: <200702050526.l155Q7QM025786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114034 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: Mon, 05 Feb 2007 05:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114034 Change 114034 by mjacob@mjexp on 2007/02/05 05:25:18 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#7 integrate .. //depot/projects/mjexp/contrib/bind9/CHANGES#4 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ#3 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/mjexp/contrib/bind9/README#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/version#4 integrate .. //depot/projects/mjexp/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/mjexp/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/Makefile#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/gzip.h#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/inflate.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/match.S#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/unlzh.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/unpack.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/unzip.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/mjexp/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/mjexp/include/Makefile#5 integrate .. //depot/projects/mjexp/include/objformat.h#2 delete .. //depot/projects/mjexp/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/mjexp/include/tgmath.h#2 integrate .. //depot/projects/mjexp/lib/bind/bind/config.h#3 integrate .. //depot/projects/mjexp/lib/bind/config.h#3 integrate .. //depot/projects/mjexp/lib/bind/dns/code.h#3 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_all.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/mjexp/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/libc/gen/getobjformat.3#3 delete .. //depot/projects/mjexp/lib/libc/gen/getobjformat.c#2 delete .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/mjexp/lib/libc/sys/quotactl.2#3 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/mjexp/release/Makefile#5 integrate .. //depot/projects/mjexp/rescue/rescue/Makefile#3 integrate .. //depot/projects/mjexp/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/mjexp/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/mjexp/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/mjexp/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_inet6.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/mjexp/sbin/init/init.c#2 integrate .. //depot/projects/mjexp/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/mjexp/sbin/mount/Makefile#2 integrate .. //depot/projects/mjexp/sbin/mount/mount.c#4 integrate .. //depot/projects/mjexp/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/mjexp/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/mjexp/sbin/mount_nfs4/Makefile#2 delete .. //depot/projects/mjexp/sbin/mount_nfs4/mount_nfs4.8#2 delete .. //depot/projects/mjexp/sbin/mount_nfs4/mount_nfs4.c#2 delete .. //depot/projects/mjexp/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/mjexp/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/mjexp/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#4 integrate .. //depot/projects/mjexp/share/man/man4/an.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ath.4#3 integrate .. //depot/projects/mjexp/share/man/man4/aue.4#3 integrate .. //depot/projects/mjexp/share/man/man4/awi.4#2 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#4 integrate .. //depot/projects/mjexp/share/man/man4/bfe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/bge.4#2 integrate .. //depot/projects/mjexp/share/man/man4/dc.4#2 integrate .. //depot/projects/mjexp/share/man/man4/de.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ed.4#2 integrate .. //depot/projects/mjexp/share/man/man4/em.4#2 integrate .. //depot/projects/mjexp/share/man/man4/fxp.4#3 integrate .. //depot/projects/mjexp/share/man/man4/hme.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ipw.4#2 integrate .. //depot/projects/mjexp/share/man/man4/iwi.4#2 integrate .. //depot/projects/mjexp/share/man/man4/le.4#4 integrate .. //depot/projects/mjexp/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/mjexp/share/man/man4/msk.4#2 integrate .. //depot/projects/mjexp/share/man/man4/mxge.4#2 integrate .. //depot/projects/mjexp/share/man/man4/my.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ng_deflate.4#2 integrate .. //depot/projects/mjexp/share/man/man4/nve.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ral.4#2 integrate .. //depot/projects/mjexp/share/man/man4/re.4#3 integrate .. //depot/projects/mjexp/share/man/man4/rl.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sf.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sis.4#5 integrate .. //depot/projects/mjexp/share/man/man4/sk.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ste.4#2 integrate .. //depot/projects/mjexp/share/man/man4/stge.4#2 integrate .. //depot/projects/mjexp/share/man/man4/tap.4#2 integrate .. //depot/projects/mjexp/share/man/man4/tun.4#3 integrate .. //depot/projects/mjexp/share/man/man4/udav.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ural.4#3 integrate .. //depot/projects/mjexp/share/man/man4/vr.4#2 integrate .. //depot/projects/mjexp/share/man/man4/wi.4#2 integrate .. //depot/projects/mjexp/share/man/man4/xl.4#2 integrate .. //depot/projects/mjexp/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/mjexp/share/man/man5/quota.user.5#2 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/mjexp/share/man/man5/src.conf.5#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#6 integrate .. //depot/projects/mjexp/share/man/man9/disk.9#3 integrate .. //depot/projects/mjexp/share/man/man9/hashinit.9#3 integrate .. //depot/projects/mjexp/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/mjexp/share/man/man9/sf_buf.9#1 branch .. //depot/projects/mjexp/share/man/man9/style.9#3 integrate .. //depot/projects/mjexp/share/man/man9/vm_map.9#2 integrate .. //depot/projects/mjexp/share/misc/bsd-family-tree#4 integrate .. //depot/projects/mjexp/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#3 integrate .. //depot/projects/mjexp/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/mjexp/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/mjexp/sys/boot/common/loader.8#4 integrate .. //depot/projects/mjexp/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/mjexp/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#8 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#10 integrate .. //depot/projects/mjexp/sys/conf/files#10 integrate .. //depot/projects/mjexp/sys/conf/kmod.mk#4 integrate .. //depot/projects/mjexp/sys/conf/options#9 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/mjexp/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#6 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/driver.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/mjexp/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_io.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#5 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_conf.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#9 integrate .. //depot/projects/mjexp/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#4 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/mjexp/sys/modules/Makefile#5 integrate .. //depot/projects/mjexp/sys/modules/ath/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/mjexp/sys/net/bpf.c#4 integrate .. //depot/projects/mjexp/sys/net/bpf_compat.h#2 delete .. //depot/projects/mjexp/sys/net/bpfdesc.h#2 integrate .. //depot/projects/mjexp/sys/net/if_tap.c#3 integrate .. //depot/projects/mjexp/sys/net/if_tun.c#4 integrate .. //depot/projects/mjexp/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/mjexp/sys/netinet/if_ether.c#5 integrate .. //depot/projects/mjexp/sys/netinet/in.c#3 integrate .. //depot/projects/mjexp/sys/netinet/in.h#3 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/mjexp/sys/netinet/ip_input.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp.h#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/nd6.c#6 integrate .. //depot/projects/mjexp/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/mjexp/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/mjexp/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/mjexp/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte.c#4 integrate .. //depot/projects/mjexp/sys/sys/ata.h#2 integrate .. //depot/projects/mjexp/sys/sys/conf.h#3 integrate .. //depot/projects/mjexp/sys/sys/lock.h#3 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#7 integrate .. //depot/projects/mjexp/sys/sys/socketvar.h#2 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/vm/uma.h#3 integrate .. //depot/projects/mjexp/sys/vm/uma_core.c#5 integrate .. //depot/projects/mjexp/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/mjexp/tools/build/options/WITHOUT_BZIP2#1 branch .. //depot/projects/mjexp/tools/build/options/WITHOUT_BZIP2_SUPPORT#1 branch .. //depot/projects/mjexp/tools/regression/fstest/README#1 branch .. //depot/projects/mjexp/tools/regression/fstest/tests/chmod/00.t#2 integrate .. //depot/projects/mjexp/tools/regression/fstest/tests/mkdir/00.t#2 integrate .. //depot/projects/mjexp/tools/regression/fstest/tests/mkfifo/00.t#2 integrate .. //depot/projects/mjexp/tools/regression/fstest/tests/open/00.t#2 integrate .. //depot/projects/mjexp/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/mjexp/tools/sched/schedgraph.py#4 integrate .. //depot/projects/mjexp/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/Makefile#3 integrate .. //depot/projects/mjexp/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 integrate .. //depot/projects/mjexp/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.music#3 integrate .. //depot/projects/mjexp/usr.bin/gzip/Makefile#1 branch .. //depot/projects/mjexp/usr.bin/gzip/gzexe#1 branch .. //depot/projects/mjexp/usr.bin/gzip/gzexe.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/gzip.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/gzip.c#1 branch .. //depot/projects/mjexp/usr.bin/gzip/unbzip2.c#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zdiff#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zdiff.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zforce#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zforce.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zgrep#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zgrep.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zmore#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zmore.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/znew#1 branch .. //depot/projects/mjexp/usr.bin/gzip/znew.1#1 branch .. //depot/projects/mjexp/usr.bin/gzip/zuncompress.c#1 branch .. //depot/projects/mjexp/usr.bin/objformat/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/objformat/objformat.1#2 delete .. //depot/projects/mjexp/usr.bin/objformat/objformat.c#2 delete .. //depot/projects/mjexp/usr.bin/objformat/objformat.sh#1 branch .. //depot/projects/mjexp/usr.bin/quota/quota.c#3 integrate .. //depot/projects/mjexp/usr.sbin/Makefile#4 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#5 integrate .. //depot/projects/mjexp/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/mjexp/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/mjexp/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/mjexp/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/mjexp/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/sign/main.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/sign/stand.c#2 integrate .. //depot/projects/mjexp/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/mjexp/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/mjexp/usr.sbin/vnconfig/Makefile#2 delete .. //depot/projects/mjexp/usr.sbin/vnconfig/vnconfig.c#2 delete Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.68 2007/01/02 03:42:16 kientzle Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.71 2007/02/01 08:45:26 rafan Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,16 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070201: remove libmytinfo link +OLD_FILES+=usr/lib/libmytinfo.a +OLD_FILES+=usr/lib/libmytinfo.so +# 20070128: remove vnconfig +OLD_FILES+=usr/sbin/vnconfig +# 20070125: objformat bites the dust +OLD_FILES+=usr/bin/objformat +OLD_FILES+=usr/share/man/man1/objformat.1.gz +OLD_FILES+=usr/include/objformat.h +OLD_FILES+=usr/share/man/man3/getobjformat.3.gz # 20061201: remove symlink to *.so.4 libalias modules OLD_FILES+=usr/lib/libalias_cuseeme.so OLD_FILES+=usr/lib/libalias_dummy.so ==== //depot/projects/mjexp/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.4 released --- + +2126. [security] Serialise validation of type ANY responses. [RT #16555] + +2124. [security] It was possible to dereference a freed fetch + context. [RT #16584] + --- 9.3.3 released --- 2107. [bug] dighost.c: more cleanup of buffers. [RT #16499] ==== //depot/projects/mjexp/contrib/bind9/FAQ#3 (text+ko) ==== @@ -1,5 +1,9 @@ Frequently Asked Questions about BIND 9 +Copyright © 2004-2007 Internet Systems Consortium, Inc. ("ISC") + +Copyright © 2000-2003 Internet Software Consortium. + ------------------------------------------------------------------------------- Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? @@ -630,3 +634,42 @@ See these man-pages for more information : selinux(8), named_selinux(8), chcon (1), setsebool(8) +Q: I want to forward all DNS queries from my caching nameserver to another server. + But there are some domains which have to be served locally, via rbldnsd. + + How do I achieve this ? + +A: options { + forward only; + forwarders { ; }; + }; + + zone "sbl-xbl.spamhaus.org" { + type forward; forward only; + forwarders { port 530; }; + }; + + zone "list.dsbl.org" { + type forward; forward only; + forwarders { port 530; }; + }; + + +Q: Will named be affected by the 2007 changes to daylight savings rules in the US. + +A: No, so long as the machines internal clock (as reported by "date -u") remains + at UTC. The only visible change if you fail to upgrade your OS, if you are in a + affected area, will be that log messages will be a hour out during the period + where the old rules do not match the new rules. + + For most OS's this change just means that you need to update the conversion + rules from UTC to local time. Normally this involves updating a file in /etc + (which sets the default timezone for the machine) and possibly a directory + which has all the conversion rules for the world (e.g. /usr/share/zoneinfo). + When updating the OS do not forget to update any chroot areas as well. See your + OS's documetation for more details. + + The local timezone conversion rules can also be done on a individual basis by + setting the TZ envirionment variable appropriately. See your OS's documentation + for more details. + ==== //depot/projects/mjexp/contrib/bind9/FAQ.xml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - +
Frequently Asked Questions about BIND 9 + + + 2004 + 2005 + 2006 + 2007 + Internet Systems Consortium, Inc. ("ISC") + + + 2000 + 2001 + 2002 + 2003 + Internet Software Consortium. + + @@ -1193,5 +1209,68 @@ + + + + I want to forward all DNS queries from my caching nameserver to + another server. But there are some domains which have to be + served locally, via rbldnsd. + + + How do I achieve this ? + + + + +options { + forward only; + forwarders { <ip.of.primary.nameserver>; }; +}; + +zone "sbl-xbl.spamhaus.org" { + type forward; forward only; + forwarders { <ip.of.rbldns.server> port 530; }; +}; + +zone "list.dsbl.org" { + type forward; forward only; + forwarders { <ip.of.rbldns.server> port 530; }; +}; + + + + + + + Will named be affected by the 2007 changes to daylight savings + rules in the US. + + + + + No, so long as the machines internal clock (as reported + by "date -u") remains at UTC. The only visible change + if you fail to upgrade your OS, if you are in a affected + area, will be that log messages will be a hour out during + the period where the old rules do not match the new rules. + + + For most OS's this change just means that you need to + update the conversion rules from UTC to local time. + Normally this involves updating a file in /etc (which + sets the default timezone for the machine) and possibly + a directory which has all the conversion rules for the + world (e.g. /usr/share/zoneinfo). When updating the OS + do not forget to update any chroot areas as well. + See your OS's documetation for more details. + + + The local timezone conversion rules can also be done on + a individual basis by setting the TZ envirionment variable + appropriately. See your OS's documentation for more + details. + + +
==== //depot/projects/mjexp/contrib/bind9/README#3 (text+ko) ==== @@ -42,6 +42,14 @@ Stichting NLnet - NLnet Foundation Nominum, Inc. +BIND 9.3.4 + + BIND 9.3.4 is a security release. + +BIND 9.3.3 + + BIND 9.3.3 is a maintenance release, containing fixes for + a number of bugs in 9.3.2. BIND 9.3.2 ==== //depot/projects/mjexp/contrib/bind9/lib/dns/api#3 (text+ko) ==== @@ -1,3 +1,3 @@ -LIBINTERFACE = 22 -LIBREVISION = 7 -LIBAGE = 0 +LIBINTERFACE = 23 +LIBREVISION = 0 +LIBAGE = 1 ==== //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#3 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.h,v 1.18.12.11 2006/01/06 00:01:42 marka Exp $ */ +/* $Id: validator.h,v 1.18.12.11.6.1 2007/01/11 04:51:39 marka Exp $ */ #ifndef DNS_VALIDATOR_H #define DNS_VALIDATOR_H 1 @@ -144,6 +144,7 @@ * dns_validator_create() options. */ #define DNS_VALIDATOR_DLV 1U +#define DNS_VALIDATOR_DEFER 2U ISC_LANG_BEGINDECLS @@ -192,6 +193,15 @@ */ void +dns_validator_send(dns_validator_t *validator); +/*%< + * Send a deferred validation request + * + * Requires: + * 'validator' to points to a valid DNSSEC validator. + */ + +void dns_validator_cancel(dns_validator_t *validator); /*%< * Cancel a DNSSEC validation in progress. ==== //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.64 2006/08/31 03:57:11 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.64.4.2 2007/01/11 05:05:10 marka Exp $ */ #include @@ -218,6 +218,11 @@ dns_name_t nsname; dns_fetch_t * nsfetch; dns_rdataset_t nsrrset; + + /*% + * Number of queries that reference this context. + */ + unsigned int nqueries; }; #define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!') @@ -351,6 +356,7 @@ dns_rdataset_t *ardataset, isc_result_t *eresultp); static void validated(isc_task_t *task, isc_event_t *event); +static void maybe_destroy(fetchctx_t *fctx); static isc_result_t valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name, @@ -369,6 +375,9 @@ valarg->fctx = fctx; valarg->addrinfo = addrinfo; + if (!ISC_LIST_EMPTY(fctx->validators)) + INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0); + result = dns_validator_create(fctx->res->view, name, type, rdataset, sigrdataset, fctx->rmessage, valoptions, task, validated, valarg, @@ -515,6 +524,9 @@ INSIST(query->tcpsocket == NULL); + query->fctx->nqueries--; + if (SHUTTINGDOWN(query->fctx)) + maybe_destroy(query->fctx); /* Locks bucket. */ query->magic = 0; isc_mem_put(query->mctx, query, sizeof(*query)); *queryp = NULL; @@ -973,6 +985,8 @@ if (result != ISC_R_SUCCESS) return (result); + INSIST(ISC_LIST_EMPTY(fctx->validators)); + dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE); query = isc_mem_get(res->mctx, sizeof(*query)); @@ -1088,6 +1102,7 @@ } ISC_LIST_APPEND(fctx->queries, query, link); + query->fctx->nqueries++; return (ISC_R_SUCCESS); @@ -1540,7 +1555,7 @@ want_done = ISC_TRUE; } } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 && - ISC_LIST_EMPTY(fctx->validators)) { + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) { bucketnum = fctx->bucketnum; LOCK(&res->buckets[bucketnum].lock); /* @@ -2394,8 +2409,8 @@ REQUIRE(ISC_LIST_EMPTY(fctx->finds)); REQUIRE(ISC_LIST_EMPTY(fctx->altfinds)); REQUIRE(fctx->pending == 0); + REQUIRE(fctx->references == 0); REQUIRE(ISC_LIST_EMPTY(fctx->validators)); - REQUIRE(fctx->references == 0); FCTXTRACE("destroy"); @@ -2569,7 +2584,7 @@ } if (fctx->references == 0 && fctx->pending == 0 && - ISC_LIST_EMPTY(fctx->validators)) + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) bucket_empty = fctx_destroy(fctx); UNLOCK(&res->buckets[bucketnum].lock); @@ -2610,6 +2625,7 @@ * pending ADB finds and no pending validations. */ INSIST(fctx->pending == 0); + INSIST(fctx->nqueries == 0); INSIST(ISC_LIST_EMPTY(fctx->validators)); if (fctx->references == 0) { /* @@ -2771,6 +2787,7 @@ fctx->restarts = 0; fctx->timeouts = 0; fctx->attributes = 0; + fctx->nqueries = 0; dns_name_init(&fctx->nsname, NULL); fctx->nsfetch = NULL; @@ -3093,12 +3110,21 @@ unsigned int bucketnum; isc_boolean_t bucket_empty = ISC_FALSE; dns_resolver_t *res = fctx->res; + dns_validator_t *validator; REQUIRE(SHUTTINGDOWN(fctx)); - if (fctx->pending != 0 || !ISC_LIST_EMPTY(fctx->validators)) + if (fctx->pending != 0 || fctx->nqueries != 0) return; + for (validator = ISC_LIST_HEAD(fctx->validators); + validator != NULL; + validator = ISC_LIST_HEAD(fctx->validators)) { + ISC_LIST_UNLINK(fctx->validators, validator, link); + dns_validator_cancel(validator); + dns_validator_destroy(&validator); + } + bucketnum = fctx->bucketnum; LOCK(&res->buckets[bucketnum].lock); if (fctx->references == 0) @@ -3232,7 +3258,9 @@ add_bad(fctx, &addrinfo->sockaddr, result); isc_event_free(&event); UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock); - if (sentresponse) + if (!ISC_LIST_EMPTY(fctx->validators)) + dns_validator_send(ISC_LIST_HEAD(fctx->validators)); + else if (sentresponse) fctx_done(fctx, result); /* Locks bucket. */ else fctx_try(fctx); /* Locks bucket. */ @@ -3330,6 +3358,7 @@ * be validated. */ UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock); + dns_validator_send(ISC_LIST_HEAD(fctx->validators)); goto cleanup_event; } @@ -3640,6 +3669,13 @@ rdataset, sigrdataset, valoptions, task); + /* + * Defer any further validations. + * This prevents multiple validators + * from manipulating fctx->rmessage + * simultaniously. + */ + valoptions |= DNS_VALIDATOR_DEFER; } } else if (CHAINING(rdataset)) { if (rdataset->type == dns_rdatatype_cname) @@ -6371,7 +6407,8 @@ /* * No one cares about the result of this fetch anymore. */ - if (fctx->pending == 0 && ISC_LIST_EMPTY(fctx->validators) && + if (fctx->pending == 0 && fctx->nqueries == 0 && + ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) { /* * This fctx is already shutdown; we were just ==== //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */ +/* $Id: validator.c,v 1.91.2.5.8.27.6.1 2007/01/11 04:51:39 marka Exp $ */ #include @@ -2825,7 +2825,8 @@ ISC_LINK_INIT(val, link); val->magic = VALIDATOR_MAGIC; - isc_task_send(task, ISC_EVENT_PTR(&event)); + if ((options & DNS_VALIDATOR_DEFER) == 0) + isc_task_send(task, ISC_EVENT_PTR(&event)); *validatorp = val; @@ -2843,6 +2844,21 @@ } void +dns_validator_send(dns_validator_t *validator) { + isc_event_t *event; + REQUIRE(VALID_VALIDATOR(validator)); + + LOCK(&validator->lock); + + INSIST((validator->options & DNS_VALIDATOR_DEFER) != 0); + event = (isc_event_t *)validator->event; + validator->options &= ~DNS_VALIDATOR_DEFER; + UNLOCK(&validator->lock); + + isc_task_send(validator->task, ISC_EVENT_PTR(&event)); +} + +void dns_validator_cancel(dns_validator_t *validator) { REQUIRE(VALID_VALIDATOR(validator)); @@ -2856,6 +2872,12 @@ if (validator->subvalidator != NULL) dns_validator_cancel(validator->subvalidator); + if ((validator->options & DNS_VALIDATOR_DEFER) != 0) { + isc_task_t *task = validator->event->ev_sender; + validator->options &= ~DNS_VALIDATOR_DEFER; + isc_event_free((isc_event_t **)&validator->event); + isc_task_detach(&task); + } } UNLOCK(&validator->lock); } ==== //depot/projects/mjexp/contrib/bind9/version#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $Id: version,v 1.26.2.17.2.26 2006/11/28 00:52:38 marka Exp $ +# $Id: version,v 1.26.2.17.2.26.4.1 2007/01/11 05:06:25 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. # MAJORVER=9 MINORVER=3 -PATCHVER=3 +PATCHVER=4 RELEASETYPE= RELEASEVER= ==== //depot/projects/mjexp/etc/etc.powerpc/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.3 2005/09/10 22:46:03 grehan Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.4 2007/01/26 06:22:34 marcel Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -32,12 +32,6 @@ # when going to single-user mode. console none unknown off secure # -# ofw_console(4) -#screen "/usr/libexec/getty Pc" cons25 on secure -# zs(4) -#ttyy0 "/usr/libexec/getty std.9600" cons25 on secure -#ttyy1 "/usr/libexec/getty std.9600" cons25 off secure -# ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ttyv1 "/usr/libexec/getty Pc" cons25 on secure @@ -50,10 +44,10 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" vt100 on secure +ttyu1 "/usr/libexec/getty std.9600" dialup off secure +ttyu2 "/usr/libexec/getty std.9600" dialup off secure +ttyu3 "/usr/libexec/getty std.9600" dialup off secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals ==== //depot/projects/mjexp/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.91 2006/10/03 00:03:30 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.92 2007/01/26 10:19:07 delphij Exp $ .include @@ -15,7 +15,6 @@ ${_gperf} \ grep \ ${_groff} \ - gzip \ ${_man} \ patch \ ${_rcs} \ ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.5 2006/10/16 20:07:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.6 2007/01/25 06:39:25 rodrigc Exp $"); #include #include @@ -104,12 +104,17 @@ stoppcbs = lookup("_stoppcbs"); while (paddr != 0) { - if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) + if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) { warnx("kvm_read: %s", kvm_geterr(kvm)); + break; + } addr = (uintptr_t)TAILQ_FIRST(&p.p_threads); while (addr != 0) { - if (kvm_read(kvm, addr, &td, sizeof(td)) != sizeof(td)) + if (kvm_read(kvm, addr, &td, sizeof(td)) != + sizeof(td)) { warnx("kvm_read: %s", kvm_geterr(kvm)); + break; + } kt = malloc(sizeof(*kt)); kt->next = first; kt->kaddr = addr; ==== //depot/projects/mjexp/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.266 2006/11/11 16:26:54 trhodes Exp $ +# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ # # Doing a "make install" builds /usr/include. @@ -15,7 +15,7 @@ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h \ - netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ + netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h \ printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \ ==== //depot/projects/mjexp/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 schweikh Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -6,23 +6,23 @@ * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 5 10:25:42 2007 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 2195A16A40A; Mon, 5 Feb 2007 10:25:32 +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 849DA16A403 for ; Mon, 5 Feb 2007 10:25:27 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 759D013C441 for ; Mon, 5 Feb 2007 10:25:27 +0000 (UTC) (envelope-from bushman@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 l15APRH2096352 for ; Mon, 5 Feb 2007 10:25:27 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15APRsA096349 for perforce@freebsd.org; Mon, 5 Feb 2007 10:25:27 GMT (envelope-from bushman@freebsd.org) Date: Mon, 5 Feb 2007 10:25:27 GMT Message-Id: <200702051025.l15APRsA096349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114038 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: Mon, 05 Feb 2007 10:25:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=114038 Change 114038 by bushman@bushman_nss_ldap_cached on 2007/02/05 10:24:49 nss_ldap now works correctly, when the processor forks() Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#16 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#16 (text+ko) ==== @@ -100,7 +100,11 @@ { struct nss_ldap_connection_error conn_err; int dummy_fd, backup_fd, rv; - + + /* + * If we can't get the socket from ldap connection, then don't + * close it gracefully and just ignore it. + */ if (conn->sock_fd == -1) return (NSS_LDAP_CONNECTION_ERROR); @@ -114,7 +118,7 @@ if (dummy_fd != conn->sock_fd) { backup_fd = dup(conn->sock_fd); dup2(dummy_fd, conn->sock_fd); - close (conn->sock_fd); + close(conn->sock_fd); } memset(&conn_err, 0, sizeof(struct nss_ldap_connection_error)); rv = __nss_ldap_disconnect(&__nss_ldap_conf->connection_method, conn, @@ -138,13 +142,9 @@ struct nss_ldap_connection_error conn_err_; int rv; - if (check_connection_socket(conn) != 0) { + if (check_connection_socket(conn) != 0 || conn->last_pid != getpid()) { rv = close_lost_connection(conn); return (NSS_LDAP_CONNECTION_ERROR); - } else if (conn->last_pid != getpid()) { - (void)__nss_ldap_disconnect(&__nss_ldap_conf->connection_method, - conn, __nss_ldap_conf, &conn_err_); - return (NSS_LDAP_CONNECTION_ERROR); } else return (NSS_LDAP_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Mon Feb 5 12:13:53 2007 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 9EF4B16A412; Mon, 5 Feb 2007 12:13:52 +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 4EE5316A401 for ; Mon, 5 Feb 2007 12:13:50 +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 1F46D13C441 for ; Mon, 5 Feb 2007 12:13:50 +0000 (UTC) (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 l15CDnYN020722 for ; Mon, 5 Feb 2007 12:13:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15CDn2K020714 for perforce@freebsd.org; Mon, 5 Feb 2007 12:13:49 GMT (envelope-from piso@freebsd.org) Date: Mon, 5 Feb 2007 12:13:49 GMT Message-Id: <200702051213.l15CDn2K020714@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 114046 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: Mon, 05 Feb 2007 12:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=114046 Change 114046 by piso@piso_newluxor on 2007/02/05 12:13:03 Do not compile the old API for in kernel libalias. Affected files ... .. //depot/projects/soc2005/libalias/sys/conf/files#22 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/conf/files#22 (text+ko) ==== @@ -1785,7 +1785,6 @@ netinet/libalias/alias.c optional libalias netinet/libalias/alias_db.c optional libalias netinet/libalias/alias_mod.c optional libalias -netinet/libalias/alias_old.c optional libalias netinet/libalias/alias_proxy.c optional libalias netinet/libalias/alias_util.c optional libalias netinet6/ah_aesxcbcmac.c optional ipsec From owner-p4-projects@FreeBSD.ORG Mon Feb 5 12:34:25 2007 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 AD13516A4E8; Mon, 5 Feb 2007 12:34:24 +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 94FD916A4D1 for ; Mon, 5 Feb 2007 12:34:23 +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 42F2913C4D9 for ; Mon, 5 Feb 2007 12:34:16 +0000 (UTC) (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 l15CYGRc023844 for ; Mon, 5 Feb 2007 12:34:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15CYGRl023840 for perforce@freebsd.org; Mon, 5 Feb 2007 12:34:16 GMT (envelope-from piso@freebsd.org) Date: Mon, 5 Feb 2007 12:34:16 GMT Message-Id: <200702051234.l15CYGRl023840@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 114047 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: Mon, 05 Feb 2007 12:34:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=114047 Change 114047 by piso@piso_newluxor on 2007/02/05 12:33:47 o always mtod() before accessing data. o reuse the *mbuf passed as input parameter. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#20 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#20 (text+ko) ==== @@ -179,48 +179,42 @@ #ifdef _KERNEL #define PULLUP_IPHDR(pip, ptr) do { \ - struct mbuf *m; \ - m = m_pullup((ptr), sizeof(struct ip)); \ - (pip) = mtod(m, struct ip *); \ + ptr = m_pullup((ptr), sizeof(struct ip)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #define PULLUP_UDPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = mtod(m, struct ip *); \ + pip = mtod((struct mbuf *)ptr, struct ip *); \ + ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #define PULLUP_TCPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(m, struct ip *); \ + pip = mtod((struct mbuf *)ptr, struct ip *); \ + ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #define PULLUP_ICMPHDR(pip, ptr) do { \ - struct mbuf *m; \ - pip = (struct ip *)ptr; \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ - (pip) = mtod(m, struct ip *); \ + pip = mtod((struct mbuf *)ptr, struct ip *); \ + ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #define PULLUP_ICMPIP64(pip, ptr, ic) do { \ - struct mbuf *m; \ int s; \ - pip = ptr; \ + pip = mtod((struct mbuf *)ptr, struct ip *); \ s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ - m = m_pullup((ptr), s); \ - (pip) = mtod(m, struct ip *); \ + ptr = m_pullup((ptr), s); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #define PULLUP_IPTCPHDR(pip, ptr) do { \ - struct mbuf *m; \ - m = m_pullup((ptr), sizeof(struct ip)); \ - (pip) = mtod(m, struct ip *); \ - m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(m, struct ip *); \ + ptr = m_pullup((ptr), sizeof(struct ip)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod((struct mbuf *)ptr, struct ip *); \ } while (0) #else From owner-p4-projects@FreeBSD.ORG Mon Feb 5 12:37:41 2007 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 EA36B16A41B; Mon, 5 Feb 2007 12:37:22 +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 CA71116A40D for ; Mon, 5 Feb 2007 12:37:20 +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 AEA3513C4A5 for ; Mon, 5 Feb 2007 12:37:20 +0000 (UTC) (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 l15CbKbK024530 for ; Mon, 5 Feb 2007 12:37:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15CbKki024527 for perforce@freebsd.org; Mon, 5 Feb 2007 12:37:20 GMT (envelope-from piso@freebsd.org) Date: Mon, 5 Feb 2007 12:37:20 GMT Message-Id: <200702051237.l15CbKki024527@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 114048 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: Mon, 05 Feb 2007 12:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=114048 Change 114048 by piso@piso_newluxor on 2007/02/05 12:36:19 Update ipfw and ng_nat to the new libalias API: the code is still broken as we've to pass pass down a **mbuf to let libalias manipulate it and return to the caller. Affected files ... .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#7 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#40 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#7 (text+ko) ==== @@ -204,7 +204,6 @@ struct mbuf *m; struct ip *ip; int rval, error = 0; - char *c; if (!(priv->flags & NGNAT_READY)) { NG_FREE_ITEM(item); @@ -213,7 +212,7 @@ m = NGI_M(item); - if ((m = m_megapullup(m, m->m_pkthdr.len)) == NULL) { + if ((m = m_pullup(m, sizeof(struct ip))) == NULL) { NGI_M(item) = NULL; /* avoid double free */ NG_FREE_ITEM(item); return (ENOBUFS); @@ -221,21 +220,20 @@ NGI_M(item) = m; - c = mtod(m, char *); ip = mtod(m, struct ip *); KASSERT(m->m_pkthdr.len == ntohs(ip->ip_len), ("ng_nat: ip_len != m_pkthdr.len")); if (hook == priv->in) { - rval = LibAliasIn(priv->lib, c, MCLBYTES); + rval = LibAliasIn(priv->lib, m, MCLBYTES); if (rval != PKT_ALIAS_OK && rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { NG_FREE_ITEM(item); return (EINVAL); } } else if (hook == priv->out) { - rval = LibAliasOut(priv->lib, c, MCLBYTES); + rval = LibAliasOut(priv->lib, m, MCLBYTES); if (rval != PKT_ALIAS_OK) { NG_FREE_ITEM(item); return (EINVAL); @@ -243,11 +241,26 @@ } else panic("ng_nat: unknown hook!\n"); + if ((m = m_pullup(m, sizeof(struct ip))) == NULL) { + NGI_M(item) = NULL; /* avoid double free */ + NG_FREE_ITEM(item); + return (ENOBUFS); + } + ip = mtod(m, struct ip *); m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len); if ((ip->ip_off & htons(IP_OFFMASK)) == 0 && - ip->ip_p == IPPROTO_TCP) { - struct tcphdr *th = (struct tcphdr *)((caddr_t)ip + + ip->ip_p == IPPROTO_TCP) { + struct tcphdr *th; + + if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct tcphdr))) + == NULL) { + NGI_M(item) = NULL; /* avoid double free */ + NG_FREE_ITEM(item); + return (ENOBUFS); + } + ip = mtod(m, struct ip *); + th = (struct tcphdr *)((caddr_t)ip + (ip->ip_hl << 2)); /* ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#40 (text+ko) ==== @@ -3480,10 +3480,8 @@ #ifdef IPFIREWALL_NAT case O_NAT: { struct cfg_nat *t; - struct mbuf *mcl; /* XXX - libalias duct tape */ - int ldt; - char *c; + int ldt; ldt = 0; args->rule = f; /* Report matching rule. */ @@ -3498,10 +3496,9 @@ ((ipfw_insn_nat *)cmd)->nat = t; } - if ((mcl = m_megapullup(m, m->m_pkthdr.len)) == - NULL) + if ((m = m_pullup(m, sizeof(struct ip))) == NULL) goto badnat; - ip = mtod(mcl, struct ip *); + ip = mtod(m, struct ip *); if (args->eh == NULL) { ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); @@ -3555,27 +3552,29 @@ * it can handle delayed checksum and tso) */ - if (mcl->m_pkthdr.rcvif == NULL && - mcl->m_pkthdr.csum_flags & + if (m->m_pkthdr.rcvif == NULL && + m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) ldt = 1; - c = mtod(mcl, char *); if (oif == NULL) - retval = LibAliasIn(t->lib, c, + retval = LibAliasIn(t->lib, m, MCLBYTES); else - retval = LibAliasOut(t->lib, c, + retval = LibAliasOut(t->lib, m, MCLBYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ - m_free(mcl); + m_free(m); badnat: args->m = NULL; retval = IP_FW_DENY; goto done; } - mcl->m_pkthdr.len = mcl->m_len = + if ((m = m_pullup(m, sizeof(struct ip))) == NULL) + goto badnat; + ip = mtod(m, struct ip *); + m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len); /* @@ -3587,8 +3586,12 @@ ip->ip_p == IPPROTO_TCP) { struct tcphdr *th; + if ((m = m_pullup(m, (ip->ip_hl << 2) + + sizeof(struct tcphdr))) == NULL) + goto badnat; + ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); - if (th->th_x2) + if (th->th_x2) ldt = 1; } @@ -3607,6 +3610,12 @@ switch (ip->ip_p) { case IPPROTO_TCP: + if ((m = m_pullup(m, + (ip->ip_hl << 2) + + sizeof(struct tcphdr))) == + NULL) + goto badnat; + ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); /* * Maybe it was set in @@ -3614,26 +3623,32 @@ */ th->th_x2 = 0; th->th_sum = cksum; - mcl->m_pkthdr.csum_data = + m->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum); break; case IPPROTO_UDP: + if ((m = m_pullup(m, + (ip->ip_hl << 2) + + sizeof(struct tcphdr))) == + NULL) + goto badnat; + ip = mtod(m, struct ip *); uh = (struct udphdr *)(ip + 1); uh->uh_sum = cksum; - mcl->m_pkthdr.csum_data = + m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); - break; + break; } /* * No hw checksum offloading: do it * by ourself. */ - if ((mcl->m_pkthdr.csum_flags & + if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) == 0) { - in_delayed_cksum(mcl); - mcl->m_pkthdr.csum_flags &= + in_delayed_cksum(m); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } ip->ip_len = htons(ip->ip_len); @@ -3644,7 +3659,7 @@ ip->ip_off = ntohs(ip->ip_off); } - args->m = mcl; + args->m = m; retval = IP_FW_NAT; goto done; } From owner-p4-projects@FreeBSD.ORG Mon Feb 5 15:30:04 2007 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 985A616A403; Mon, 5 Feb 2007 15:30:04 +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 3885716A401 for ; Mon, 5 Feb 2007 15:30:04 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1C29B13C4BA for ; Mon, 5 Feb 2007 15:30:04 +0000 (UTC) (envelope-from sephe@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 l15FU3qI067504 for ; Mon, 5 Feb 2007 15:30:03 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15FU3gM067501 for perforce@freebsd.org; Mon, 5 Feb 2007 15:30:03 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 5 Feb 2007 15:30:03 GMT Message-Id: <200702051530.l15FU3gM067501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114055 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: Mon, 05 Feb 2007 15:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=114055 Change 114055 by sephe@sephe_zealot:sam_wifi on 2007/02/05 15:29:03 For ral(4) rt2560 part: - Convert RSSI to receive signal strength(dbm) - Add noise floor zealot:ral# ifconfig ral0 up scan SSID BSSID CHAN RATE S:N INT CAPS sephewifi-test 00:16:b6:2b:cd:38 1 54M -52:-95 100 ES sephewifi 00:90:4c:7e:00:64 13 54M -55:-95 100 EP WPA zealot:ral# ifconfig ath0 up scan SSID BSSID CHAN RATE S:N INT CAPS sephewifi-test 00:16:b6:2b:cd:38 1 54M -55:-96 100 ES sephewifi 00:90:4c:7e:00:64 13 54M -55:-91 100 EP WPA Obtained-from: Dragonfly Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#13 edit .. //depot/projects/wifi/sys/dev/ral/rt2560reg.h#2 edit .. //depot/projects/wifi/sys/dev/ral/rt2560var.h#7 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#13 (text) ==== @@ -65,6 +65,9 @@ #include #include +#define RT2560_RSSI(sc, rssi) \ + ((rssi) > (RT2560_NOISE_FLOOR + (sc)->rssi_corr) ? \ + ((rssi) - RT2560_NOISE_FLOOR - (sc)->rssi_corr) : 0) #ifdef RAL_DEBUG #define DPRINTF(x) do { if (ral_debug > 0) printf x; } while (0) @@ -1166,7 +1169,7 @@ tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_antenna = sc->rx_ant; - tap->wr_antsignal = desc->rssi; + tap->wr_antsignal = RT2560_RSSI(sc, desc->rssi); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } @@ -1178,11 +1181,13 @@ (struct ieee80211_frame_min *)wh); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc->rssi, 0, 0); + ieee80211_input(ic, m, ni, RT2560_RSSI(sc, desc->rssi), + RT2560_NOISE_FLOOR, 0); /* give rssi to the rate adatation algorithm */ rn = (struct rt2560_node *)ni; - ral_rssadapt_input(ic, ni, &rn->rssadapt, desc->rssi); + ral_rssadapt_input(ic, ni, &rn->rssadapt, + RT2560_RSSI(sc, desc->rssi)); /* node is no longer needed */ ieee80211_free_node(ni); @@ -2540,6 +2545,14 @@ sc->txpow[i * 2] = val >> 8; sc->txpow[i * 2 + 1] = val & 0xff; } + + val = rt2560_eeprom_read(sc, RT2560_EEPROM_CALIBRATE); + if ((val & 0xff00) == 0xff00) + sc->rssi_corr = RT2560_DEFAULT_RSSI_CORR; + else + sc->rssi_corr = val >> 8; + DPRINTF(("rssi correction %d, calibrate 0x%02x\n", + sc->rssi_corr, val)); } ==== //depot/projects/wifi/sys/dev/ral/rt2560reg.h#2 (text) ==== @@ -17,6 +17,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define RT2560_DEFAULT_RSSI_CORR 0x79 +#define RT2560_NOISE_FLOOR -95 + #define RT2560_TX_RING_COUNT 48 #define RT2560_ATIM_RING_COUNT 4 #define RT2560_PRIO_RING_COUNT 16 @@ -296,6 +299,7 @@ #define RT2560_EEPROM_CONFIG0 16 #define RT2560_EEPROM_BBP_BASE 19 #define RT2560_EEPROM_TXPOWER 35 +#define RT2560_EEPROM_CALIBRATE 62 /* * control and status registers access macros ==== //depot/projects/wifi/sys/dev/ral/rt2560var.h#7 (text) ==== @@ -120,6 +120,7 @@ uint32_t asic_rev; uint32_t eeprom_rev; uint8_t rf_rev; + uint8_t rssi_corr; struct rt2560_tx_ring txq; struct rt2560_tx_ring prioq; From owner-p4-projects@FreeBSD.ORG Mon Feb 5 17:33:50 2007 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 9358B16A401; Mon, 5 Feb 2007 17:33:50 +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 8A05316A40F for ; Mon, 5 Feb 2007 17:33:49 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 923BC13C4B7 for ; Mon, 5 Feb 2007 17:33:48 +0000 (UTC) (envelope-from netchild@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 l15HXmaa000271 for ; Mon, 5 Feb 2007 17:33:48 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15HXmat000268 for perforce@freebsd.org; Mon, 5 Feb 2007 17:33:48 GMT (envelope-from netchild@freebsd.org) Date: Mon, 5 Feb 2007 17:33:48 GMT Message-Id: <200702051733.l15HXmat000268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114065 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: Mon, 05 Feb 2007 17:33:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=114065 Change 114065 by netchild@netchild_magellan on 2007/02/05 17:33:25 size_t is unsigned, so use the appropriate format specifier for printf Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#12 (text+ko) ==== @@ -525,7 +525,7 @@ state = 'R'; if (ratelimit == 0) { - printf("linprocfs: don't know how to handle unknown FreeBSD state %d/%zd, mapping to R\n", + printf("linprocfs: don't know how to handle unknown FreeBSD state %d/%zu, mapping to R\n", kp.ki_stat, sizeof(linux_state)); ++ratelimit; } From owner-p4-projects@FreeBSD.ORG Mon Feb 5 18:19:59 2007 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 8417B16A403; Mon, 5 Feb 2007 18:19:49 +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 48BE216A400 for ; Mon, 5 Feb 2007 18:19:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E48D113C4A7 for ; Mon, 5 Feb 2007 18:19:47 +0000 (UTC) (envelope-from imp@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 l15IJlhw008658 for ; Mon, 5 Feb 2007 18:19:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15IJkdV008641 for perforce@freebsd.org; Mon, 5 Feb 2007 18:19:46 GMT (envelope-from imp@freebsd.org) Date: Mon, 5 Feb 2007 18:19:46 GMT Message-Id: <200702051819.l15IJkdV008641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 114067 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: Mon, 05 Feb 2007 18:19:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=114067 Change 114067 by imp@imp_paco-paco on 2007/02/05 18:19:38 IFC @114060 Affected files ... .. //depot/projects/arm/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/arm/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/arm/src/sbin/init/init.c#2 integrate .. //depot/projects/arm/src/sbin/mount/Makefile#2 integrate .. //depot/projects/arm/src/sbin/mount/mount.c#5 integrate .. //depot/projects/arm/src/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/arm/src/share/man/man4/altq.4#4 integrate .. //depot/projects/arm/src/share/man/man4/aue.4#3 integrate .. //depot/projects/arm/src/share/man/man4/bce.4#5 integrate .. //depot/projects/arm/src/share/man/man4/ipw.4#3 integrate .. //depot/projects/arm/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ral.4#3 integrate .. //depot/projects/arm/src/share/man/man4/tap.4#2 integrate .. //depot/projects/arm/src/share/man/man4/tun.4#3 integrate .. //depot/projects/arm/src/share/man/man4/ubsa.4#3 integrate .. //depot/projects/arm/src/share/man/man4/udav.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ural.4#3 integrate .. //depot/projects/arm/src/share/man/man5/quota.user.5#2 integrate .. //depot/projects/arm/src/share/syscons/keymaps/hr.iso.kbd#2 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#31 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#69 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#28 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#7 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/arm/src/sys/conf/files#62 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#14 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/arm/src/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#9 integrate .. //depot/projects/arm/src/sys/kern/subr_firmware.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#10 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/arm/src/sys/netinet/in.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/ah_core.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#13 integrate .. //depot/projects/arm/src/sys/sys/conf.h#7 integrate .. //depot/projects/arm/src/sys/sys/lock.h#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#24 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#11 integrate .. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/arm/src/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/arm/src/usr.bin/ctags/C.c#2 integrate .. //depot/projects/arm/src/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/arm/src/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/arm/src/usr.bin/getent/getent.c#2 integrate .. //depot/projects/arm/src/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/arm/src/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/arm/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/arm/src/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#4 integrate .. //depot/projects/arm/src/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/arm/src/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/arm/src/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/arm/src/usr.sbin/repquota/repquota.c#2 integrate Differences ... ==== //depot/projects/arm/src/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.6 2006/03/05 15:45:38 matteo Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | grep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/arm/src/lib/libarchive/archive_read.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.28 2007/02/01 06:18:16 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.29 2007/02/05 16:30:40 cperciva Exp $"); #ifdef HAVE_ERRNO_H #include @@ -65,10 +65,8 @@ unsigned char *nulls; a = (struct archive *)malloc(sizeof(*a)); - if (a == NULL) { - archive_set_error(a, ENOMEM, "Can't allocate archive object"); + if (a == NULL) return (NULL); - } memset(a, 0, sizeof(*a)); a->user_uid = geteuid(); ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_none.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.13 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.14 2007/02/05 16:30:40 cperciva Exp $"); #include #ifdef HAVE_ERRNO_H @@ -301,7 +301,11 @@ /* * If a client_skipper was provided, try that first. */ +#if ARCHIVE_API_VERSION < 2 if ((a->client_skipper != NULL) && (request < SSIZE_MAX)) { +#else + if (a->client_skipper != NULL) { +#endif bytes_skipped = (a->client_skipper)(a, a->client_data, request); if (bytes_skipped < 0) { /* error */ @@ -333,7 +337,8 @@ if (bytes_read == 0) { /* We hit EOF before we satisfied the skip request. */ archive_set_error(a, ARCHIVE_ERRNO_MISC, - "Truncated input file (need to skip %d bytes)", (int)request); + "Truncated input file (need to skip %jd bytes)", + (intmax_t)request); return (ARCHIVE_FATAL); } assert(bytes_read >= 0); /* precondition for cast below */ ==== //depot/projects/arm/src/sbin/ifconfig/af_inet6.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/af_inet6.c,v 1.4 2006/09/25 18:20:56 bms Exp $"; + "$FreeBSD: src/sbin/ifconfig/af_inet6.c,v 1.5 2007/02/03 03:40:33 bms Exp $"; #endif /* not lint */ #include @@ -515,7 +515,7 @@ .af_settunnel = in6_set_tunnel, .af_difaddr = SIOCDIFADDR_IN6, .af_aifaddr = SIOCAIFADDR_IN6, - .af_ridreq = &in6_ridreq, + .af_ridreq = &in6_addreq, .af_addreq = &in6_addreq, }; ==== //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#11 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.131 2007/01/20 00:56:49 marius Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.133 2007/02/04 16:48:56 bms Exp $ .\" -.Dd January 20, 2007 +.Dd February 4, 2007 .Dt IFCONFIG 8 .Os .Sh NAME @@ -1567,6 +1567,62 @@ .Sh NOTES The media selection system is relatively new and only some drivers support it (or have need for it). +.Sh EXAMPLES +Assign the IPv4 address +.Li 192.0.2.10 , +with a network mask of +.Li 255.255.255.0 , +to the interface +.Li fxp0 : +.Dl # ifconfig fxp0 inet 192.0.2.10 netmask 255.255.255.0 +.Pp +Add the IPv4 address +.Li 192.0.2.45 , +with the CIDR network prefix +.Li /28 , +to the interface +.Li ed0 , +using +.Cm add +as a synonym for the canonical form of the option +.Cm alias : +.Dl # ifconfig ed0 inet 192.0.2.45/28 add +.Pp +Remove the IPv4 address +.Li 192.0.2.45 +from the interface +.Li ed0 : +.Dl # ifconfig ed0 inet 192.0.2.45 -alias +.Pp +Add the IPv6 address +.Li 2001:DB8:DBDB::123/48 +to the interface +.Li em0 : +.Dl # ifconfig em0 inet6 2001:db8:bdbd::123 prefixlen 48 alias +Note that lower case hexadecimal IPv6 addresses are acceptable. +.Pp +Remove the IPv6 address added in the above example, +using the +.Li / +character as shorthand for the network prefix, +and using +.Cm delete +as a synonym for the canonical form of the option +.Fl alias : +.Dl # ifconfig em0 inet6 2001:db8:bdbd::123/48 delete +.Pp +Configure the interface +.Li xl0 , +to use 100baseTX, full duplex Ethernet media options: +.Dl # ifconfig xl0 media 100baseTX mediaopt full-duplex +.Pp +Create the software network interface +.Li gif1 : +.Dl # ifconfig gif1 create +.Pp +Destroy the software network interface +.Li gif1 : +.Dl # ifconfig gif1 destroy .Sh DIAGNOSTICS Messages indicating the specified interface does not exist, the requested address is unknown, or the user is not privileged and ==== //depot/projects/arm/src/sbin/init/init.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.62 2006/06/08 14:04:36 kib Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.63 2007/02/04 06:33:13 imp Exp $"; #endif /* not lint */ #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -121,6 +122,8 @@ state_func_t catatonia(void); state_func_t death(void); +state_func_t run_script(const char *); + enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; #define FALSE 0 #define TRUE 1 @@ -131,9 +134,11 @@ int devfs; void transition(state_t); -state_t requested_transition = runcom; +state_t requested_transition; void setctty(const char *); +const char *get_shell(void); +void write_stderr(const char *message); typedef struct init_session { int se_index; /* index of entry in ttys file */ @@ -187,6 +192,8 @@ int main(int argc, char *argv[]) { + state_t initial_transition = runcom; + char kenv_value[PATH_MAX]; int c; struct sigaction sa; sigset_t mask; @@ -262,7 +269,7 @@ devfs = 1; break; case 's': - requested_transition = single_user; + initial_transition = single_user; break; case 'f': runcom_mode = FASTBOOT; @@ -275,6 +282,63 @@ if (optind != argc) warning("ignoring excess arguments"); + /* + * We catch or block signals rather than ignore them, + * so that they get reset on exec. + */ + handle(badsys, SIGSYS, 0); + handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, + SIGBUS, SIGXCPU, SIGXFSZ, 0); + handle(transition_handler, SIGHUP, SIGINT, SIGTERM, SIGTSTP, + SIGUSR1, SIGUSR2, 0); + handle(alrm_handler, SIGALRM, 0); + sigfillset(&mask); + delset(&mask, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS, + SIGXCPU, SIGXFSZ, SIGHUP, SIGINT, SIGTERM, SIGTSTP, SIGALRM, + SIGUSR1, SIGUSR2, 0); + sigprocmask(SIG_SETMASK, &mask, (sigset_t *) 0); + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sa.sa_handler = SIG_IGN; + (void) sigaction(SIGTTIN, &sa, (struct sigaction *)0); + (void) sigaction(SIGTTOU, &sa, (struct sigaction *)0); + + /* + * Paranoia. + */ + close(0); + close(1); + close(2); + + if (kenv(KENV_GET, "init_script", kenv_value, sizeof(kenv_value)) > 0) { + state_func_t next_transition; + + if ((next_transition = run_script(kenv_value)) != 0) + initial_transition = (state_t) next_transition; + } + + if (kenv(KENV_GET, "init_chroot", kenv_value, sizeof(kenv_value)) > 0) { + if (chdir(kenv_value) != 0 || chroot(".") != 0) + warning("Can't chroot to %s: %m", kenv_value); + } + + /* + * Additional check if devfs needs to be mounted: + * If "/" and "/dev" have the same device number, + * then it hasn't been mounted yet. + */ + if (!devfs) { + struct stat stst; + dev_t root_devno; + + stat("/", &stst); + root_devno = stst.st_dev; + if (stat("/dev", &stst) != 0) + warning("Can't stat /dev: %m"); + else if (stst.st_dev == root_devno) + devfs++; + } + if (devfs) { struct iovec iov[4]; char *s; @@ -312,37 +376,9 @@ } /* - * We catch or block signals rather than ignore them, - * so that they get reset on exec. - */ - handle(badsys, SIGSYS, 0); - handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, - SIGBUS, SIGXCPU, SIGXFSZ, 0); - handle(transition_handler, SIGHUP, SIGINT, SIGTERM, SIGTSTP, - SIGUSR1, SIGUSR2, 0); - handle(alrm_handler, SIGALRM, 0); - sigfillset(&mask); - delset(&mask, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS, - SIGXCPU, SIGXFSZ, SIGHUP, SIGINT, SIGTERM, SIGTSTP, SIGALRM, - SIGUSR1, SIGUSR2, 0); - sigprocmask(SIG_SETMASK, &mask, (sigset_t *) 0); - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - sa.sa_handler = SIG_IGN; - (void) sigaction(SIGTTIN, &sa, (struct sigaction *)0); - (void) sigaction(SIGTTOU, &sa, (struct sigaction *)0); - - /* - * Paranoia. - */ - close(0); - close(1); - close(2); - - /* * Start the state machine. */ - transition(requested_transition); + transition(initial_transition); /* * Should never reach here. @@ -558,6 +594,23 @@ } } +const char * +get_shell(void) +{ + static char kenv_value[PATH_MAX]; + + if (kenv(KENV_GET, "init_shell", kenv_value, sizeof(kenv_value)) > 0) + return kenv_value; + else + return _PATH_BSHELL; +} + +void +write_stderr(const char *message) +{ + write(STDERR_FILENO, message, strlen(message)); +} + /* * Bring the system up single user. */ @@ -567,7 +620,7 @@ pid_t pid, wpid; int status; sigset_t mask; - const char *shell = _PATH_BSHELL; + const char *shell; char *argv[2]; #ifdef SECURE struct ttyent *typ; @@ -589,6 +642,8 @@ _exit(0); } + shell = get_shell(); + if ((pid = fork()) == 0) { /* * Start the single user session. @@ -605,7 +660,7 @@ pp = getpwnam("root"); if (typ && (typ->ty_status & TTY_SECURE) == 0 && pp && *pp->pw_passwd) { - write(STDERR_FILENO, banner, sizeof banner - 1); + write_stderr(banner); for (;;) { clear = getpass("Password:"); if (clear == 0 || *clear == '\0') @@ -626,10 +681,10 @@ char *cp = altshell; int num; -#define SHREQUEST \ - "Enter full pathname of shell or RETURN for " _PATH_BSHELL ": " - (void)write(STDERR_FILENO, - SHREQUEST, sizeof(SHREQUEST) - 1); +#define SHREQUEST "Enter full pathname of shell or RETURN for " + write_stderr(SHREQUEST); + write_stderr(shell); + write_stderr(": "); while ((num = read(STDIN_FILENO, cp, 1)) != -1 && num != 0 && *cp != '\n' && cp < &altshell[127]) cp++; @@ -718,11 +773,35 @@ state_func_t runcom(void) { + state_func_t next_transition; + + if ((next_transition = run_script(_PATH_RUNCOM)) != 0) + return next_transition; + + runcom_mode = AUTOBOOT; /* the default */ + /* NB: should send a message to the session logger to avoid blocking. */ + logwtmp("~", "reboot", ""); + return (state_func_t) read_ttys; +} + +/* + * Run a shell script. + * Returns 0 on success, otherwise the next transition to enter: + * - single_user if fork/execv/waitpid failed, or if the script + * terminated with a signal or exit code != 0. + * - death if a SIGTERM was delivered to init(8). + */ +state_func_t +run_script(const char *script) +{ pid_t pid, wpid; int status; char *argv[4]; + const char *shell; struct sigaction sa; + shell = get_shell(); + if ((pid = fork()) == 0) { sigemptyset(&sa.sa_mask); sa.sa_flags = 0; @@ -733,11 +812,10 @@ setctty(_PATH_CONSOLE); char _sh[] = "sh"; - char _path_runcom[] = _PATH_RUNCOM; char _autoboot[] = "autoboot"; argv[0] = _sh; - argv[1] = _path_runcom; + argv[1] = __DECONST(char *, script); argv[2] = runcom_mode == AUTOBOOT ? _autoboot : 0; argv[3] = 0; @@ -746,14 +824,13 @@ #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif - execv(_PATH_BSHELL, argv); - stall("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNCOM); + execv(shell, argv); + stall("can't exec %s for %s: %m", shell, script); _exit(1); /* force single user mode */ } if (pid == -1) { - emergency("can't fork for %s on %s: %m", - _PATH_BSHELL, _PATH_RUNCOM); + emergency("can't fork for %s on %s: %m", shell, script); while (waitpid(-1, (int *) 0, WNOHANG) > 0) continue; sleep(STALL_TIMEOUT); @@ -772,13 +849,13 @@ return (state_func_t) death; if (errno == EINTR) continue; - warning("wait for %s on %s failed: %m; going to single user mode", - _PATH_BSHELL, _PATH_RUNCOM); + warning("wait for %s on %s failed: %m; going to " + "single user mode", shell, script); return (state_func_t) single_user; } if (wpid == pid && WIFSTOPPED(status)) { warning("init: %s on %s stopped, restarting\n", - _PATH_BSHELL, _PATH_RUNCOM); + shell, script); kill(pid, SIGCONT); wpid = -1; } @@ -795,18 +872,15 @@ } if (!WIFEXITED(status)) { - warning("%s on %s terminated abnormally, going to single user mode", - _PATH_BSHELL, _PATH_RUNCOM); + warning("%s on %s terminated abnormally, going to single " + "user mode", shell, script); return (state_func_t) single_user; } if (WEXITSTATUS(status)) return (state_func_t) single_user; - runcom_mode = AUTOBOOT; /* the default */ - /* NB: should send a message to the session logger to avoid blocking. */ - logwtmp("~", "reboot", ""); - return (state_func_t) read_ttys; + return (state_func_t) 0; } /* @@ -1465,6 +1539,7 @@ int shutdowntimeout; size_t len; char *argv[4]; + const char *shell; struct sigaction sa; struct stat sb; @@ -1477,6 +1552,8 @@ if (stat(_PATH_RUNDOWN, &sb) == -1 && errno == ENOENT) return 0; + shell = get_shell(); + if ((pid = fork()) == 0) { int fd; @@ -1517,14 +1594,13 @@ #ifdef LOGIN_CAP setprocresources(RESOURCE_RC); #endif - execv(_PATH_BSHELL, argv); - warning("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNDOWN); + execv(shell, argv); + warning("can't exec %s for %s: %m", shell, _PATH_RUNDOWN); _exit(1); /* force single user mode */ } if (pid == -1) { - emergency("can't fork for %s on %s: %m", - _PATH_BSHELL, _PATH_RUNDOWN); + emergency("can't fork for %s on %s: %m", shell, _PATH_RUNDOWN); while (waitpid(-1, (int *) 0, WNOHANG) > 0) continue; sleep(STALL_TIMEOUT); @@ -1548,20 +1624,20 @@ if (clang == 1) { /* we were waiting for the sub-shell */ kill(wpid, SIGTERM); - warning("timeout expired for %s on %s: %m; going to single user mode", - _PATH_BSHELL, _PATH_RUNDOWN); + warning("timeout expired for %s on %s: %m; going to " + "single user mode", shell, _PATH_RUNDOWN); return -1; } if (wpid == -1) { if (errno == EINTR) continue; - warning("wait for %s on %s failed: %m; going to single user mode", - _PATH_BSHELL, _PATH_RUNDOWN); + warning("wait for %s on %s failed: %m; going to " + "single user mode", shell, _PATH_RUNDOWN); return -1; } if (wpid == pid && WIFSTOPPED(status)) { warning("init: %s on %s stopped, restarting\n", - _PATH_BSHELL, _PATH_RUNDOWN); + shell, _PATH_RUNDOWN); kill(pid, SIGCONT); wpid = -1; } @@ -1584,8 +1660,8 @@ } if (!WIFEXITED(status)) { - warning("%s on %s terminated abnormally, going to single user mode", - _PATH_BSHELL, _PATH_RUNDOWN); + warning("%s on %s terminated abnormally, going to " + "single user mode", shell, _PATH_RUNDOWN); return -2; } ==== //depot/projects/arm/src/sbin/mount/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.6 (Berkeley) 5/8/95 -# $FreeBSD: src/sbin/mount/Makefile,v 1.18 2005/11/23 23:22:56 rodrigc Exp $ +# $FreeBSD: src/sbin/mount/Makefile,v 1.19 2007/02/02 23:58:10 pjd Exp $ PROG= mount SRCS= mount.c mount_fs.c getmntopts.c vfslist.c @@ -7,4 +7,7 @@ MAN= mount.8 # We do NOT install the getmntopts.3 man page. +DPADD= ${LIBUTIL} +LDADD= -lutil + .include ==== //depot/projects/arm/src/sbin/mount/mount.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.92 2006/11/14 01:07:42 rodrigc Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.93 2007/02/02 23:58:10 pjd Exp $"; #endif /* not lint */ #include @@ -58,6 +58,7 @@ #include #include #include +#include #include "extern.h" #include "mntopts.h" @@ -204,14 +205,33 @@ return (ret); } +static void +restart_mountd(void) +{ + struct pidfh *pfh; + pid_t mountdpid; + + pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid); + if (pfh != NULL) { + /* Mountd is not running. */ + pidfile_remove(pfh); + return; + } + if (errno != EEXIST) { + /* Cannot open pidfile for some reason. */ + return; + } + /* We have mountd(8) PID in mountdpid varible, let's signal it. */ + if (kill(mountdpid, SIGHUP) == -1) + err(1, "signal mountd"); +} + int main(int argc, char *argv[]) { const char *mntfromname, **vfslist, *vfstype; struct fstab *fs; struct statfs *mntbuf; - FILE *mountdfp; - pid_t pid; int all, ch, i, init_flags, late, mntsize, rval, have_fstab, ro; char *cp, *ep, *options; @@ -411,15 +431,10 @@ /* * If the mount was successfully, and done by root, tell mountd the - * good news. Pid checks are probably unnecessary, but don't hurt. + * good news. */ - if (rval == 0 && getuid() == 0 && - (mountdfp = fopen(_PATH_MOUNTDPID, "r")) != NULL) { - if (fscanf(mountdfp, "%d", &pid) == 1 && - pid > 0 && kill(pid, SIGHUP) == -1 && errno != ESRCH) - err(1, "signal mountd"); - (void)fclose(mountdfp); - } + if (rval == 0 && getuid() == 0) + restart_mountd(); exit(rval); } ==== //depot/projects/arm/src/sbin/quotacheck/quotacheck.c#4 (text+ko) ==== @@ -42,13 +42,14 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.29 2007/01/23 02:13:00 mpp Exp $"); +__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.32 2007/02/04 06:33:14 mpp Exp $"); /* * Fix up / report on disk quotas & usage */ #include #include +#include #include #include @@ -488,13 +489,13 @@ * Reset time limit if have a soft limit and were * previously under it, but are now over it. */ - if (dqbuf.dqb_bsoftlimit && + if (dqbuf.dqb_bsoftlimit && id != 0 && dqbuf.dqb_curblocks < dqbuf.dqb_bsoftlimit && fup->fu_curblocks >= dqbuf.dqb_bsoftlimit) dqbuf.dqb_btime = 0; - if (dqbuf.dqb_isoftlimit && - dqbuf.dqb_curblocks < dqbuf.dqb_isoftlimit && - fup->fu_curblocks >= dqbuf.dqb_isoftlimit) + if (dqbuf.dqb_isoftlimit && id != 0 && + dqbuf.dqb_curinodes < dqbuf.dqb_isoftlimit && + fup->fu_curinodes >= dqbuf.dqb_isoftlimit) dqbuf.dqb_itime = 0; dqbuf.dqb_curinodes = fup->fu_curinodes; dqbuf.dqb_curblocks = fup->fu_curblocks; @@ -587,14 +588,15 @@ { char *opt; char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; if (!initname) { - (void)snprintf(usrname, sizeof(usrname), - "%s%s", qfextension[USRQUOTA], qfname); - (void)snprintf(grpname, sizeof(grpname), - "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -611,10 +613,19 @@ if (cp) *qfnamep = cp; else { - (void)snprintf(buf, sizeof(buf), - "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); *qfnamep = buf; } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + return (0); + } return (1); } ==== //depot/projects/arm/src/share/man/man4/altq.4#4 (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.24 2006/12/13 08:55:20 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.27 2007/02/03 13:53:22 mlaier Exp $ .\" -.Dd December 13, 2006 +.Dd February 3, 2007 .Dt ALTQ 4 .Os .Sh NAME @@ -117,7 +117,9 @@ They have been applied to the following hardware drivers: .Xr an 4 , .Xr ath 4 , +.Xr aue 4 , .Xr awi 4 , +.Xr bce 4 , .Xr bfe 4 , .Xr bge 4 , .Xr dc 4 , @@ -127,11 +129,15 @@ .Xr ep 4 , .Xr fxp 4 , .Xr hme 4 , +.Xr ipw 4 , +.Xr iwi 4 , .Xr le 4 , .Xr msk 4 , .Xr mxge 4 , .Xr my 4 , +.Xr npe 4 , .Xr nve 4 , +.Xr ral 4 , .Xr re 4 , .Xr rl 4 , .Xr sf 4 , @@ -139,6 +145,8 @@ .Xr sk 4 , .Xr ste 4 , .Xr stge 4 , +.Xr udav 4 , +.Xr ural 4 , .Xr vr 4 , .Xr wi 4 , and ==== //depot/projects/arm/src/share/man/man4/aue.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aue.4,v 1.25 2006/10/07 17:58:50 flz Exp $ +.\" $FreeBSD: src/share/man/man4/aue.4,v 1.26 2007/02/03 19:29:31 brueffer Exp $ .\" .Dd October 7, 2006 .Dt AUE 4 @@ -185,6 +185,7 @@ The driver failed to allocate an mbuf for the receiver ring. .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr miibus 4 , .Xr netintro 4 , ==== //depot/projects/arm/src/share/man/man4/bce.4#5 (text) ==== @@ -26,7 +26,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bce.4,v 1.5 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/bce.4,v 1.6 2007/02/03 19:29:31 brueffer Exp $ .\" .Dd December 2, 2006 .Dt BCE 4 @@ -286,6 +286,7 @@ If the problem continues replace the controller. .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr miibus 4 , .Xr netintro 4 , ==== //depot/projects/arm/src/share/man/man4/ipw.4#3 (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/ipw.4,v 1.13 2006/07/28 08:43:49 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.14 2007/02/03 19:29:31 brueffer Exp $ .\" .Dd July 28, 2006 .Os @@ -119,6 +119,7 @@ This should not happen. .El .Sh SEE ALSO +.Xr altq 4 , .Xr an 4 , .Xr ath 4 , .Xr iwi 4 , ==== //depot/projects/arm/src/share/man/man4/iwi.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/iwi.4,v 1.15 2006/07/17 18:56:27 mnag Exp $ +.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.16 2007/02/03 19:29:31 brueffer Exp $ .\" .Dd July 17, 2006 .Os @@ -124,6 +124,7 @@ This should not happen. .El .Sh SEE ALSO +.Xr altq 4 , .Xr an 4 , .Xr ath 4 , .Xr ipw 4 , ==== //depot/projects/arm/src/share/man/man4/man4.arm/npe.4#2 (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/share/man/man4/man4.arm/npe.4,v 1.1 2006/12/05 16:57:10 ru Exp $ +.\" $FreeBSD: src/share/man/man4/man4.arm/npe.4,v 1.2 2007/02/03 20:02:29 brueffer Exp $ .\" .Dd December 4, 2006 .Dt NPE 4 arm @@ -132,6 +132,7 @@ Other diagnostics exist and are not listed here; they should be self-explanatory. .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr miibus 4 , >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 5 18:32:19 2007 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 0474116A405; Mon, 5 Feb 2007 18:32:13 +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 7AF1C16A411 for ; Mon, 5 Feb 2007 18:32:05 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3042F13C481 for ; Mon, 5 Feb 2007 18:32:05 +0000 (UTC) (envelope-from netchild@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 l15IW5VX012127 for ; Mon, 5 Feb 2007 18:32:05 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15IW3AN012122 for perforce@freebsd.org; Mon, 5 Feb 2007 18:32:03 GMT (envelope-from netchild@freebsd.org) Date: Mon, 5 Feb 2007 18:32:03 GMT Message-Id: <200702051832.l15IW3AN012122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114068 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: Mon, 05 Feb 2007 18:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114068 Change 114068 by netchild@netchild_magellan on 2007/02/05 18:31:08 Use bus_get_dma_tag() to obtain the parent DMA tag to make the drivers a little bit more non-ia32/amd64 friendly. There is no man page for bus_get_dma_tag, so this is modelled after rev. 1.62 of src/sys/dev/sound/pci/es137x.c by marius. So far this is compile tested only. Inspired by: commit by marius Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#2 edit Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -613,7 +613,8 @@ if (mixer_init(dev, &ad1816mixer_class, ad1816)) goto no; snd_setup_intr(dev, ad1816->irq, 0, ad1816_intr, ad1816, &ad1816->ih); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ if (!sc->duplex) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#2 (text+ko) ==== @@ -1744,7 +1744,8 @@ } if (pdma == rdma) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== @@ -841,7 +841,8 @@ sb->prio = 0; - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== @@ -735,7 +735,8 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== @@ -773,7 +773,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, ALS_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#2 (text+ko) ==== @@ -1194,7 +1194,8 @@ /* * DMA tag for scatter-gather buffers and link pointers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1205,7 +1206,8 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#2 (text+ko) ==== @@ -636,7 +636,7 @@ /* DMA mapping */ aui->aui_bufsize = pcm_getbuffersize(dev, AU88X0_BUFSIZE_MIN, AU88X0_BUFSIZE_DFLT, AU88X0_BUFSIZE_MAX); - error = bus_dma_tag_create(NULL, + error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, /* 16-bit alignment, no boundary */ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, /* restrict to 4GB */ NULL, NULL, /* no filter */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== @@ -637,7 +637,8 @@ if (codec == NULL) goto bad; if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#2 (text+ko) ==== @@ -959,7 +959,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CMI_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#2 (text+ko) ==== @@ -824,7 +824,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CS4281_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== @@ -704,7 +704,9 @@ if (resp->irq == NULL) return (1); } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/CS461x_BUFFSIZE, /*boundary*/CS461x_BUFFSIZE, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + /*alignment*/CS461x_BUFFSIZE, + /*boundary*/CS461x_BUFFSIZE, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#2 (text+ko) ==== @@ -157,7 +157,7 @@ */ /* stuff */ -static int ds_init(struct sc_info *); +static int ds_init(struct sc_info *, device_t); static void ds_intr(void *); /* talk to the card */ @@ -785,7 +785,7 @@ } static int -ds_init(struct sc_info *sc) +ds_init(struct sc_info *sc, device_t dev) { int i; u_int32_t *ci, r, pcs, rcs, ecs, ws, memsz, cb; @@ -833,7 +833,9 @@ memsz += (64 + 1) * 4; if (sc->regbase == NULL) { - if (bus_dma_tag_create(NULL, 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, memsz, 1, memsz, 0, NULL, NULL, &sc->control_dmat)) return -1; @@ -970,7 +972,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, DS1_BUFFSIZE, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -982,7 +985,7 @@ } sc->regbase = NULL; - if (ds_init(sc) == -1) { + if (ds_init(sc, dev) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } @@ -1050,7 +1053,7 @@ sc = pcm_getdevinfo(dev); - if (ds_init(sc) == -1) { + if (ds_init(sc, dev) == -1) { device_printf(dev, "unable to reinitialize the card\n"); return ENXIO; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#2 (text+ko) ==== @@ -2011,7 +2011,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, EMU_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/1 << 31, /* can only access 0-2gb */ /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#2 (text+ko) ==== @@ -385,7 +385,7 @@ static void emu_initefx(struct emu_sc_info *sc); static int emu_cardbus_init(struct emu_sc_info *sc); -static int emu_init(struct emu_sc_info *sc); +static int emu_init(struct emu_sc_info *sc, device_t dev); static int emu_uninit(struct emu_sc_info *sc); static int emu_read_ivar(device_t bus __unused, device_t dev, int ivar_index, uintptr_t * result); @@ -2338,7 +2338,7 @@ /* Probe and attach the card */ static int -emu_init(struct emu_sc_info *sc) +emu_init(struct emu_sc_info *sc, device_t dev) { uint32_t ch, tmp; uint32_t spdif_sr; @@ -2385,7 +2385,8 @@ emu_wrptr(sc, 0, SPBYPASS, 0xf00); /* What will happen if * we write 1 here? */ - if (bus_dma_tag_create( /* parent */ NULL, /* alignment */ 2, /* boundary */ 0, + if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(dev), + /* alignment */ 2, /* boundary */ 0, /* lowaddr */ 1 << 31, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, /* filter */ NULL, /* filterarg */ NULL, @@ -2853,7 +2854,7 @@ sc->root = device_get_sysctl_tree(dev); if (sc->root == NULL) goto bad; - if (emu_init(sc) == -1) { + if (emu_init(sc, dev) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#2 (text+ko) ==== @@ -2301,7 +2301,7 @@ } static int -envy24_alloc_resource(struct sc_info *sc) +envy24_alloc_resource(struct sc_info *sc, device_t dev) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2348,7 +2348,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/4, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, /*filter*/NULL, /*filterarg*/NULL, @@ -2394,7 +2395,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24_alloc_resource(sc); + err = envy24_alloc_resource(sc, dev); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#2 (text+ko) ==== @@ -2332,7 +2332,7 @@ } static int -envy24ht_alloc_resource(struct sc_info *sc) +envy24ht_alloc_resource(struct sc_info *sc, device_t dev) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2367,7 +2367,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/4, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, /*filter*/NULL, /*filterarg*/NULL, @@ -2413,7 +2414,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24ht_alloc_resource(sc); + err = envy24ht_alloc_resource(sc, dev); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== @@ -630,7 +630,8 @@ goto oops; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -1167,7 +1167,7 @@ /* * Create a DMA tag */ - result = bus_dma_tag_create(NULL, /* parent */ + result = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ HDAC_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ lowaddr, /* lowaddr */ @@ -3200,7 +3200,7 @@ } else sc->chan_blkcnt = HDA_BDL_DEFAULT; - result = bus_dma_tag_create(NULL, /* parent */ + result = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ HDAC_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#2 (text+ko) ==== @@ -934,7 +934,8 @@ else sc->fixedrate = 0; - if (bus_dma_tag_create(NULL, 8, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->bufsz, 1, 0x3ffff, 0, NULL, NULL, &sc->dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#2 (text+ko) ==== @@ -1793,7 +1793,7 @@ #endif ess->bufsz = pcm_getbuffersize(dev, 4096, AGG_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/ NULL, + if (bus_dma_tag_create(/*parent*/ bus_get_dma_tag(dev), /*align */ 4, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, /*filter*/ NULL, NULL, @@ -1808,7 +1808,7 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, + if (bus_dma_tag_create(/*parent*/ bus_dma_tag_create, /*align */ 1 << WAVCACHE_BASEADDR_SHIFT, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#2 (text+ko) ==== @@ -1240,7 +1240,7 @@ M3_BUFSIZE_MAX); if (bus_dma_tag_create( - NULL, /* parent */ + bus_get_dma_tag(dev), /* parent */ 2, 0, /* alignment, boundary */ M3_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#2 (text+ko) ==== @@ -1030,9 +1030,9 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); #if 0 - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/65536, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/65536, /*boundary*/0, #endif - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== @@ -860,7 +860,8 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/TR_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#2 (text+ko) ==== @@ -1237,7 +1237,8 @@ nsegs = (via_dxs_chnum + via_sgd_chnum) * via->blkcnt; /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1253,7 +1254,8 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#2 (text+ko) ==== @@ -555,7 +555,8 @@ via->codec_caps & (AC97_EXTCAP_VRA | AC97_EXTCAP_VRM)); /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -571,7 +572,8 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#2 (text+ko) ==== @@ -768,7 +768,8 @@ } sc->bufsz = pcm_getbuffersize(dev, 4096, SV_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, From owner-p4-projects@FreeBSD.ORG Mon Feb 5 21:04:45 2007 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 8BCB616A401; Mon, 5 Feb 2007 21:04:33 +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 F203616A573 for ; Mon, 5 Feb 2007 21:04:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 950F413C4C6 for ; Mon, 5 Feb 2007 21:04:23 +0000 (UTC) (envelope-from scottl@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 l15L4NcK051810 for ; Mon, 5 Feb 2007 21:04:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15L4IWl051801 for perforce@freebsd.org; Mon, 5 Feb 2007 21:04:18 GMT (envelope-from scottl@freebsd.org) Date: Mon, 5 Feb 2007 21:04:18 GMT Message-Id: <200702052104.l15L4IWl051801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114070 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: Mon, 05 Feb 2007 21:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114070 Change 114070 by scottl@scottl-x64 on 2007/02/05 21:04:05 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#11 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#17 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.sun4v#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/lance.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/mii.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ukphy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_if.m#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/driver.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_sab82532.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_kbd_sun.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/deadfs/dead_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/clock.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#17 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ath/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ath_rate_sample/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/le/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/msdosfs/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf_compat.h#3 delete .. //depot/projects/scottl-camlock/src/sys/net/bpfdesc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tap.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ah_core.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs_subs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/frame.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/fsr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/genassym.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/utrap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tte.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/buf.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bufobj.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lock.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sched.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_rawread.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#9 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.56 2006/12/03 07:11:55 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.57 2007/01/28 21:34:07 wilko Exp $"); #include #include @@ -1058,7 +1058,7 @@ retval = 0; if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) { - warnx("error opening tranport layer device %s", XPT_DEVICE); + warnx("error opening transport layer device %s", XPT_DEVICE); warn("%s", XPT_DEVICE); return(1); } @@ -1244,7 +1244,7 @@ if (scan) { if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) { - warnx("error opening tranport layer device %s\n", + warnx("error opening transport layer device %s\n", XPT_DEVICE); warn("%s", XPT_DEVICE); return(1); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1176,7 +1176,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1184,7 +1183,7 @@ setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DE, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DB, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); - setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); + setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 1); setidt(IDT_BP, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt(IDT_OF, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_BR, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); @@ -1207,6 +1206,12 @@ lidt(&r_idt); /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); + + /* * Initialize the console before we print anything out. */ cninit(); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.280 2007/01/23 08:38:39 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -949,15 +949,12 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); if (ipi_bitmap & (1 << IPI_PREEMPT)) { + struct thread *running_thread = curthread; mtx_lock_spin(&sched_lock); - /* Don't preempt the idle thread */ - if (curthread != PCPU_GET(idlethread)) { - struct thread *running_thread = curthread; - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - } + if (running_thread->td_critnest > 1) + running_thread->td_owepreempt = 1; + else + mi_switch(SW_INVOL | SW_PREEMPT, NULL); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -120,6 +120,7 @@ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -176,6 +177,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -480,6 +480,30 @@ } int +msix_remap(int index, int irq) +{ + struct msi_intsrc *msi; + + sx_xlock(&msi_sx); + msi = (struct msi_intsrc *)intr_lookup_source(irq); + if (msi == NULL) { + sx_xunlock(&msi_sx); + return (ENOENT); + } + + /* Make sure this is an MSI-X message. */ + if (!msi->msi_msix) { + sx_xunlock(&msi_sx); + return (EINVAL); + } + + KASSERT(msi->msi_dev != NULL, ("unowned message")); + msi->msi_index = index; + sx_xunlock(&msi_sx); + return (0); +} + +int msix_release(int irq) { struct msi_intsrc *msi; ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -105,6 +105,7 @@ static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { @@ -135,6 +136,7 @@ DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), DEVMETHOD(pcib_release_msix, nexus_release_msix), { 0, 0 } @@ -510,6 +512,13 @@ } static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int nexus_release_msix(device_t pcib, device_t dev, int irq) { ==== //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#6 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -22,7 +22,8 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern struct mtx clock_lock; + +void i8254_init(void); /* * Driver to clock driver interface. ==== //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#9 (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/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -152,6 +152,7 @@ void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); int msix_release(int irq); #endif /* !LOCORE */ ==== //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); /* * Routines to handle clock hardware. @@ -103,11 +103,11 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) static int beeping = 0; +static struct mtx clock_lock; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; @@ -295,13 +295,6 @@ printf("DELAY(%d)...", n); #endif /* - * Guard against the timer being uninitialized if we are called - * early for console i/o. - */ - if (timer0_max_count == 0) - set_timer_freq(timer_freq, hz); - - /* * Read the counter first, so that the rest of the setup overhead is * counted. Guess the initial overhead is 20 usec (on most systems it * takes about 1.5 usec for each of the i/o's in getit(). The loop @@ -560,10 +553,15 @@ mtx_unlock_spin(&clock_lock); } -/* - * Initialize 8254 timer 0 early so that it can be used in DELAY(). - * XXX initialization of other timers is unintentionally left blank. - */ +/* This is separate from startrtclock() so that it can be called early. */ +void +i8254_init(void) +{ + + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + set_timer_freq(timer_freq, hz); +} + void startrtclock() { @@ -572,7 +570,6 @@ writertc(RTC_STATUSA, rtc_statusa); writertc(RTC_STATUSB, RTCSB_24HR); - set_timer_freq(timer_freq, hz); freq = calibrate_clocks(); #ifdef CLK_CALIBRATION_LOOP if (bootverbose) { ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#7 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.10 2006/12/20 20:17:34 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -662,6 +662,13 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 +#define LINUX_SO_PEERCRED 17 +#define LINUX_SO_RCVLOWAT 18 +#define LINUX_SO_SNDLOWAT 19 +#define LINUX_SO_RCVTIMEO 20 +#define LINUX_SO_SNDTIMEO 21 +#define LINUX_SO_TIMESTAMP 29 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 16:20:37 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 13:27:51 kib Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -453,14 +454,21 @@ linux_fork(struct thread *td, struct linux_fork_args *args) { int error; + struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(fork)) printf(ARGS(fork, "")); #endif - if ((error = fork(td, (struct fork_args *)args)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); + + if (error == 0) { + td->td_retval[0] = p2->p_pid; + td->td_retval[1] = 0; + } if (td->td_retval[1] == 1) td->td_retval[0] = 0; @@ -468,6 +476,14 @@ if (error) return (error); + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + return (0); } @@ -476,6 +492,7 @@ { int error; struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(vfork)) @@ -483,7 +500,7 @@ #endif /* exclude RFPPWAIT */ - if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { td->td_retval[0] = p2->p_pid; @@ -495,12 +512,25 @@ error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); + + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); + return (0); } @@ -523,7 +553,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (exit_signal >= LINUX_NSIG) + if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) @@ -561,6 +591,14 @@ error = fork1(td, ff, 0, &p2); if (error) return (error); + + if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + sx_xlock(&proctree_lock); + PROC_LOCK(p2); + proc_reparent(p2, td->td_proc->p_pptr); + PROC_UNLOCK(p2); + sx_xunlock(&proctree_lock); + } /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); @@ -580,14 +618,6 @@ } } - if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { - sx_xlock(&proctree_lock); - PROC_LOCK(p2); - proc_reparent(p2, td->td_proc->p_pptr); - PROC_UNLOCK(p2); - sx_xunlock(&proctree_lock); - } - if (args->flags & CLONE_THREAD) { /* XXX: linux mangles pgrp and pptr somehow * I think it might be this but I am not sure. @@ -632,13 +662,18 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif + if (args->flags & CLONE_VFORK) { + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + } /* * Make this runnable after we are finished with it. */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); - setrunqueue(td2, SRQ_BORING); + sched_add(td2, SRQ_BORING); mtx_unlock_spin(&sched_lock); td->td_retval[0] = p2->p_pid; @@ -647,7 +682,6 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); ==== //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.120 2007/01/22 21:48:42 jhb Exp $"); #include "opt_cpu.h" @@ -347,6 +347,7 @@ DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#14 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); #include #include #include @@ -157,7 +157,6 @@ #include #include #include -#include #include #include ==== //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#9 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.16 2007/02/03 07:46:26 kevlo Exp $"); #include #include @@ -203,7 +203,6 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ==== //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#8 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); #include "opt_comconsole.h" @@ -94,7 +94,7 @@ static void at91_usart_init(struct uart_bas *bas, int, int, int, int); static void at91_usart_term(struct uart_bas *bas); static void at91_usart_putc(struct uart_bas *bas, int); -static int at91_usart_poll(struct uart_bas *bas); +static int at91_usart_rxready(struct uart_bas *bas); static int at91_usart_getc(struct uart_bas *bas, struct mtx *mtx); extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; @@ -201,7 +201,7 @@ .init = at91_usart_init, .term = at91_usart_term, .putc = at91_usart_putc, - .poll = at91_usart_poll, + .rxready = at91_usart_rxready, .getc = at91_usart_getc, }; @@ -252,15 +252,13 @@ } /* - * Poll for a character available + * Check for a character available. */ static int -at91_usart_poll(struct uart_bas *bas) +at91_usart_rxready(struct uart_bas *bas) { - if (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) - return (-1); - return (RD4(bas, USART_RHR) & 0xff); + return ((RD4(bas, USART_CSR) & USART_CSR_RXRDY) != 0 ? 1 : 0); } /* ==== //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.6 2006/06/07 11:28:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $"); #include #include @@ -52,7 +52,7 @@ static void sa1110_init(struct uart_bas *bas, int, int, int, int); static void sa1110_term(struct uart_bas *bas); static void sa1110_putc(struct uart_bas *bas, int); -static int sa1110_poll(struct uart_bas *bas); +static int sa1110_rxready(struct uart_bas *bas); static int sa1110_getc(struct uart_bas *bas, struct mtx *mtx); extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; @@ -62,7 +62,7 @@ .init = sa1110_init, .term = sa1110_term, .putc = sa1110_putc, - .poll = sa1110_poll, + .rxready = sa1110_rxready, .getc = sa1110_getc, }; @@ -102,11 +102,10 @@ } static int -sa1110_poll(struct uart_bas *bas) +sa1110_rxready(struct uart_bas *bas) { - if (!(uart_getreg(bas, SACOM_SR1) & SR1_RNE)) - return (-1); - return (uart_getreg(bas, SACOM_DR) & 0xff); + + return ((uart_getreg(bas, SACOM_SR1) & SR1_RNE) != 0 ? 1 : 0); } static int ==== //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.3 2007/02/02 05:14:21 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -274,7 +274,7 @@ #ifdef DDB vm_offset_t zstart = 0, zend = 0; #endif - int i = 0; + int i; uint32_t fake_preload[35]; uint32_t memsize; ==== //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.2 2007/01/17 00:58:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.4 2007/02/03 07:46:26 kevlo Exp $"); /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 5 21:23:02 2007 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 4268716A40E; Mon, 5 Feb 2007 21:22:59 +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 2001B16A400 for ; Mon, 5 Feb 2007 21:22:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4AAE13C4B4 for ; Mon, 5 Feb 2007 21:22:46 +0000 (UTC) (envelope-from scottl@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 l15LMkAk054747 for ; Mon, 5 Feb 2007 21:22:46 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15LMk0O054741 for perforce@freebsd.org; Mon, 5 Feb 2007 21:22:46 GMT (envelope-from scottl@freebsd.org) Date: Mon, 5 Feb 2007 21:22:46 GMT Message-Id: <200702052122.l15LMk0O054741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114071 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: Mon, 05 Feb 2007 21:23:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=114071 Change 114071 by scottl@scottl-x64 on 2007/02/05 21:22:24 Make the ahc driver compile. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#9 (text+ko) ==== @@ -146,6 +146,7 @@ void *ih; eventhandler_tag eh; struct proc *recovery_thread; + struct mtx mtx; }; struct scb_platform_data { From owner-p4-projects@FreeBSD.ORG Mon Feb 5 22:38:38 2007 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 2DD9016A400; Mon, 5 Feb 2007 22:38:25 +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 10CDF16A409 for ; Mon, 5 Feb 2007 22:38:25 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0B44013C4AA for ; Mon, 5 Feb 2007 22:38:23 +0000 (UTC) (envelope-from scottl@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 l15McM3h068493 for ; Mon, 5 Feb 2007 22:38:22 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15McMIY068490 for perforce@freebsd.org; Mon, 5 Feb 2007 22:38:22 GMT (envelope-from scottl@freebsd.org) Date: Mon, 5 Feb 2007 22:38:22 GMT Message-Id: <200702052238.l15McMIY068490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114077 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: Mon, 05 Feb 2007 22:38:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=114077 Change 114077 by scottl@scottl-x64 on 2007/02/05 22:37:57 Add locking stubs for ahc. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#10 (text+ko) ==== @@ -204,18 +204,19 @@ static __inline void ahc_lockinit(struct ahc_softc *ahc) { + mtx_init(&ahc->platform_data->mtx, "ahc_lock", NULL, MTX_DEF); } static __inline void ahc_lock(struct ahc_softc *ahc, unsigned long *flags) { - *flags = splcam(); + mtx_lock(&ahc->platform_data->mtx); } static __inline void ahc_unlock(struct ahc_softc *ahc, unsigned long *flags) { - splx(*flags); + mtx_unlock(&ahc->platform_data->mtx); } /* Lock held during command compeletion to the upper layer */ From owner-p4-projects@FreeBSD.ORG Tue Feb 6 00:31:53 2007 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 4A9B316A4CD; Tue, 6 Feb 2007 00:31:48 +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 1126A16A4B3 for ; Tue, 6 Feb 2007 00:31:48 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D3A5F13C4A6 for ; Tue, 6 Feb 2007 00:31:47 +0000 (UTC) (envelope-from scottl@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 l160Vl2q091207 for ; Tue, 6 Feb 2007 00:31:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l160VlvH091200 for perforce@freebsd.org; Tue, 6 Feb 2007 00:31:47 GMT (envelope-from scottl@freebsd.org) Date: Tue, 6 Feb 2007 00:31:47 GMT Message-Id: <200702060031.l160VlvH091200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114080 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: Tue, 06 Feb 2007 00:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=114080 Change 114080 by scottl@scottl-x64 on 2007/02/06 00:31:27 Remove the malloc_flags argument from cam_sim_alloc. It was unsightly and not really needed. Clean up xpt_attach() to compensate. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#9 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#8 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#49 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#11 edit .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#10 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#17 edit .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#19 edit .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#9 (text+ko) ==== @@ -60,7 +60,7 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, - struct mtx *mtx, int malloc_flags, int max_dev_transactions, + struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue) { struct cam_sim *sim; @@ -69,7 +69,7 @@ return (NULL); sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, malloc_flags); + M_CAMSIM, M_NOWAIT); if (sim == NULL) return (NULL); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#8 (text+ko) ==== @@ -57,7 +57,6 @@ void *softc, u_int32_t unit, struct mtx *mtx, - int malloc_flags, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#49 (text+ko) ==== @@ -746,7 +746,7 @@ NULL }; -static void xpt_init(void *); +static int xpt_init(void *); DECLARE_MODULE(cam, cam_moduledata, SI_SUB_CONFIGURE, SI_ORDER_SECOND); MODULE_VERSION(cam, 1); @@ -1387,11 +1387,16 @@ static int cam_module_event_handler(module_t mod, int what, void *arg) { - if (what == MOD_LOAD) { - xpt_init(NULL); - } else if (what == MOD_UNLOAD) { + int error; + + switch (what) { + case MOD_LOAD: + if ((error = xpt_init(NULL)) != 0) + return (error); + break; + case MOD_UNLOAD: return EBUSY; - } else { + default: return EOPNOTSUPP; } @@ -1399,7 +1404,7 @@ } /* Functions accessed by the peripheral drivers */ -static void +static int xpt_init(dummy) void *dummy; { @@ -1429,16 +1434,18 @@ /*softc*/NULL, /*unit*/0, /*mtx*/&Giant, - /*flags*/M_WAITOK, /*max_dev_transactions*/0, /*max_tagged_dev_transactions*/0, devq); + if (xpt_sim == NULL) + return (ENOMEM); + xpt_sim->max_ccbs = 16; if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { printf("xpt_init: xpt_bus_register failed with status %#x," " failing attach\n", status); - return; + return (EINVAL); } /* @@ -1451,7 +1458,7 @@ CAM_LUN_WILDCARD)) != CAM_REQ_CMP) { printf("xpt_init: xpt_create_path failed with status %#x," " failing attach\n", status); - return; + return (EINVAL); } cam_periph_alloc(xptregister, NULL, NULL, NULL, "xpt", CAM_PERIPH_BIO, @@ -1467,7 +1474,7 @@ if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); - return; + return (ENOMEM); } xsoftc.xpt_config_hook->ich_func = xpt_config; @@ -1479,6 +1486,8 @@ /* Install our software interrupt handlers */ swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + + return (0); } static cam_status ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#11 (text+ko) ==== @@ -1343,8 +1343,7 @@ slp->sl_si.sim = cam_sim_alloc(scsi_low_scsi_action_cam, scsi_low_poll_cam, DEVPORT_DEVNAME(slp->sl_dev), slp, - DEVPORT_DEVUNIT(slp->sl_dev), - &Giant, M_NOWAIT, + DEVPORT_DEVUNIT(slp->sl_dev), &Giant, slp->sl_openings, tagged_openings, devq); if (slp->sl_si.sim == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#9 (text+ko) ==== @@ -171,7 +171,7 @@ return (EIO); sim = cam_sim_alloc(aac_cam_action, aac_cam_poll, "aacp", camsc, - device_get_unit(dev), &Giant, M_NOWAIT, 1, 1, devq); + device_get_unit(dev), &Giant, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); return (EIO); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#9 (text+ko) ==== @@ -1414,7 +1414,7 @@ * Construct our SIM entry. */ adv->sim = cam_sim_alloc(adv_action, adv_poll, "adv", adv, adv->unit, - &Giant, M_NOWAIT, 1, adv->max_openings, devq); + &Giant, 1, adv->max_openings, devq); if (adv->sim == NULL) return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#8 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#7 (text+ko) ==== @@ -606,7 +606,7 @@ * Construct our SIM entry */ aha->sim = cam_sim_alloc(ahaaction, ahapoll, "aha", aha, aha->unit, - &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); + &Giant, 2, tagged_dev_openings, devq); if (aha->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#8 (text+ko) ==== @@ -550,7 +550,7 @@ * Construct our SIM entry */ ahb->sim = cam_sim_alloc(ahbaction, ahbpoll, "ahb", ahb, ahb->unit, - &Giant, M_NOWAIT, 2, ahb->num_ecbs, devq); + &Giant, 2, ahb->num_ecbs, devq); if (ahb->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#5 (text+ko) ==== @@ -1543,7 +1543,7 @@ * Construct our SIM entry */ aic->sim = cam_sim_alloc(aic_action, aic_poll, "aic", aic, - aic->unit, &Giant, M_NOWAIT, 2, 256, devq); + aic->unit, &Giant, 2, 256, devq); if (aic->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#12 (text+ko) ==== @@ -147,7 +147,7 @@ */ sim = cam_sim_alloc(ahd_action, ahd_poll, "ahd", ahd, device_get_unit(ahd->dev_softc), - &ahd->platform_data->mtx, M_NOWAIT, 1, /*XXX*/256, devq); + &ahd->platform_data->mtx, 1, /*XXX*/256, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#9 (text+ko) ==== @@ -196,7 +196,7 @@ */ sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, M_NOWAIT, 1, AHC_MAX_QUEUE, devq); + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -228,8 +228,7 @@ if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, M_NOWAIT, 1, - AHC_MAX_QUEUE, devq); + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim2 == NULL) { printf("ahc_attach: Unable to attach second " ==== //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#8 (text+ko) ==== @@ -2482,7 +2482,7 @@ } amd->psim = cam_sim_alloc(amd_action, amd_poll, "amd", - amd, amd->unit, &Giant, M_NOWAIT, + amd, amd->unit, &Giant, 1, MAX_TAGS_CMD_QUEUE, devq); if (amd->psim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#7 (text+ko) ==== @@ -149,7 +149,6 @@ sc, device_get_unit(sc->amr_dev), &Giant, - M_NOWAIT, 1, AMR_MAX_SCSI_CMDS, devq)) == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#8 (text+ko) ==== @@ -2134,8 +2134,8 @@ printf("arcmsr%d: cam_simq_alloc failure!\n", unit); return ENXIO; } - acb->psim=cam_sim_alloc(arcmsr_action, arcmsr_poll - , "arcmsr", acb, unit, &Giant, M_NOWAIT, 1, + acb->psim=cam_sim_alloc(arcmsr_action, arcmsr_poll, + "arcmsr", acb, unit, &Giant, 1, ARCMSR_MAX_OUTSTANDING_CMD, devq); if(acb->psim == NULL) { arcmsr_free_resource(acb); ==== //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#10 (text+ko) ==== @@ -2651,7 +2651,7 @@ * Construct our first channel SIM entry */ sc->ha_sim[bus] = cam_sim_alloc(asr_action, asr_poll, "asr", sc, - unit, &Giant, M_NOWAIT, + unit, &Giant, 1, QueueSize, devq); if (sc->ha_sim[bus] == NULL) { continue; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#8 (text+ko) ==== @@ -210,7 +210,7 @@ } if ((sim = cam_sim_alloc(atapi_action, atapi_poll, "ata", - (void *)scp, unit, &Giant, M_NOWAIT, 1, 1, devq)) == NULL) { + (void *)scp, unit, &Giant, 1, 1, devq)) == NULL) { error = ENOMEM; goto out; } ==== //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#7 (text+ko) ==== @@ -874,7 +874,7 @@ * Construct our SIM entry */ bt->sim = cam_sim_alloc(btaction, btpoll, "bt", bt, bt->unit, - &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); + &Giant, 2, tagged_dev_openings, devq); if (bt->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#12 (text+ko) ==== @@ -2476,7 +2476,7 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - &Giant, M_NOWAIT, 1, + &Giant, 1, sc->ciss_max_requests - 2, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); @@ -2499,7 +2499,7 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - &Giant, M_NOWAIT, 1, + &Giant, 1, sc->ciss_max_requests - 2, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); ==== //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#9 (text+ko) ==== @@ -1567,7 +1567,7 @@ */ dpt->sims[i] = cam_sim_alloc(dpt_action, dpt_poll, "dpt", dpt, dpt->unit, &Giant, - M_NOWAIT, /*untagged*/2, + /*untagged*/2, /*tagged*/dpt->max_dccbs, devq); if (dpt->sims[i] == NULL) { if (i == 0) ==== //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#7 (text+ko) ==== @@ -325,7 +325,7 @@ } sim = cam_sim_alloc(ncr53c9x_action, ncr53c9x_poll, "esp", sc, - device_get_unit(sc->sc_dev), &Giant, M_NOWAIT, 1, + device_get_unit(sc->sc_dev), &Giant, 1, NCR_TAG_DEPTH, devq); if (sim == NULL) { device_printf(sc->sc_dev, "cannot allocate SIM entry\n"); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#7 (text+ko) ==== @@ -1960,7 +1960,7 @@ sbp->sim = cam_sim_alloc(sbp_action, sbp_poll, "sbp", sbp, device_get_unit(dev), - &Giant, M_NOWAIT, + &Giant, /*untagged*/ 1, /*tagged*/ SBP_QUEUE_LEN - 1, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#5 (text+ko) ==== @@ -1627,7 +1627,7 @@ return (ENXIO); sc->sim = cam_sim_alloc(sbp_targ_action, sbp_targ_poll, - "sbp_targ", sc, device_get_unit(dev), &Giant, M_NOWAIT, + "sbp_targ", sc, device_get_unit(dev), &Giant, /*untagged*/ 1, /*tagged*/ 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#7 (text+ko) ==== @@ -1961,7 +1961,7 @@ */ if ((hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME), pAdapter, device_get_unit(pAdapter->hpt_dev), - &Giant, M_NOWAIT, /*untagged*/1, /*tagged*/8, devq)) == NULL) { + &Giant, /*untagged*/1, /*tagged*/8, devq)) == NULL) { cam_simq_free(devq); return ENOMEM; } ==== //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#9 (text+ko) ==== @@ -503,7 +503,7 @@ */ gdt->sims[i] = cam_sim_alloc(iir_action, iir_poll, "iir", gdt, gdt->sc_hanum, &Giant, - M_NOWAIT, /*untagged*/1, + /*untagged*/1, /*tagged*/GDT_MAXCMDS, devq); if (xpt_bus_register(gdt->sims[i], i) != CAM_SUCCESS) { cam_sim_free(gdt->sims[i], /*free_devq*/i == 0); ==== //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#17 (text+ko) ==== @@ -136,8 +136,7 @@ */ ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, - isp->isp_maxcmds, devq); + device_get_unit(isp->isp_dev), &Giant, 1, isp->isp_maxcmds, devq); if (sim == NULL) { cam_simq_free(devq); CAMLOCK_2_ISPLOCK(isp); @@ -224,7 +223,7 @@ if (IS_DUALBUS(isp)) { ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, + device_get_unit(isp->isp_dev), &Giant, 1, isp->isp_maxcmds, devq); if (sim == NULL) { xpt_bus_deregister(cam_sim_path(isp->isp_sim)); ==== //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#7 (text+ko) ==== @@ -1945,7 +1945,7 @@ if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), - &Giant, M_NOWAIT, + &Giant, sc->mly_controllerinfo->maximum_parallel_commands, 1, devq)) == NULL) { return(ENOMEM); @@ -1965,7 +1965,7 @@ for (i = 0; i < sc->mly_controllerinfo->virtual_channels_present; i++, chn++) { if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), - &Giant, M_NOWAIT, + &Giant, sc->mly_controllerinfo->maximum_parallel_commands, 0, devq)) == NULL) { return(ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#19 (text+ko) ==== @@ -318,7 +318,7 @@ * Construct our SIM entry. */ mpt->sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, &mpt->mpt_lock, M_NOWAIT, 1, maxq, devq); + mpt->unit, &mpt->mpt_lock, 1, maxq, devq); if (mpt->sim == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIM!\n"); cam_simq_free(devq); @@ -358,7 +358,7 @@ * Create a "bus" to export all hidden disks to CAM. */ mpt->phydisk_sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, &mpt->mpt_lock, M_NOWAIT, 1, maxq, devq); + mpt->unit, &mpt->mpt_lock, 1, maxq, devq); if (mpt->phydisk_sim == NULL) { mpt_prt(mpt, "Unable to allocate Physical Disk CAM SIM!\n"); error = ENOMEM; ==== //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#5 (text+ko) ==== @@ -162,8 +162,7 @@ return (ENXIO); vpo->sim = cam_sim_alloc(vpo_action, vpo_poll, "vpo", vpo, - device_get_unit(dev), - &Giant, M_NOWAIT, + device_get_unit(dev), &Giant, /*untagged*/1, /*tagged*/0, devq); if (vpo->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#4 (text) ==== @@ -1088,7 +1088,7 @@ } vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name, - vbus_ext, 0, &Giant, M_NOWAIT, + vbus_ext, 0, &Giant, os_max_queue_comm, /*tagged*/8, devq); if (!vbus_ext->sim) { ==== //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#9 (text+ko) ==== @@ -8973,7 +8973,7 @@ * Construct our SIM entry. */ sim = cam_sim_alloc(sym_action, sym_poll, "sym", np, np->unit, - &Giant, M_NOWAIT, 1, SYM_SETUP_MAX_TAG, devq); + &Giant, 1, SYM_SETUP_MAX_TAG, devq); if (!sim) goto fail; devq = 0; ==== //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#9 (text+ko) ==== @@ -3637,7 +3637,6 @@ pACB, unit, &Giant, - M_NOWAIT, 1, TRM_MAX_TAGS_CMD_QUEUE, device_Q); ==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#7 (text+ko) ==== @@ -102,7 +102,7 @@ */ tw_osli_dbg_dprintf(3, sc, "Calling cam_sim_alloc"); sc->sim = cam_sim_alloc(twa_action, twa_poll, "twa", sc, - device_get_unit(sc->bus_dev), &Giant, M_NOWAIT, + device_get_unit(sc->bus_dev), &Giant, TW_OSLI_MAX_NUM_IOS - 1, 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -2251,7 +2251,7 @@ DEVNAME_SIM, sc /*priv*/, device_get_unit(sc->sc_dev) /*unit number*/, - &Giant, M_NOWAIT, + &Giant, 1 /*maximum device openings*/, 0 /*maximum tagged device openings*/, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#6 (text+ko) ==== @@ -607,7 +607,7 @@ goto bad; sim = cam_sim_alloc(wds_action, wds_poll, "wds", (void *) wp, - wp->unit, &Giant, M_NOWAIT, 1, 1, devq); + wp->unit, &Giant, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); goto bad; From owner-p4-projects@FreeBSD.ORG Tue Feb 6 00:51:32 2007 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 DC37A16A403; Tue, 6 Feb 2007 00:51:20 +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 4B18416A401 for ; Tue, 6 Feb 2007 00:51:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4800113C474 for ; Tue, 6 Feb 2007 00:51:13 +0000 (UTC) (envelope-from scottl@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 l160pDlF002199 for ; Tue, 6 Feb 2007 00:51:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l160pDvm002190 for perforce@freebsd.org; Tue, 6 Feb 2007 00:51:13 GMT (envelope-from scottl@freebsd.org) Date: Tue, 6 Feb 2007 00:51:13 GMT Message-Id: <200702060051.l160pDvm002190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114082 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: Tue, 06 Feb 2007 00:51:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114082 Change 114082 by scottl@scottl-x64 on 2007/02/06 00:51:12 Remove the malloc_flags argument from cam_sim_alloc() Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#9 edit .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#9 (text+ko) ==== @@ -1234,7 +1234,7 @@ * Construct our SIM entry. */ adw->sim = cam_sim_alloc(adw_action, adw_poll, "adw", adw, adw->unit, - &Giant, M_NOWAIT, 1, adw->max_acbs, devq); + &Giant, 1, adw->max_acbs, devq); if (adw->sim == NULL) { error = ENOMEM; goto fail; ==== //depot/projects/scottl-camlock/src/sys/pci/ncr.c#10 (text+ko) ==== @@ -3783,7 +3783,7 @@ ** about our bus. */ np->sim = cam_sim_alloc(ncr_action, ncr_poll, "ncr", np, np->unit, - &Giant, M_NOWAIT, 1, MAX_TAGS, devq); + &Giant, 1, MAX_TAGS, devq); if (np->sim == NULL) { cam_simq_free(devq); return ENOMEM; From owner-p4-projects@FreeBSD.ORG Tue Feb 6 00:52:30 2007 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 92F1D16A409; Tue, 6 Feb 2007 00:52:17 +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 58A5716A4C0 for ; Tue, 6 Feb 2007 00:52:15 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 118DA13C4A8 for ; Tue, 6 Feb 2007 00:52:15 +0000 (UTC) (envelope-from scottl@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 l160qEue002797 for ; Tue, 6 Feb 2007 00:52:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l160qEWP002793 for perforce@freebsd.org; Tue, 6 Feb 2007 00:52:14 GMT (envelope-from scottl@freebsd.org) Date: Tue, 6 Feb 2007 00:52:14 GMT Message-Id: <200702060052.l160qEWP002793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 114083 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: Tue, 06 Feb 2007 00:52:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114083 Change 114083 by scottl@scottl-x64 on 2007/02/06 00:51:50 Clean up a LINT problem. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#22 (text+ko) ==== @@ -572,10 +572,6 @@ return (ENXIO); } - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, - ("daopen: disk=%s%d (unit %d)\n", dp->d_name, dp->d_unit, - unit)); - if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) return (error); /* error code from tsleep */ @@ -588,6 +584,10 @@ softc = (struct da_softc *)periph->softc; softc->flags |= DA_FLAG_OPEN; + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, + ("daopen: disk=%s%d (unit %d)\n", dp->d_name, dp->d_unit, + unit)); + if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) { /* Invalidate our pack information. */ softc->flags &= ~DA_FLAG_PACK_INVALID; From owner-p4-projects@FreeBSD.ORG Tue Feb 6 01:20:54 2007 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 3D19616A4CB; Tue, 6 Feb 2007 01:20:53 +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 2042916A4C6 for ; Tue, 6 Feb 2007 01:20:53 +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 01DEC13C4A5 for ; Tue, 6 Feb 2007 01:20:53 +0000 (UTC) (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 l161KroW007999 for ; Tue, 6 Feb 2007 01:20:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l161Kq0P007994 for perforce@freebsd.org; Tue, 6 Feb 2007 01:20:52 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 01:20:52 GMT Message-Id: <200702060120.l161Kq0P007994@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 114084 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: Tue, 06 Feb 2007 01:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=114084 Change 114084 by piso@piso_newluxor on 2007/02/06 01:19:53 o introduce an opaque type (pkt_t) to avoid #ifdef _KERNEL ... #else ... #endif all the function declarations. o update all the code to handled the switch from *mbuf to **mbuf. o XXX there're some printfs debug around. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#55 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#14 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#23 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#21 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#20 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#55 (text+ko) ==== @@ -258,20 +258,20 @@ /* Local prototypes */ static int IcmpAliasIn1(struct libalias *, struct ip *); static int IcmpAliasIn2(struct libalias *, struct ip *); -static int IcmpAliasIn(struct libalias *, void *); +static int IcmpAliasIn(struct libalias *, pkt_t); static int IcmpAliasOut1(struct libalias *, struct ip *, int create); static int IcmpAliasOut2(struct libalias *, struct ip *); -static int IcmpAliasOut(struct libalias *, void *, int create); +static int IcmpAliasOut(struct libalias *, pkt_t, int create); static int ProtoAliasIn(struct libalias *, struct ip *); static int ProtoAliasOut(struct libalias *, struct ip *, int create); -static int UdpAliasIn(struct libalias *, void *); -static int UdpAliasOut(struct libalias *, void *, int create); +static int UdpAliasIn(struct libalias *, pkt_t); +static int UdpAliasOut(struct libalias *, pkt_t, int create); -static int TcpAliasIn(struct libalias *, void *); -static int TcpAliasOut(struct libalias *, void *, int, int create); +static int TcpAliasIn(struct libalias *, pkt_t); +static int TcpAliasOut(struct libalias *, pkt_t, int, int create); static int @@ -420,7 +420,7 @@ static int -IcmpAliasIn(struct libalias *la, void *ptr) +IcmpAliasIn(struct libalias *la, pkt_t ptr) { int iresult; struct ip *pip; @@ -609,7 +609,7 @@ static int -IcmpAliasOut(struct libalias *la, void *ptr, int create) +IcmpAliasOut(struct libalias *la, pkt_t ptr, int create) { int iresult; struct icmp *ic; @@ -721,7 +721,7 @@ static int -UdpAliasIn(struct libalias *la, void *ptr) +UdpAliasIn(struct libalias *la, pkt_t ptr) { struct ip *pip; struct udphdr *ud; @@ -791,7 +791,7 @@ } static int -UdpAliasOut(struct libalias *la, void *ptr, int create) +UdpAliasOut(struct libalias *la, pkt_t ptr, int create) { struct ip *pip; struct udphdr *ud; @@ -858,7 +858,7 @@ static int -TcpAliasIn(struct libalias *la, void *ptr) +TcpAliasIn(struct libalias *la, pkt_t ptr) { struct ip *pip; struct tcphdr *tc; @@ -983,7 +983,7 @@ } static int -TcpAliasOut(struct libalias *la, void *ptr, int maxpacketsize, int create) +TcpAliasOut(struct libalias *la, pkt_t ptr, int maxpacketsize, int create) { int proxy_type, error; u_short dest_port, src_port; @@ -1179,11 +1179,7 @@ int -#ifdef _KERNEL -LibAliasSaveFragment(struct libalias *la, struct mbuf *ptr) -#else -LibAliasSaveFragment(struct libalias *la, char *ptr) -#endif +LibAliasSaveFragment(struct libalias *la, pkt_t ptr) { int iresult; struct alias_link *lnk; @@ -1207,11 +1203,10 @@ #ifdef _KERNEL struct mbuf * -LibAliasGetFragment(struct libalias *la, struct mbuf *ptr) #else -char * -LibAliasGetFragment(struct libalias *la, char *ptr) +char * #endif +LibAliasGetFragment(struct libalias *la, pkt_t ptr) { struct alias_link *lnk; #ifdef _KERNEL @@ -1239,19 +1234,13 @@ return (fptr); } -#ifdef _KERNEL void -LibAliasFragmentIn(struct libalias *la, struct mbuf *ptr, - struct mbuf *ptr_fragment) -#else -void -LibAliasFragmentIn(struct libalias *la, char *ptr, /* Points to correctly +LibAliasFragmentIn(struct libalias *la, pkt_t ptr, /* Points to correctly * de-aliased header * fragment */ - char *ptr_fragment /* Points to fragment which must be + pkt_t ptr_fragment /* Points to fragment which must be * de-aliased */ ) -#endif { struct ip *pip; struct ip *fpip; @@ -1276,18 +1265,14 @@ /* Local prototypes */ static int -LibAliasOutLocked(struct libalias *la, void *ptr, +LibAliasOutLocked(struct libalias *la, pkt_t ptr, int maxpacketsize, int create); static int -LibAliasInLocked(struct libalias *la, void *ptr, +LibAliasInLocked(struct libalias *la, pkt_t ptr, int maxpacketsize); int -#ifdef _KERNEL -LibAliasIn(struct libalias *la, struct mbuf *ptr, int maxpacketsize) -#else -LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize) -#endif +LibAliasIn(struct libalias *la, pkt_t ptr, int maxpacketsize) { int res; @@ -1298,7 +1283,7 @@ } static int -LibAliasInLocked(struct libalias *la, void *ptr, int maxpacketsize) +LibAliasInLocked(struct libalias *la, pkt_t ptr, int maxpacketsize) { struct in_addr alias_addr; struct ip *pip; @@ -1329,7 +1314,9 @@ iresult = IcmpAliasIn(la, ptr); break; case IPPROTO_UDP: + printf("bef UdpAliasIn: %u\n", iresult); iresult = UdpAliasIn(la, ptr); + printf("aft UdpAliasIn: %u\n", iresult); break; case IPPROTO_TCP: iresult = TcpAliasIn(la, ptr); @@ -1396,11 +1383,7 @@ #define UNREG_ADDR_C_UPPER 0xc0a8ffff int -#ifdef _KERNEL -LibAliasOut(struct libalias *la, struct mbuf *ptr, int maxpacketsize) -#else -LibAliasOut(struct libalias *la, char *ptr, int maxpacketsize) -#endif +LibAliasOut(struct libalias *la, pkt_t ptr, int maxpacketsize) { int res; @@ -1411,11 +1394,7 @@ } int -#ifdef _KERNEL -LibAliasOutTry(struct libalias *la, struct mbuf *ptr, int maxpacketsize, int create) -#else -LibAliasOutTry(struct libalias *la, char *ptr, int maxpacketsize, int create) -#endif +LibAliasOutTry(struct libalias *la, pkt_t ptr, int maxpacketsize, int create) { int res; @@ -1426,7 +1405,7 @@ } static int -LibAliasOutLocked(struct libalias *la, void *ptr, /* valid IP packet */ +LibAliasOutLocked(struct libalias *la, pkt_t ptr, /* valid IP packet */ int maxpacketsize, /* How much the packet data may grow (FTP * and IRC inline changes) */ int create /* Create new entries ? */ @@ -1441,18 +1420,23 @@ la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasInLocked(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; + printf("PKT_ALIAS_REVERSE\n"); goto getout; } HouseKeeping(la); ClearCheckNewLink(la); PULLUP_IPHDR(pip, ptr); - if (pip == NULL) + if (pip == NULL) { + printf("failed PULLUP_IPHDR\n"); goto getout; + } /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) + || (pip->ip_hl << 2) > maxpacketsize) { + printf("mangled pkt\n"); goto getout; + } addr_save = GetDefaultAliasAddress(la); if (la->packetAliasMode & PKT_ALIAS_UNREGISTERED_ONLY) { @@ -1480,9 +1464,11 @@ iresult = IcmpAliasOut(la, ptr, create); break; case IPPROTO_UDP: + printf("bef UdpAliasOut: %u\n", iresult); iresult = UdpAliasOut(la, ptr, create); + printf("aft UdpAliasOut: %u\n", iresult); break; - case IPPROTO_TCP: + case IPPROTO_TCP: iresult = TcpAliasOut(la, ptr, maxpacketsize, create); break; case IPPROTO_GRE: { @@ -1519,15 +1505,9 @@ } int -#ifdef _KERNEL -LibAliasUnaliasOut(struct libalias *la, struct mbuf *ptr, /* valid IP packet */ +LibAliasUnaliasOut(struct libalias *la, pkt_t ptr, /* valid IP packet */ int maxpacketsize /* for error checking */ ) -#else -LibAliasUnaliasOut(struct libalias *la, char *ptr, /* valid IP packet */ - int maxpacketsize /* for error checking */ -) -#endif { struct ip *pip; struct icmp *ic; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#14 (text+ko) ==== @@ -146,10 +146,10 @@ /* Packet Handling functions. */ #ifdef _KERNEL -int LibAliasIn (struct libalias *, struct mbuf *_ptr, int _maxpacketsize); -int LibAliasOut(struct libalias *, struct mbuf *_ptr, int _maxpacketsize); -int LibAliasOutTry(struct libalias *, struct mbuf *_ptr, int _maxpacketsize, int _create); -int LibAliasUnaliasOut(struct libalias *, struct mbuf *_ptr, int _maxpacketsize); +int LibAliasIn (struct libalias *, struct mbuf **_ptr, int _maxpacketsize); +int LibAliasOut(struct libalias *, struct mbuf **_ptr, int _maxpacketsize); +int LibAliasOutTry(struct libalias *, struct mbuf **_ptr, int _maxpacketsize, int _create); +int LibAliasUnaliasOut(struct libalias *, struct mbuf **_ptr, int _maxpacketsize); #else int LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize); int LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize); @@ -179,10 +179,10 @@ /* Fragment Handling functions. */ #ifdef _KERNEL -void LibAliasFragmentIn(struct libalias *, struct mbuf *_ptr, - struct mbuf *_ptr_fragment); -struct mbuf *LibAliasGetFragment(struct libalias *, struct mbuf *_ptr); -int LibAliasSaveFragment(struct libalias *, struct mbuf *_ptr); +void LibAliasFragmentIn(struct libalias *, struct mbuf **_ptr, + struct mbuf **_ptr_fragment); +struct mbuf *LibAliasGetFragment(struct libalias *, struct mbuf **_ptr); +int LibAliasSaveFragment(struct libalias *, struct mbuf **_ptr); #else void LibAliasFragmentIn(struct libalias *, char *_ptr, char *_ptr_fragment); char *LibAliasGetFragment(struct libalias *, char *_ptr); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#23 (text+ko) ==== @@ -1819,14 +1819,16 @@ void #ifdef _KERNEL -SetFragmentPtr(struct alias_link *lnk, struct mbuf *fptr) +SetFragmentPtr(struct alias_link *lnk, struct mbuf **fptr) +{ + lnk->data.frag_ptr = *fptr; +} #else SetFragmentPtr(struct alias_link *lnk, char *fptr) -#endif { lnk->data.frag_ptr = fptr; } - +#endif void #ifdef _KERNEL ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#21 (text+ko) ==== @@ -177,52 +177,54 @@ #endif #ifdef _KERNEL +typedef struct mbuf ** pkt_t; #define PULLUP_IPHDR(pip, ptr) do { \ - ptr = m_pullup((ptr), sizeof(struct ip)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + *ptr = m_pullup((*ptr), sizeof(struct ip)); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) #define PULLUP_UDPHDR(pip, ptr) do { \ - pip = mtod((struct mbuf *)ptr, struct ip *); \ - ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) #define PULLUP_TCPHDR(pip, ptr) do { \ - pip = mtod((struct mbuf *)ptr, struct ip *); \ - ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) #define PULLUP_ICMPHDR(pip, ptr) do { \ - pip = mtod((struct mbuf *)ptr, struct ip *); \ - ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) #define PULLUP_ICMPIP64(pip, ptr, ic) do { \ int s; \ - pip = mtod((struct mbuf *)ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ - ptr = m_pullup((ptr), s); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + *ptr = m_pullup((*ptr), s); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) #define PULLUP_IPTCPHDR(pip, ptr) do { \ - ptr = m_pullup((ptr), sizeof(struct ip)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ - ptr = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod((struct mbuf *)ptr, struct ip *); \ + *ptr = m_pullup((*ptr), sizeof(struct ip)); \ + (pip) = mtod(*ptr, struct ip *); \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod(*ptr, struct ip *); \ } while (0) +#else +typedef char * pkt_t; -#else #define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr -#define PULLUP_UDPHDR(pip, ptr) pip = ptr -#define PULLUP_TCPHDR(pip, ptr) pip = ptr +#define PULLUP_UDPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_TCPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr -#define PULLUP_ICMPIP64(pip, ptr, ic) pip = ptr +#define PULLUP_ICMPIP64(pip, ptr, ic) pip = (struct ip *)ptr #define PULLUP_IPTCPHDR(pip, ptr) pip = (struct ip *)ptr #endif @@ -328,7 +330,7 @@ void SetFragmentAddr(struct alias_link *_lnk, struct in_addr _src_addr); #ifdef _KERNEL void GetFragmentPtr(struct alias_link *_lnk, struct mbuf **_fptr); -void SetFragmentPtr(struct alias_link *_lnk, struct mbuf *fptr); +void SetFragmentPtr(struct alias_link *_lnk, struct mbuf **fptr); #else void GetFragmentPtr(struct alias_link *_lnk, char **_fptr); void SetFragmentPtr(struct alias_link *_lnk, char *fptr); @@ -381,7 +383,7 @@ ProxyCheck(struct libalias *la, struct ip *_pip, struct in_addr *_proxy_server_addr, u_short * _proxy_server_port, u_short dst_port); void -ProxyModify(struct libalias *la, struct alias_link *_lnk, void *_pip, +ProxyModify(struct libalias *la, struct alias_link *_lnk, pkt_t, int _maxpacketsize, int _proxy_type, u_short src_port); enum alias_tcp_state { ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#20 (text+ko) ==== @@ -146,8 +146,8 @@ static void RuleAdd(struct libalias *la, struct proxy_entry *); static void RuleDelete(struct proxy_entry *); static int RuleNumberDelete(struct libalias *la, int); -static void ProxyEncodeTcpStream(struct alias_link *, void *, int); -static void ProxyEncodeIpHeader(void *, u_short sport); +static void ProxyEncodeTcpStream(struct alias_link *, pkt_t, int); +static void ProxyEncodeIpHeader(pkt_t, u_short sport); #ifdef _KERNEL static int @@ -392,7 +392,7 @@ static void ProxyEncodeTcpStream(struct alias_link *lnk, - void *ptr, + pkt_t ptr, int maxpacketsize) { int slen; @@ -449,11 +449,11 @@ if (dlen == 0) return; #ifdef _KERNEL - m = m_split(ptr, hlen, M_TRYWAIT); + m = m_split(*ptr, hlen, M_TRYWAIT); if (m == NULL) return; - m_copyback(ptr, hlen, slen, buffer); - m_cat(ptr, m); + m_copyback(*ptr, hlen, slen, buffer); + m_cat(*ptr, m); #else p = (char *)pip; p += hlen; @@ -499,7 +499,7 @@ } static void -ProxyEncodeIpHeader(void *_ptr, u_short sport) +ProxyEncodeIpHeader(pkt_t _ptr, u_short sport) { struct ip *pip; #define OPTION_LEN_BYTES 8 @@ -542,11 +542,11 @@ #ifdef _KERNEL // XXX - here i assume after an m_split() there's always enough // XXX - space to append option[] to _ptr - m = m_split(_ptr, 20, M_TRYWAIT); + m = m_split(*_ptr, 20, M_TRYWAIT); if (m == NULL) return; - m_copyback(_ptr, 20, 8, option); - m_cat(_ptr, m); + m_copyback(*_ptr, 20, 8, option); + m_cat(*_ptr, m); #else memcpy(ptr, option, 8); #endif @@ -567,7 +567,7 @@ for (i = 0; i < OPTION_LEN_INT16; i++) accumulate -= *(sptr++); #ifdef _KERNEL - sptr = mtod((struct mbuf *)_ptr, u_short *); + sptr = mtod(*_ptr, u_short *); #else sptr = (u_short *) pip; #endif @@ -642,7 +642,7 @@ } void -ProxyModify(struct libalias *la, struct alias_link *lnk, void *ptr, +ProxyModify(struct libalias *la, struct alias_link *lnk, pkt_t ptr, int maxpacketsize, int proxy_type, u_short src_port) { From owner-p4-projects@FreeBSD.ORG Tue Feb 6 01:21:02 2007 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 C45EA16A401; Tue, 6 Feb 2007 01:21:01 +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 683B016A4C9 for ; Tue, 6 Feb 2007 01:20:53 +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 594E813C4A6 for ; Tue, 6 Feb 2007 01:20:53 +0000 (UTC) (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 l161Krgg008006 for ; Tue, 6 Feb 2007 01:20:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l161Kr8g008002 for perforce@freebsd.org; Tue, 6 Feb 2007 01:20:53 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 01:20:53 GMT Message-Id: <200702060120.l161Kr8g008002@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 114085 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: Tue, 06 Feb 2007 01:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=114085 Change 114085 by piso@piso_newluxor on 2007/02/06 01:20:42 Pass down a **mbuf (and thus let libalias modify the actual mbuf's content). Affected files ... .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#41 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#8 (text+ko) ==== @@ -226,14 +226,14 @@ ("ng_nat: ip_len != m_pkthdr.len")); if (hook == priv->in) { - rval = LibAliasIn(priv->lib, m, MCLBYTES); + rval = LibAliasIn(priv->lib, &m, MCLBYTES); if (rval != PKT_ALIAS_OK && rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { NG_FREE_ITEM(item); return (EINVAL); } } else if (hook == priv->out) { - rval = LibAliasOut(priv->lib, m, MCLBYTES); + rval = LibAliasOut(priv->lib, &m, MCLBYTES); if (rval != PKT_ALIAS_OK) { NG_FREE_ITEM(item); return (EINVAL); ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#41 (text+ko) ==== @@ -3496,8 +3496,11 @@ ((ipfw_insn_nat *)cmd)->nat = t; } - if ((m = m_pullup(m, sizeof(struct ip))) == NULL) + if ((m = m_pullup(m, sizeof(struct ip))) == + NULL) { + printf("1\n"); goto badnat; + } ip = mtod(m, struct ip *); if (args->eh == NULL) { ip->ip_len = htons(ip->ip_len); @@ -3558,21 +3561,30 @@ ldt = 1; if (oif == NULL) - retval = LibAliasIn(t->lib, m, + retval = LibAliasIn(t->lib, &m, MCLBYTES); else - retval = LibAliasOut(t->lib, m, + retval = LibAliasOut(t->lib, &m, MCLBYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ m_free(m); badnat: + printf("badnat "); + if (oif == NULL) + printf("LibAliasIn()"); + else + printf("LibAliasOut()"); + printf("\n"); args->m = NULL; retval = IP_FW_DENY; goto done; } - if ((m = m_pullup(m, sizeof(struct ip))) == NULL) + if ((m = m_pullup(m, sizeof(struct ip))) == + NULL) { + printf("2\n"); goto badnat; + } ip = mtod(m, struct ip *); m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len); @@ -3587,8 +3599,10 @@ struct tcphdr *th; if ((m = m_pullup(m, (ip->ip_hl << 2) + - sizeof(struct tcphdr))) == NULL) + sizeof(struct tcphdr))) == NULL) { + printf("3\n"); goto badnat; + } ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); if (th->th_x2) @@ -3613,8 +3627,10 @@ if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct tcphdr))) == - NULL) + NULL) { + printf("4\n"); goto badnat; + } ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); /* @@ -3630,16 +3646,18 @@ case IPPROTO_UDP: if ((m = m_pullup(m, (ip->ip_hl << 2) + - sizeof(struct tcphdr))) == - NULL) + sizeof(struct udphdr))) == + NULL) { + printf("5\n"); goto badnat; + } ip = mtod(m, struct ip *); uh = (struct udphdr *)(ip + 1); uh->uh_sum = cksum; m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); - break; + break; } /* * No hw checksum offloading: do it From owner-p4-projects@FreeBSD.ORG Tue Feb 6 16:42:46 2007 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 760CD16A408; Tue, 6 Feb 2007 16:42:46 +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 51AC516A406 for ; Tue, 6 Feb 2007 16:42:46 +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 41DC013C4AA for ; Tue, 6 Feb 2007 16:42:46 +0000 (UTC) (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 l16GgkHQ006756 for ; Tue, 6 Feb 2007 16:42:46 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16GgkJD006753 for perforce@freebsd.org; Tue, 6 Feb 2007 16:42:46 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 16:42:46 GMT Message-Id: <200702061642.l16GgkJD006753@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 114111 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: Tue, 06 Feb 2007 16:42:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=114111 Change 114111 by piso@piso_newluxor on 2007/02/06 16:42:05 Before checking for IP_MF, pullup at least the ip hdr. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#56 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#56 (text+ko) ==== @@ -1346,11 +1346,15 @@ iresult = ProtoAliasIn(la, pip); break; } - + + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); if (ntohs(pip->ip_off) & IP_MF) { struct alias_link *lnk; - - lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, pip->ip_id); + + lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, + pip->ip_id); if (lnk != NULL) { iresult = PKT_ALIAS_FOUND_HEADER_FRAGMENT; SetFragmentAddr(lnk, pip->ip_dst); From owner-p4-projects@FreeBSD.ORG Tue Feb 6 17:36:56 2007 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 27B7B16A402; Tue, 6 Feb 2007 17:36:55 +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 B0D7F16A405 for ; Tue, 6 Feb 2007 17:36:54 +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 A1A6C13C48D for ; Tue, 6 Feb 2007 17:36:54 +0000 (UTC) (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 l16HasCD024582 for ; Tue, 6 Feb 2007 17:36:54 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16HasU5024578 for perforce@freebsd.org; Tue, 6 Feb 2007 17:36:54 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 17:36:54 GMT Message-Id: <200702061736.l16HasU5024578@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 114113 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: Tue, 06 Feb 2007 17:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=114113 Change 114113 by piso@piso_newluxor on 2007/02/06 17:36:34 Libalias handles mbuf chain now, and the entire packet won't lay anymore in the first mbuf, so stop assuming m_pkthdr.len == m_len. Affected files ... .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#9 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#42 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#9 (text+ko) ==== @@ -247,7 +247,7 @@ return (ENOBUFS); } ip = mtod(m, struct ip *); - m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len); + m->m_pkthdr.len = ntohs(ip->ip_len); if ((ip->ip_off & htons(IP_OFFMASK)) == 0 && ip->ip_p == IPPROTO_TCP) { ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#42 (text+ko) ==== @@ -3586,8 +3586,7 @@ goto badnat; } ip = mtod(m, struct ip *); - m->m_pkthdr.len = m->m_len = - ntohs(ip->ip_len); + m->m_pkthdr.len = ntohs(ip->ip_len); /* * XXX - libalias checksum offload From owner-p4-projects@FreeBSD.ORG Tue Feb 6 19:05:52 2007 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 A604816A400; Tue, 6 Feb 2007 19:05:51 +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 E53DE16A417 for ; Tue, 6 Feb 2007 19:05:50 +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 9C6C713C4BB for ; Tue, 6 Feb 2007 19:05:50 +0000 (UTC) (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 l16J5olo041480 for ; Tue, 6 Feb 2007 19:05:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16J5o2C041477 for perforce@freebsd.org; Tue, 6 Feb 2007 19:05:50 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 19:05:50 GMT Message-Id: <200702061905.l16J5o2C041477@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 114119 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: Tue, 06 Feb 2007 19:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114119 Change 114119 by piso@piso_newluxor on 2007/02/06 19:05:34 With mbuf support, came the ability to support arbitrary sized packets and thus, we can finally, fix the TSO and big MTU support: in case we pass 0 as maxpacketsize, libalias won't check any more size of packets. NB: actually, for the kernel side, i can completely #ifdef-out the maxpacketsize checks and simplify the API. Perhaps i'll do that later... Affected files ... .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#10 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#43 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#57 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#21 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#10 (text+ko) ==== @@ -226,14 +226,14 @@ ("ng_nat: ip_len != m_pkthdr.len")); if (hook == priv->in) { - rval = LibAliasIn(priv->lib, &m, MCLBYTES); + rval = LibAliasIn(priv->lib, &m, 0); if (rval != PKT_ALIAS_OK && rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { NG_FREE_ITEM(item); return (EINVAL); } } else if (hook == priv->out) { - rval = LibAliasOut(priv->lib, &m, MCLBYTES); + rval = LibAliasOut(priv->lib, &m, 0); if (rval != PKT_ALIAS_OK) { NG_FREE_ITEM(item); return (EINVAL); ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#43 (text+ko) ==== @@ -3561,11 +3561,9 @@ ldt = 1; if (oif == NULL) - retval = LibAliasIn(t->lib, &m, - MCLBYTES); + retval = LibAliasIn(t->lib, &m, 0); else - retval = LibAliasOut(t->lib, &m, - MCLBYTES); + retval = LibAliasOut(t->lib, &m, 0); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ m_free(m); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#57 (text+ko) ==== @@ -1304,9 +1304,11 @@ alias_addr = pip->ip_dst; /* Defense against mangled packets */ - if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) - goto getout; + if (maxpacketsize != 0) { + if (ntohs(pip->ip_len) > maxpacketsize + || (pip->ip_hl << 2) > maxpacketsize) + goto getout; + } if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { switch (pip->ip_p) { @@ -1436,10 +1438,12 @@ } /* Defense against mangled packets */ - if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) { - printf("mangled pkt\n"); - goto getout; + if (maxpacketsize != 0) { + if (ntohs(pip->ip_len) > maxpacketsize + || (pip->ip_hl << 2) > maxpacketsize) { + printf("mangled pkt\n"); + goto getout; + } } addr_save = GetDefaultAliasAddress(la); @@ -1526,9 +1530,11 @@ goto getout; /* Defense against mangled packets */ - if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) - goto getout; + if (maxpacketsize != 0) { + if (ntohs(pip->ip_len) > maxpacketsize + || (pip->ip_hl << 2) > maxpacketsize) + goto getout; + } /* Let's make enough space for any of the protocols header below */ PULLUP_ICMPHDR(pip, ptr); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#21 (text+ko) ==== @@ -428,8 +428,11 @@ } /* Check for packet overflow */ - if ((int)(ntohs(pip->ip_len) + strlen(buffer)) > maxpacketsize) - return; + if (maxpacketsize != 0) { + if ((int)(ntohs(pip->ip_len) + strlen(buffer)) > + maxpacketsize) + return; + } /* Shift existing TCP data and insert destination string */ { From owner-p4-projects@FreeBSD.ORG Tue Feb 6 19:44:40 2007 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 4DD8F16A406; Tue, 6 Feb 2007 19:44:39 +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 2253516A403 for ; Tue, 6 Feb 2007 19:44:39 +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 06BCA13C471 for ; Tue, 6 Feb 2007 19:44:39 +0000 (UTC) (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 l16Jic7F049462 for ; Tue, 6 Feb 2007 19:44:38 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16JicG1049459 for perforce@freebsd.org; Tue, 6 Feb 2007 19:44:38 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 19:44:38 GMT Message-Id: <200702061944.l16JicG1049459@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 114120 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: Tue, 06 Feb 2007 19:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=114120 Change 114120 by piso@piso_newluxor on 2007/02/06 19:43:43 Axe some useless printfs. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#58 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#58 (text+ko) ==== @@ -1316,9 +1316,7 @@ iresult = IcmpAliasIn(la, ptr); break; case IPPROTO_UDP: - printf("bef UdpAliasIn: %u\n", iresult); iresult = UdpAliasIn(la, ptr); - printf("aft UdpAliasIn: %u\n", iresult); break; case IPPROTO_TCP: iresult = TcpAliasIn(la, ptr); @@ -1472,9 +1470,7 @@ iresult = IcmpAliasOut(la, ptr, create); break; case IPPROTO_UDP: - printf("bef UdpAliasOut: %u\n", iresult); iresult = UdpAliasOut(la, ptr, create); - printf("aft UdpAliasOut: %u\n", iresult); break; case IPPROTO_TCP: iresult = TcpAliasOut(la, ptr, maxpacketsize, create); From owner-p4-projects@FreeBSD.ORG Tue Feb 6 19:47:46 2007 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 F112816A401; Tue, 6 Feb 2007 19:47:44 +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 7B32F16A407 for ; Tue, 6 Feb 2007 19:47:43 +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 6CFF213C4B8 for ; Tue, 6 Feb 2007 19:47:43 +0000 (UTC) (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 l16JlhuA049599 for ; Tue, 6 Feb 2007 19:47:43 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16Jlhms049596 for perforce@freebsd.org; Tue, 6 Feb 2007 19:47:43 GMT (envelope-from piso@freebsd.org) Date: Tue, 6 Feb 2007 19:47:43 GMT Message-Id: <200702061947.l16Jlhms049596@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 114121 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: Tue, 06 Feb 2007 19:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=114121 Change 114121 by piso@piso_newluxor on 2007/02/06 19:47:40 Axe some more useless debug prints. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#44 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#59 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#44 (text+ko) ==== @@ -3497,10 +3497,8 @@ t; } if ((m = m_pullup(m, sizeof(struct ip))) == - NULL) { - printf("1\n"); + NULL) goto badnat; - } ip = mtod(m, struct ip *); if (args->eh == NULL) { ip->ip_len = htons(ip->ip_len); @@ -3579,10 +3577,8 @@ goto done; } if ((m = m_pullup(m, sizeof(struct ip))) == - NULL) { - printf("2\n"); + NULL) goto badnat; - } ip = mtod(m, struct ip *); m->m_pkthdr.len = ntohs(ip->ip_len); @@ -3596,10 +3592,8 @@ struct tcphdr *th; if ((m = m_pullup(m, (ip->ip_hl << 2) + - sizeof(struct tcphdr))) == NULL) { - printf("3\n"); + sizeof(struct tcphdr))) == NULL) goto badnat; - } ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); if (th->th_x2) @@ -3624,10 +3618,8 @@ if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct tcphdr))) == - NULL) { - printf("4\n"); + NULL) goto badnat; - } ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); /* @@ -3644,10 +3636,8 @@ if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct udphdr))) == - NULL) { - printf("5\n"); + NULL) goto badnat; - } ip = mtod(m, struct ip *); uh = (struct udphdr *)(ip + 1); uh->uh_sum = cksum; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#59 (text+ko) ==== @@ -1424,24 +1424,19 @@ la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasInLocked(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; - printf("PKT_ALIAS_REVERSE\n"); goto getout; } HouseKeeping(la); ClearCheckNewLink(la); PULLUP_IPHDR(pip, ptr); - if (pip == NULL) { - printf("failed PULLUP_IPHDR\n"); + if (pip == NULL) goto getout; - } /* Defense against mangled packets */ if (maxpacketsize != 0) { if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) { - printf("mangled pkt\n"); + || (pip->ip_hl << 2) > maxpacketsize) goto getout; - } } addr_save = GetDefaultAliasAddress(la); From owner-p4-projects@FreeBSD.ORG Tue Feb 6 21:03:19 2007 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 6A26816A41A; Tue, 6 Feb 2007 21:03:19 +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 3C73716A40F for ; Tue, 6 Feb 2007 21:03:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1633213C4B7 for ; Tue, 6 Feb 2007 21:03:19 +0000 (UTC) (envelope-from sam@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 l16L3IMu073108 for ; Tue, 6 Feb 2007 21:03:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16L3Igq073104 for perforce@freebsd.org; Tue, 6 Feb 2007 21:03:18 GMT (envelope-from sam@freebsd.org) Date: Tue, 6 Feb 2007 21:03:18 GMT Message-Id: <200702062103.l16L3Igq073104@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 Cc: Subject: PERFORCE change 114123 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: Tue, 06 Feb 2007 21:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114123 Change 114123 by sam@sam_ebb on 2007/02/06 21:02:45 correct arg order to ath_getchannels Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#133 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#133 (text+ko) ==== @@ -357,7 +357,7 @@ * like the phy mode. */ error = ath_getchannels(sc, ath_regdomain, ath_countrycode, - ath_xchanmode != 0, ath_outdoor != 0); + ath_outdoor != 0, ath_xchanmode != 0); if (error != 0) goto bad; From owner-p4-projects@FreeBSD.ORG Tue Feb 6 22:02:33 2007 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 AB5B416A40E; Tue, 6 Feb 2007 22:02:33 +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 5127316A406 for ; Tue, 6 Feb 2007 22:02:33 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3617A13C494 for ; Tue, 6 Feb 2007 22:02:33 +0000 (UTC) (envelope-from csjp@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 l16M2XTx082378 for ; Tue, 6 Feb 2007 22:02:33 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16M2WpO082375 for perforce@freebsd.org; Tue, 6 Feb 2007 22:02:32 GMT (envelope-from csjp@freebsd.org) Date: Tue, 6 Feb 2007 22:02:32 GMT Message-Id: <200702062202.l16M2WpO082375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114125 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: Tue, 06 Feb 2007 22:02:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=114125 Change 114125 by csjp@csjp_rnd01 on 2007/02/06 22:01:39 Somewhat refactor the pcap_next_zbuf() code: - Copy the read timeout from pcap_open_live() into the pcap object - Implement the read timeout in the form of a select(2) timeout - When select returns perform the following: (1) Check to see if we wokeup as a result of a timeout (2) Check to see if there is data in the store buffer (3) Compare user/kernel generation numbers (4) If no packet data is ready, call BIOCROTZBUF to see if the wakeup was a result of BIOCIMMEDIATE (5) If not packet is available, retry These changes should roughly emulate read timeout behaviour which results in users getting fresh packet data every second. Finally, implement an environment variable BPF_ZERO_COPY when, if set will implement the zero copy functionality, otherwise, the regular buffer mode is used (by default). This makes libpcap work with zero copy. I've tested this with tcpdump so far. It's a start :) Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#4 edit .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-int.h#4 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#4 (text+ko) ==== @@ -157,57 +157,90 @@ pcap_next_zbuf(pcap_t *p, u_int *cc) { struct bpf_zbuf_header *bzh; - struct pollfd pollfd; struct bpf_zbuf bz; - int i; + struct timeval tv; + fd_set r_set; + int r; + tv.tv_sec = 1; + tv.tv_usec = 0; + FD_ZERO(&r_set); + FD_SET(p->fd, &r_set); p->bzh = NULL; + p->buffer = NULL; + if (p->to_ms != 0) { + tv.tv_sec = p->to_ms / 1000; + tv.tv_usec = (p->to_ms * 1000) % 1000000; + } + r = select(p->fd + 1, &r_set, NULL, NULL, &tv); + if (r < 0 && errno == EINTR) + return (0); + else if (r < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "select: %s", strerror(errno)); + return (-1); + } /* - * First try directly accessing the zero-copy buffer headers. + * Handle timeouts here + */ + if (r == 0) { + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + /* + * select(2) woke us up due to a timeout, and there was no + * data to be processed in the store buffer. Tell pcap to + * to wait again. + */ + if (bz.bz_bufa == NULL) + return (0); + } + /* XXXCSJP should we check FD_ISSET()? */ + /* + * If we have made it this far, chances are select(2) returned because + * there is data ready to be processed in the hold buffer. Compare the + * user generation numbers against the kernels. If there are any + * differences, process the packet data. */ bzh = (struct bpf_zbuf_header *)p->zbuf1; if (bzh->bzh_kernel_gen > bzh->bzh_user_gen) { - printf("pcap_next_zbuf: zbuf1 gen\n"); - goto found; + p->bzh = bzh; + p->buffer = (u_char *)p->zbuf1; + p->buffer += sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); } bzh = (struct bpf_zbuf_header *)p->zbuf2; if (bzh->bzh_kernel_gen > bzh->bzh_user_gen) { - printf("pcap_next_zbuf: zbuf2 gen\n"); - goto found; + p->bzh = bzh; + p->buffer = (u_char *)p->zbuf2; + p->buffer += sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); } - /* - * Next, try asking the kernel, which may dislodge a buffer in - * immediate mode. + * If the generation numbers were the same for both buffers, then it + * is possible that we woke up because of BIOCIMMEDIATE. In either + * case, manually rotate the buffers. */ - bzero(&bz, sizeof(bz)); - if (ioctl(p->fd, BIOCGETZNEXT, &bz) < 0) { - snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCGETZNEXT: %s", - pcap_strerror(errno)); + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); return (-1); } - bzh = bz.bz_bufa; - if (bzh != NULL) { - printf("pcap_next_zbuf getznext\n"); - goto found; - } - - printf("poll timeout %d\n", p->timeout); - bzero(&pollfd, sizeof(pollfd)); - pollfd.fd = p->fd; - pollfd.events = POLLIN; - i = poll(&pollfd, 1, p->timeout == 0 ? INFTIM : p->timeout); - if (i < 0 && errno != EINTR) { - snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "poll: %s", - pcap_strerror(errno)); - return (-1); - } - return (0); -found: - p->bzh = bzh; - *cc = bzh->bzh_kernel_len; - p->buffer = (u_char *)(bzh + 1); + /* + * It's possible that we were unable to rotate the buffer because the + * user generation numbers have not been modified, in which case retry. + */ + if (bz.bz_bufa == NULL) + return (0); + p->bzh = (struct bpf_zbuf_header *)bz.bz_bufa; + p->buffer = (u_char *)bz.bz_bufa; + p->buffer += sizeof(*bzh); + *cc = bz.bz_buflen; return (1); } @@ -217,15 +250,6 @@ struct bpf_zbuf bz; p->bzh->bzh_user_gen++; -#if 0 - bzero(&bz, sizeof(bz)); - bz.bz_bufa = (u_char *)p->bzh; - if (ioctl(p->fd, BIOCACKZBUF, &bz) < 0) { - snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCACKZBUF: %s", - pcap_strerror(errno)); - return (-1); - } -#endif p->bzh = NULL; p->buffer = NULL; return (0); @@ -688,13 +712,6 @@ #define DLT_DOCSIS 143 #endif -/* - * XXXRW: The following is an evil global hack to control whether zero-copy - * BPF is used or not. It should be replaced with something real, if it is - * worth keeping such a frob. - */ -int bpf_zerocopy = 1; - pcap_t * pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, char *ebuf) @@ -763,7 +780,7 @@ * attach to, so we do that here also. */ #ifdef BIOCSETBUFMODE - if (bpf_zerocopy) { + if (getenv("BPF_ZERO_COPY")) { bufmode = BPF_BUFMODE_ZBUF; if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) < 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSETBUFMODE: %s", @@ -1033,6 +1050,7 @@ } #endif /* set timeout */ + p->to_ms = to_ms; if (to_ms != 0) { /* * XXX - is this seconds/nanoseconds in AIX? ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-int.h#4 (text+ko) ==== @@ -154,6 +154,7 @@ u_char *buffer; u_char *bp; int cc; + int to_ms; /* * XXXRW: Exactly how to handle ifdefs, etc, is not something I've From owner-p4-projects@FreeBSD.ORG Tue Feb 6 22:08:43 2007 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 B8FB916A4A0; Tue, 6 Feb 2007 22:08:42 +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 7E19316A49C for ; Tue, 6 Feb 2007 22:08:42 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 58C7B13C4BA for ; Tue, 6 Feb 2007 22:08:42 +0000 (UTC) (envelope-from csjp@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 l16M8fZn084406 for ; Tue, 6 Feb 2007 22:08:41 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16M8edk084403 for perforce@freebsd.org; Tue, 6 Feb 2007 22:08:40 GMT (envelope-from csjp@freebsd.org) Date: Tue, 6 Feb 2007 22:08:40 GMT Message-Id: <200702062208.l16M8edk084403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114126 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: Tue, 06 Feb 2007 22:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114126 Change 114126 by csjp@csjp_rnd01 on 2007/02/06 22:08:32 Backup the previous timeout code, this was a mistake. Instead take the following approach: - Implement a new ioctl(2) command: BIOCROTZBUF to manually trigger buffer rotations if the hold buffer is NULL and the store buffer contains some packet data. This ioctl works much like BIOCGETZNEXT only it doesn't may attention to the immediate flag. If we are unable to rotate the buffer, we return NULL back to userspace telling them to try again next wake up. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#12 edit .. //depot/projects/zcopybpf/src/sys/net/bpf.h#7 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#12 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#4 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#12 (text+ko) ==== @@ -310,14 +310,13 @@ } static int -bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz, - int timed_out) +bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_getznext(td, d, bz, timed_out)); + return (bpf_zerocopy_ioctl_getznext(td, d, bz)); #else panic("bpf_ioctl_getznext"); #endif @@ -929,7 +928,7 @@ struct thread *td) { struct bpf_d *d = dev->si_drv1; - int timed_out, error = 0; + int error = 0; /* * Refresh PID associated with this descriptor. @@ -938,13 +937,6 @@ d->bd_pid = td->td_proc->p_pid; if (d->bd_state == BPF_WAITING) callout_stop(&d->bd_callout); - /* - * Before we clobber the BPF state, check to see if this descriptor - * was timed out. If so, we capture that bit of information so we - * can pass it to bpf_ioctl_getznext() so that it knows to rotate - * the buffers. - */ - timed_out = (d->bd_state == BPF_TIMED_OUT) ? 1 : 0; d->bd_state = BPF_IDLE; BPFD_UNLOCK(d); @@ -1287,11 +1279,14 @@ return (bpf_ioctl_getzmax(td, d, (u_int *)addr)); case BIOCGETZNEXT: - return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr, - timed_out)); + return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr)); case BIOCSETZBUF: return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); + + case BIOCROTZBUF: + return (bpf_zerocopy_ioctl_rotate(td, d, (struct bpf_zbuf *) + addr)); } return (error); } @@ -1730,9 +1725,9 @@ } else if (d->bd_immediate || d->bd_state == BPF_TIMED_OUT) /* - * Immediate mode is set, or the read timeout has - * already expired during a select call. A packet - * arrived, so the reader should be woken up. + * Immediate mode is set, or the read timeout has already + * expired during a select call. A packet arrived, so the + * reader should be woken up. */ do_wakeup = 1; ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#7 (text+ko) ==== @@ -153,7 +153,7 @@ #define BIOCGETZMAX _IOR('B', 128, u_int) #define BIOCGETZNEXT _IOR('B', 129, struct bpf_zbuf) #define BIOCSETZBUF _IOW('B', 130, struct bpf_zbuf) - +#define BIOCROTZBUF _IOR('B', 131, struct bpf_zbuf) /* * Structure prepended to each packet. */ @@ -186,7 +186,10 @@ volatile u_int bzh_kernel_gen; /* Kernel generation number. */ volatile u_int bzh_kernel_len; /* Length of buffer. */ volatile u_int bzh_user_gen; /* User generation number. */ - u_int _bzh_pad[5]; /* Padding out to 32-byte boundary. */ + void *bzh_hbuf; + void *bzh_fbuf; + void *bzh_sbuf; + u_char _bzh_pad[28]; }; /* ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#12 (text+ko) ==== @@ -374,6 +374,9 @@ KASSERT(zb != NULL, ("bpf_zerocopy_bufheld: zb == NULL")); zb->zb_header->bzh_kernel_len = d->bd_hlen; zb->zb_header->bzh_kernel_gen++; + zb->zb_header->bzh_hbuf = d->bd_hbuf; + zb->zb_header->bzh_fbuf = d->bd_fbuf; + zb->zb_header->bzh_sbuf = d->bd_sbuf; } /* @@ -548,7 +551,7 @@ */ int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz, int timed_out) + struct bpf_zbuf *bz) { struct zbuf *zb; @@ -564,9 +567,10 @@ * held buffer. */ BPFD_LOCK(d); - if ((timed_out || d->bd_immediate) && d->bd_hbuf == NULL - && d->bd_slen != 0) + if (d->bd_immediate && d->bd_hbuf == NULL + && d->bd_slen != 0) { ROTATE_BUFFERS(d); + } bzero(bz, sizeof(*bz)); if (d->bd_hbuf != NULL) { zb = (struct zbuf *)d->bd_hbuf; @@ -577,6 +581,23 @@ return (0); } +int +bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, + struct bpf_zbuf *bz) +{ + struct zbuf *bzh; + + BPFD_LOCK(d); + bzero(bz, sizeof(*bz)); + if (d->bd_hbuf == NULL && d->bd_slen != 0) { + ROTATE_BUFFERS(d); + bzh = (struct zbuf *)d->bd_hbuf; + bz->bz_bufa = (void *)bzh->zb_uaddr; + bz->bz_buflen = d->bd_hlen; + } + BPFD_UNLOCK(d); + return (0); +} /* * Ioctl to configure zero-copy buffers -- may be done only once. */ ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#4 (text+ko) ==== @@ -50,10 +50,11 @@ int bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, u_int *i); int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz, int timed_out); + struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, struct uio *uio); - +int bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, + struct bpf_zbuf *bz); #endif /* !_NET_BPF_ZEROCOPY_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Feb 6 22:43:36 2007 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 E4BA716A488; Tue, 6 Feb 2007 22:43:31 +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 7623516A40E for ; Tue, 6 Feb 2007 22:43:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 66A5613C48D for ; Tue, 6 Feb 2007 22:43:29 +0000 (UTC) (envelope-from rdivacky@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 l16MhTcM091142 for ; Tue, 6 Feb 2007 22:43:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16MhT15091135 for perforce@freebsd.org; Tue, 6 Feb 2007 22:43:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 6 Feb 2007 22:43:29 GMT Message-Id: <200702062243.l16MhT15091135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114132 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: Tue, 06 Feb 2007 22:43:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=114132 Change 114132 by rdivacky@rdivacky_witten on 2007/02/06 22:43:08 Remove forgotten EMUL_UNLOCK in getppid(). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#55 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 (text+ko) ==== @@ -168,19 +168,20 @@ /* reparent all procs that are not a thread leader to initproc */ if (em->shared->group_pid != p->p_pid) { - sx_xlock(&proctree_lock); - wakeup(initproc); + child_clear_tid = em->child_clear_tid; + EMUL_UNLOCK(&emul_lock); + sx_xlock(&proctree_lock); + wakeup(initproc); PROC_LOCK(p); proc_reparent(p, initproc); p->p_sigparent = SIGCHLD; PROC_UNLOCK(p); - sx_xunlock(&proctree_lock); + sx_xunlock(&proctree_lock); + } else { + child_clear_tid = em->child_clear_tid; + EMUL_UNLOCK(&emul_lock); } - child_clear_tid = em->child_clear_tid; - - EMUL_UNLOCK(&emul_lock); - EMUL_SHARED_WLOCK(&emul_shared_lock); LIST_REMOVE(em, threads); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#55 (text+ko) ==== @@ -1502,7 +1502,6 @@ printf("getppid: thread group leader not found.\n"); #endif td->td_retval[0] = 1; - EMUL_UNLOCK(&emul_lock); return (0); } pp = p->p_pptr; /* switch to parent */ From owner-p4-projects@FreeBSD.ORG Tue Feb 6 22:50:31 2007 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 409C816A40D; Tue, 6 Feb 2007 22:50:28 +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 1333016A408 for ; Tue, 6 Feb 2007 22:50:27 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id 6768F13C481 for ; Tue, 6 Feb 2007 22:50:21 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l16MoJ8Q088273 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 6 Feb 2007 23:50:19 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l16MoJWq088272 for perforce@freebsd.org; Tue, 6 Feb 2007 23:50:19 +0100 (CET) Date: Tue, 6 Feb 2007 23:50:19 +0100 From: Divacky Roman To: Perforce Change Reviews Message-ID: <20070206225019.GA88194@stud.fit.vutbr.cz> References: <200702062243.l16MhT15091135@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200702062243.l16MhT15091135@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Subject: Re: PERFORCE change 114132 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: Tue, 06 Feb 2007 22:50:31 -0000 On Tue, Feb 06, 2007 at 10:43:29PM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=114132 > > Change 114132 by rdivacky@rdivacky_witten on 2007/02/06 22:43:08 > > Remove forgotten EMUL_UNLOCK in getppid(). > > Affected files ... > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 edit > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#55 edit > > Differences ... > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 (text+ko) ==== > > @@ -168,19 +168,20 @@ > > /* reparent all procs that are not a thread leader to initproc */ > if (em->shared->group_pid != p->p_pid) { > - sx_xlock(&proctree_lock); > - wakeup(initproc); > + child_clear_tid = em->child_clear_tid; > + EMUL_UNLOCK(&emul_lock); > + sx_xlock(&proctree_lock); > + wakeup(initproc); > PROC_LOCK(p); > proc_reparent(p, initproc); > p->p_sigparent = SIGCHLD; > PROC_UNLOCK(p); > - sx_xunlock(&proctree_lock); > + sx_xunlock(&proctree_lock); > + } else { > + child_clear_tid = em->child_clear_tid; > + EMUL_UNLOCK(&emul_lock); > } > > - child_clear_tid = em->child_clear_tid; > - > - EMUL_UNLOCK(&emul_lock); > - > EMUL_SHARED_WLOCK(&emul_shared_lock); > LIST_REMOVE(em, threads); > > grrrr.. I accidentally commited the fix for the LOR caused by holding 2 sx locks (emul_lock and proctree_lock). From owner-p4-projects@FreeBSD.ORG Wed Feb 7 00:40:09 2007 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 685C916A40E; Wed, 7 Feb 2007 00:40:01 +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 4E6A816A402 for ; Wed, 7 Feb 2007 00:39:56 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 34CD513C4A3 for ; Wed, 7 Feb 2007 00:39:56 +0000 (UTC) (envelope-from csjp@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 l170duhd012161 for ; Wed, 7 Feb 2007 00:39:56 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l170dtfn012158 for perforce@freebsd.org; Wed, 7 Feb 2007 00:39:55 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 00:39:55 GMT Message-Id: <200702070039.l170dtfn012158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114135 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: Wed, 07 Feb 2007 00:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114135 Change 114135 by csjp@csjp_rnd01 on 2007/02/07 00:39:25 Clean up some additions I made to the zbuf header structure that accidently made it in my last submit. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#8 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#13 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#8 (text+ko) ==== @@ -186,10 +186,7 @@ volatile u_int bzh_kernel_gen; /* Kernel generation number. */ volatile u_int bzh_kernel_len; /* Length of buffer. */ volatile u_int bzh_user_gen; /* User generation number. */ - void *bzh_hbuf; - void *bzh_fbuf; - void *bzh_sbuf; - u_char _bzh_pad[28]; + u_char _bzh_pad[5]; }; /* ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#13 (text+ko) ==== @@ -374,9 +374,6 @@ KASSERT(zb != NULL, ("bpf_zerocopy_bufheld: zb == NULL")); zb->zb_header->bzh_kernel_len = d->bd_hlen; zb->zb_header->bzh_kernel_gen++; - zb->zb_header->bzh_hbuf = d->bd_hbuf; - zb->zb_header->bzh_fbuf = d->bd_fbuf; - zb->zb_header->bzh_sbuf = d->bd_sbuf; } /* From owner-p4-projects@FreeBSD.ORG Wed Feb 7 00:46:09 2007 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 514C816A405; Wed, 7 Feb 2007 00:46:05 +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 984B616A400 for ; Wed, 7 Feb 2007 00:46:04 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3D94A13C491 for ; Wed, 7 Feb 2007 00:46:04 +0000 (UTC) (envelope-from csjp@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 l170k4f2013852 for ; Wed, 7 Feb 2007 00:46:04 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l170k45I013849 for perforce@freebsd.org; Wed, 7 Feb 2007 00:46:04 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 00:46:04 GMT Message-Id: <200702070046.l170k45I013849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114136 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: Wed, 07 Feb 2007 00:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114136 Change 114136 by csjp@csjp_rnd01 on 2007/02/07 00:45:22 u_char -> u_int to round the size of the structure up to the next 32 byte boundary. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#9 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#9 (text+ko) ==== @@ -186,7 +186,7 @@ volatile u_int bzh_kernel_gen; /* Kernel generation number. */ volatile u_int bzh_kernel_len; /* Length of buffer. */ volatile u_int bzh_user_gen; /* User generation number. */ - u_char _bzh_pad[5]; + u_int _bzh_pad[5]; }; /* From owner-p4-projects@FreeBSD.ORG Wed Feb 7 02:52:23 2007 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 8054216A521; Wed, 7 Feb 2007 02:52:14 +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 792F116A5B1 for ; Wed, 7 Feb 2007 02:52:13 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 21C0013C4F5 for ; Wed, 7 Feb 2007 02:51:49 +0000 (UTC) (envelope-from csjp@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 l172pkgs045312 for ; Wed, 7 Feb 2007 02:51:46 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l172pjJA045309 for perforce@freebsd.org; Wed, 7 Feb 2007 02:51:45 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 02:51:45 GMT Message-Id: <200702070251.l172pjJA045309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114148 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: Wed, 07 Feb 2007 02:52:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114148 Change 114148 by csjp@csjp_rnd01 on 2007/02/07 02:50:51 Make sure we are checking for the presence of BPF zerocopy rather then just assuming we are using it. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#13 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#13 (text+ko) ==== @@ -310,6 +310,19 @@ } static int +bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +{ + + if (d->bd_bufmode != BPF_BUFMODE_ZBUF) + return (EOPNOTSUPP); +#ifdef BPF_ZEROCOPY + return (bpf_zerocopy_ioctl_rotate(td, d, bz)); +#else + panic("bpf_ioctl_rotate"); +#endif +} + +static int bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { @@ -1285,8 +1298,7 @@ return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); case BIOCROTZBUF: - return (bpf_zerocopy_ioctl_rotate(td, d, (struct bpf_zbuf *) - addr)); + return (bpf_ioctl_rotate(td, d, (struct bpf_zbuf *) addr)); } return (error); } From owner-p4-projects@FreeBSD.ORG Wed Feb 7 04:27:58 2007 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 275F416A408; Wed, 7 Feb 2007 04:27:56 +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 CC3DB16A400 for ; Wed, 7 Feb 2007 04:27:47 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A409F13C442 for ; Wed, 7 Feb 2007 04:27:47 +0000 (UTC) (envelope-from csjp@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 l174RloN068215 for ; Wed, 7 Feb 2007 04:27:47 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l174RlbU068212 for perforce@freebsd.org; Wed, 7 Feb 2007 04:27:47 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 04:27:47 GMT Message-Id: <200702070427.l174RlbU068212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114150 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: Wed, 07 Feb 2007 04:27:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=114150 Change 114150 by csjp@csjp_rnd01 on 2007/02/07 04:27:01 Turf the static initialization of the timeout, libpcap will handle this now. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#5 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#5 (text+ko) ==== @@ -162,13 +162,10 @@ fd_set r_set; int r; - tv.tv_sec = 1; - tv.tv_usec = 0; FD_ZERO(&r_set); FD_SET(p->fd, &r_set); p->bzh = NULL; p->buffer = NULL; - if (p->to_ms != 0) { tv.tv_sec = p->to_ms / 1000; tv.tv_usec = (p->to_ms * 1000) % 1000000; From owner-p4-projects@FreeBSD.ORG Wed Feb 7 04:55:38 2007 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 BD8BD16A406; Wed, 7 Feb 2007 04:55:24 +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 146BB16A403 for ; Wed, 7 Feb 2007 04:55:24 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E104213C481 for ; Wed, 7 Feb 2007 04:55:23 +0000 (UTC) (envelope-from csjp@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 l174tNFH080877 for ; Wed, 7 Feb 2007 04:55:23 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l174tNVf080853 for perforce@freebsd.org; Wed, 7 Feb 2007 04:55:23 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 04:55:23 GMT Message-Id: <200702070455.l174tNVf080853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114151 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: Wed, 07 Feb 2007 04:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=114151 Change 114151 by csjp@csjp_rnd01 on 2007/02/07 04:54:29 Dont bother using BIOCSRTIMEOUT in the zerocopy case, all it can do is cause problems. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#6 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#6 (text+ko) ==== @@ -1048,7 +1048,7 @@ #endif /* set timeout */ p->to_ms = to_ms; - if (to_ms != 0) { + if (to_ms != 0 && getenv("BPF_ZERO_COPY") == NULL) { /* * XXX - is this seconds/nanoseconds in AIX? * (Treating it as such doesn't fix the timeout From owner-p4-projects@FreeBSD.ORG Wed Feb 7 05:01:34 2007 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 753ED16A403; Wed, 7 Feb 2007 05:01:33 +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 1BCD816A401 for ; Wed, 7 Feb 2007 05:01:32 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0C90813C48E for ; Wed, 7 Feb 2007 05:01:32 +0000 (UTC) (envelope-from csjp@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 l1751VLO081289 for ; Wed, 7 Feb 2007 05:01:31 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1751VRD081284 for perforce@freebsd.org; Wed, 7 Feb 2007 05:01:31 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 05:01:31 GMT Message-Id: <200702070501.l1751VRD081284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114152 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: Wed, 07 Feb 2007 05:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=114152 Change 114152 by csjp@csjp_rnd01 on 2007/02/07 05:01:04 Annotate that in the future before we issue wakesup, we might do something like: (1) Check to see if this descriptor is operating in immediate mode (2) Check to see if the holder buffer is NULL (3) Check to see if we are waking up any sleepers We do not need to check the store buffer, as the fact that it has data in it at this point in the code is invariant. If the following conditions are true, then rotate the buffer. This will save userspace from issuing an ioctl(2) potentially per wakeup. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#14 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#14 (text+ko) ==== @@ -1760,6 +1760,11 @@ (*cpfn)(d, d->bd_sbuf, curlen + hdrlen, pkt, hdr.bh_caplen); d->bd_slen = curlen + totlen; + /* + * XXXCSJP we could probably save a syscall per wakeup if we check the + * d->bd_immediate flag, hold buffer status and rotate the buffers + * before the wakeup. + */ if (do_wakeup) bpf_wakeup(d); } From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:00:16 2007 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 C46D416A402; Wed, 7 Feb 2007 11:00:01 +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 5484916A401 for ; Wed, 7 Feb 2007 11:00:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29F0B13C461 for ; Wed, 7 Feb 2007 11:00:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17B00on031158 for ; Wed, 7 Feb 2007 11:00:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17AxxLo031152 for perforce@freebsd.org; Wed, 7 Feb 2007 10:59:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 10:59:59 GMT Message-Id: <200702071059.l17AxxLo031152@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 Cc: Subject: PERFORCE change 114163 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: Wed, 07 Feb 2007 11:00:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=114163 Change 114163 by rwatson@rwatson_cinnamon on 2007/02/07 10:59:26 Use size_t for buffer sizes rather than u_int. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#15 edit .. //depot/projects/zcopybpf/src/sys/net/bpf.h#10 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#14 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#15 (text+ko) ==== @@ -336,7 +336,7 @@ } static int -bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, u_int *i) +bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) @@ -1289,7 +1289,7 @@ return (bpf_ioctl_getzbuf(td, d, (struct bpf_zbuf *)addr)); case BIOCGETZMAX: - return (bpf_ioctl_getzmax(td, d, (u_int *)addr)); + return (bpf_ioctl_getzmax(td, d, (size_t *)addr)); case BIOCGETZNEXT: return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr)); ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#10 (text+ko) ==== @@ -150,7 +150,7 @@ #define BIOCSETBUFMODE _IOW('B', 125, u_int) #define BIOCACKZBUF _IOW('B', 126, struct bpf_zbuf) #define BIOCGETZBUF _IOR('B', 127, struct bpf_zbuf) -#define BIOCGETZMAX _IOR('B', 128, u_int) +#define BIOCGETZMAX _IOR('B', 128, size_t) #define BIOCGETZNEXT _IOR('B', 129, struct bpf_zbuf) #define BIOCSETZBUF _IOW('B', 130, struct bpf_zbuf) #define BIOCROTZBUF _IOR('B', 131, struct bpf_zbuf) ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#14 (text+ko) ==== @@ -527,7 +527,7 @@ * Ioctl to return the maximum buffer size. */ int -bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, u_int *i) +bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i) { KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:02:37 2007 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 DF9DF16A405; Wed, 7 Feb 2007 11:02:05 +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 5E95C16A401 for ; Wed, 7 Feb 2007 11:02:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4E13013C442 for ; Wed, 7 Feb 2007 11:02:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17B23Kx033122 for ; Wed, 7 Feb 2007 11:02:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17B23UT033111 for perforce@freebsd.org; Wed, 7 Feb 2007 11:02:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:02:03 GMT Message-Id: <200702071102.l17B23UT033111@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 Cc: Subject: PERFORCE change 114164 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: Wed, 07 Feb 2007 11:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114164 Change 114164 by rwatson@rwatson_cinnamon on 2007/02/07 11:01:33 More size_t's. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#15 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#15 (text+ko) ==== @@ -83,7 +83,7 @@ */ struct zbuf { vm_offset_t zb_uaddr; /* User address, may be stale. */ - u_int zb_size; /* Size of buffer, incl. header. */ + size_t zb_size; /* Size of buffer, incl. header. */ u_int zb_numpages; /* Number of pages. */ struct sf_buf **zb_pages; /* Pages themselves. */ struct bpf_zbuf_header *zb_header; /* Shared header. */ @@ -241,12 +241,13 @@ * responsible for performing bounds checking, etc. */ void -bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, u_int offset, - void *src, u_int len) +bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, size_t offset, + void *src, size_t len) { - u_int count, page, poffset; + u_int count, page; u_char *src_bytes; struct zbuf *zb; + size_t poffset; KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, ("bpf_zerocopy_append_bytes: not in zbuf mode")); @@ -294,11 +295,12 @@ * checking that this will not exceed the buffer limit. */ void -bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, u_int offset, - void *src, u_int len) +bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, size_t offset, + void *src, size_t len) { - u_int count, moffset, page, poffset; + size_t moffset, poffset; const struct mbuf *m; + u_int count, page; struct zbuf *zb; KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, @@ -430,7 +432,7 @@ * scatter-gather copying with a series of uiomove calls here. */ int -bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, +bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, size_t len, struct uio *uio) { From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:04:27 2007 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 A5DA016A416; Wed, 7 Feb 2007 11:04:22 +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 B42CB16A40A for ; Wed, 7 Feb 2007 11:04:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9245413C467 for ; Wed, 7 Feb 2007 11:04:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17B46g6035963 for ; Wed, 7 Feb 2007 11:04:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17B466P035953 for perforce@freebsd.org; Wed, 7 Feb 2007 11:04:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:04:06 GMT Message-Id: <200702071104.l17B466P035953@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 Cc: Subject: PERFORCE change 114165 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: Wed, 07 Feb 2007 11:04:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=114165 Change 114165 by rwatson@rwatson_cinnamon on 2007/02/07 11:03:53 Revert two size_t changes: we treat packets as u_int in length, as well as page offsets, but buffer sizes as size_t. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#16 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#16 (text+ko) ==== @@ -242,12 +242,11 @@ */ void bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, size_t offset, - void *src, size_t len) + void *src, u_int len) { - u_int count, page; + u_int count, page, poffset; u_char *src_bytes; struct zbuf *zb; - size_t poffset; KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, ("bpf_zerocopy_append_bytes: not in zbuf mode")); @@ -296,11 +295,10 @@ */ void bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, size_t offset, - void *src, size_t len) + void *src, u_int len) { - size_t moffset, poffset; + u_int count, moffset, page, poffset; const struct mbuf *m; - u_int count, page; struct zbuf *zb; KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:11:20 2007 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 2B8DB16A403; Wed, 7 Feb 2007 11:11:19 +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 DB21916A412 for ; Wed, 7 Feb 2007 11:11:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C45EB13C4A7 for ; Wed, 7 Feb 2007 11:11:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BBFkV041913 for ; Wed, 7 Feb 2007 11:11:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BBFD9041903 for perforce@freebsd.org; Wed, 7 Feb 2007 11:11:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:11:15 GMT Message-Id: <200702071111.l17BBFD9041903@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 Cc: Subject: PERFORCE change 114166 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: Wed, 07 Feb 2007 11:11:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=114166 Change 114166 by rwatson@rwatson_cinnamon on 2007/02/07 11:10:42 Continue internal confusion about size_t: BPF performs int/u_int arithmetic on its sizes, so for now, accept u_int arguments from BPF. We use size_t for all user APIs that refer to buffer sizes, however, in the hopes that we can allow >32bit shared memory buffers using the same API on 64-bit platforms in the future. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#17 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#5 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#17 (text+ko) ==== @@ -241,7 +241,7 @@ * responsible for performing bounds checking, etc. */ void -bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, size_t offset, +bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, u_int offset, void *src, u_int len) { u_int count, page, poffset; @@ -294,7 +294,7 @@ * checking that this will not exceed the buffer limit. */ void -bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, size_t offset, +bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, u_int offset, void *src, u_int len) { u_int count, moffset, page, poffset; @@ -430,7 +430,7 @@ * scatter-gather copying with a series of uiomove calls here. */ int -bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, size_t len, +bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, struct uio *uio) { ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#5 (text+ko) ==== @@ -48,7 +48,7 @@ int bpf_zerocopy_ioctl_getzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, - u_int *i); + size_t *i); int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:18:53 2007 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 524E616A407; Wed, 7 Feb 2007 11:18:27 +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 DC33716A406 for ; Wed, 7 Feb 2007 11:18:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CBBAC13C461 for ; Wed, 7 Feb 2007 11:18:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BIP9t047937 for ; Wed, 7 Feb 2007 11:18:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BIP96047925 for perforce@freebsd.org; Wed, 7 Feb 2007 11:18:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:18:25 GMT Message-Id: <200702071118.l17BIP96047925@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 Cc: Subject: PERFORCE change 114167 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: Wed, 07 Feb 2007 11:18:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=114167 Change 114167 by rwatson@rwatson_cinnamon on 2007/02/07 11:17:32 Annotate an inter-thread race during bpf_setif. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#16 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#16 (text+ko) ==== @@ -1407,6 +1407,9 @@ * buffers by the time we get here. If not, return an error. * * XXXRW: Could this be better abstracted? + * + * XXXRW: There are locking issues here with multi-threaded use: what + * if two threads try to set the interface at once? */ switch (d->bd_bufmode) { case BPF_BUFMODE_BUFFER: From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:21:58 2007 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 8294C16A402; Wed, 7 Feb 2007 11:21:34 +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 25E1D16A405 for ; Wed, 7 Feb 2007 11:21:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1351013C48D for ; Wed, 7 Feb 2007 11:21:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BLTkN050828 for ; Wed, 7 Feb 2007 11:21:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BLTQ1050821 for perforce@freebsd.org; Wed, 7 Feb 2007 11:21:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:21:29 GMT Message-Id: <200702071121.l17BLTQ1050821@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 Cc: Subject: PERFORCE change 114168 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: Wed, 07 Feb 2007 11:21:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=114168 Change 114168 by rwatson@rwatson_cinnamon on 2007/02/07 11:20:57 Move zeroing of *bz outside of locked region since the locks are not required to zero the ioctl argument structure. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#18 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#18 (text+ko) ==== @@ -584,8 +584,8 @@ { struct zbuf *bzh; + bzero(bz, sizeof(*bz)); BPFD_LOCK(d); - bzero(bz, sizeof(*bz)); if (d->bd_hbuf == NULL && d->bd_slen != 0) { ROTATE_BUFFERS(d); bzh = (struct zbuf *)d->bd_hbuf; From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:22:33 2007 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 2964616A402; Wed, 7 Feb 2007 11:22:33 +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 EAC5E16A400 for ; Wed, 7 Feb 2007 11:22:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D9E0813C49D for ; Wed, 7 Feb 2007 11:22:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BMVM7051870 for ; Wed, 7 Feb 2007 11:22:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BMVro051864 for perforce@freebsd.org; Wed, 7 Feb 2007 11:22:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:22:31 GMT Message-Id: <200702071122.l17BMVro051864@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 Cc: Subject: PERFORCE change 114169 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: Wed, 07 Feb 2007 11:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=114169 Change 114169 by rwatson@rwatson_cinnamon on 2007/02/07 11:22:22 Alphabetize. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#17 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#6 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#17 (text+ko) ==== @@ -310,41 +310,41 @@ } static int -bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_rotate(td, d, bz)); + return (bpf_zerocopy_ioctl_getznext(td, d, bz)); #else - panic("bpf_ioctl_rotate"); + panic("bpf_ioctl_getznext"); #endif } static int -bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_getznext(td, d, bz)); + return (bpf_zerocopy_ioctl_getzmax(td, d, i)); #else - panic("bpf_ioctl_getznext"); + panic("bpf_ioctl_getzmax"); #endif } static int -bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i) +bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_getzmax(td, d, i)); + return (bpf_zerocopy_ioctl_rotate(td, d, bz)); #else - panic("bpf_ioctl_getzmax"); + panic("bpf_ioctl_rotate"); #endif } ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#6 (text+ko) ==== @@ -51,10 +51,10 @@ size_t *i); int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); +int bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, + struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, struct uio *uio); -int bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz); #endif /* !_NET_BPF_ZEROCOPY_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:29:55 2007 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 D01E216A403; Wed, 7 Feb 2007 11:29:43 +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 E035F16A402 for ; Wed, 7 Feb 2007 11:29:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B751D13C47E for ; Wed, 7 Feb 2007 11:29:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BTevZ057714 for ; Wed, 7 Feb 2007 11:29:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BTeTm057708 for perforce@freebsd.org; Wed, 7 Feb 2007 11:29:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:29:40 GMT Message-Id: <200702071129.l17BTeTm057708@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 Cc: Subject: PERFORCE change 114170 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: Wed, 07 Feb 2007 11:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=114170 Change 114170 by rwatson@rwatson_cinnamon on 2007/02/07 11:28:43 Symmetric white space. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#7 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#7 (text+ko) ==== @@ -57,4 +57,5 @@ struct bpf_zbuf *bz); int bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len, struct uio *uio); + #endif /* !_NET_BPF_ZEROCOPY_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:30:59 2007 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 1BDD116A402; Wed, 7 Feb 2007 11:30:45 +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 8DEB216A400 for ; Wed, 7 Feb 2007 11:30:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7D43713C481 for ; Wed, 7 Feb 2007 11:30:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BUgF5058501 for ; Wed, 7 Feb 2007 11:30:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BUgb1058495 for perforce@freebsd.org; Wed, 7 Feb 2007 11:30:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:30:42 GMT Message-Id: <200702071130.l17BUgb1058495@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 Cc: Subject: PERFORCE change 114171 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: Wed, 07 Feb 2007 11:31:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=114171 Change 114171 by rwatson@rwatson_cinnamon on 2007/02/07 11:30:40 Alphabetize zerocopy ioctls, renumber, fix white space. WARNING: this changes the ABI (ioctl numbers) of the zerocopy API and requires libraries and applications directly consuming the BPF zerocopy API to be rebuilt. I.e., libpcap and direct BPF consumers, but not libpcap consumers. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#11 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#11 (text+ko) ==== @@ -152,8 +152,9 @@ #define BIOCGETZBUF _IOR('B', 127, struct bpf_zbuf) #define BIOCGETZMAX _IOR('B', 128, size_t) #define BIOCGETZNEXT _IOR('B', 129, struct bpf_zbuf) -#define BIOCSETZBUF _IOW('B', 130, struct bpf_zbuf) -#define BIOCROTZBUF _IOR('B', 131, struct bpf_zbuf) +#define BIOCROTZBUF _IOR('B', 130, struct bpf_zbuf) +#define BIOCSETZBUF _IOW('B', 131, struct bpf_zbuf) + /* * Structure prepended to each packet. */ From owner-p4-projects@FreeBSD.ORG Wed Feb 7 11:48:12 2007 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 AD6E016A406; Wed, 7 Feb 2007 11:48:11 +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 3E49E16A401 for ; Wed, 7 Feb 2007 11:48:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2DA2B13C442 for ; Wed, 7 Feb 2007 11:48:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17Bm40O073851 for ; Wed, 7 Feb 2007 11:48:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17Bm3Xk073839 for perforce@freebsd.org; Wed, 7 Feb 2007 11:48:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 11:48:03 GMT Message-Id: <200702071148.l17Bm3Xk073839@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 Cc: Subject: PERFORCE change 114172 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: Wed, 07 Feb 2007 11:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114172 Change 114172 by rwatson@rwatson_cinnamon on 2007/02/07 11:48:03 Update bpf(4) man page for BIOCROTZBUF ioctl, and improve the documentation about buffers a bit. The man page is not yet updated for the shared memory header and ACK model. Affected files ... .. //depot/projects/zcopybpf/src/share/man/man4/bpf.4#3 edit Differences ... ==== //depot/projects/zcopybpf/src/share/man/man4/bpf.4#3 (text+ko) ==== @@ -425,20 +425,37 @@ .Vt bz_buflen must be filled out. .It Dv BIOCGETZMAX -.Pq Li u_int +.Pq Li size_t Get the largest individual zero-copy buffer size allowed. As two buffers are used in zero-copy buffer mode, the limit (in practice) is -twice this size. +twice the returned size. As zero-copy buffers consume kernel address space, conservative selection of buffer size, especially when there are multiple .Nm descriptors in use on 32-bit systems. .It Dv BIOCGETZNEXT +.It Dv BIOCROTZBUF .Pq Li struct bpf_zbuf -Get the buffer pointer of the next completed zero-copy buffer and length of -pending data, or +Get the buffer pointer and length of the next zero-copy buffer buffer ready +for userspace use, or +.Dv NULL +if there is no pending buffer. +.Pp +.Dv BIOCGETZNEXT +queries for the next completely filled buffer ready for immediate use, +returning NULL if there are only empty or partially filled buffers available. +.Pp +.Dv BIOCROTZBUF +queries for a filled buffer, but in the event there is only a partially +filled buffer, will make that buffer available for userspace to use +immediately. +This allows consumers of zero-copy buffering to implement timeouts and +retrieve partially filled buffers. +.Dv BIOCROTZBUF +will return .Dv NULL -if there is no pending completed buffer. +only if no data is present in either of the zero-copy buffers. +.Pp Only the .Vt bz_bufa and From owner-p4-projects@FreeBSD.ORG Wed Feb 7 15:56:13 2007 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 6BC0D16A404; Wed, 7 Feb 2007 15:56:13 +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 D6BF216A401 for ; Wed, 7 Feb 2007 15:56:12 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C686113C4BB for ; Wed, 7 Feb 2007 15:56:12 +0000 (UTC) (envelope-from bushman@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 l17FuCTM094588 for ; Wed, 7 Feb 2007 15:56:12 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17FuC2u094585 for perforce@freebsd.org; Wed, 7 Feb 2007 15:56:12 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 15:56:12 GMT Message-Id: <200702071556.l17FuC2u094585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114175 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: Wed, 07 Feb 2007 15:56:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114175 Change 114175 by bushman@bushman_nss_ldap_cached on 2007/02/07 15:55:59 Default debug level changed to 1, higher level should be set via options file Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#21 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#21 (text+ko) ==== @@ -118,7 +118,7 @@ static pthread_rwlock_t nss_ldap_lock = PTHREAD_RWLOCK_INITIALIZER; static struct nss_ldap_configuration nss_ldap_conf; struct nss_ldap_configuration *__nss_ldap_conf = NULL; -int __nss_ldap_debug_level = 4; +int __nss_ldap_debug_level = 1; static int nss_ldap_configure(); static void nss_ldap_atexit(); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 15:58:19 2007 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 B83B416A403; Wed, 7 Feb 2007 15:58:16 +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 5E5F916A401 for ; Wed, 7 Feb 2007 15:58:16 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D20013C4A6 for ; Wed, 7 Feb 2007 15:58:16 +0000 (UTC) (envelope-from bushman@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 l17FwGJQ094770 for ; Wed, 7 Feb 2007 15:58:16 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17FwFZT094767 for perforce@freebsd.org; Wed, 7 Feb 2007 15:58:15 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 15:58:15 GMT Message-Id: <200702071558.l17FwFZT094767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114176 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: Wed, 07 Feb 2007 15:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114176 Change 114176 by bushman@bushman_nss_ldap_cached on 2007/02/07 15:57:52 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/tgmath.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/C.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/getent/getent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/quota/quota.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/list.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/main.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/show.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/repquota/repquota.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.6 2006/03/05 15:45:38 matteo Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | grep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 schweikh Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -6,23 +6,23 @@ * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -137,5 +137,5 @@ extern int svc_kerb_reg(SVCXPRT *, char *, char *, char *); extern enum auth_stat _svcauth_kerb(struct svc_req *, struct rpc_msg *); -#endif KERBEROS +#endif /* KERBEROS */ #endif /* !_RPC_AUTH_KERB_H */ ==== //depot/projects/soc2006/nss_ldap_cached/src/include/tgmath.h#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/include/tgmath.h,v 1.4 2004/09/03 23:44:09 stefanf Exp $ + * $FreeBSD: src/include/tgmath.h,v 1.5 2007/02/02 18:30:23 schweikh Exp $ */ #ifndef _TGMATH_H_ @@ -64,8 +64,8 @@ #define __tg_is_complex(e1, e2, e3) \ (__tg_type3(e1, e2, e3, float _Complex) || \ __tg_type3(e1, e2, e3, double _Complex) || \ - __tg_type3(e1, e2, e3, long double _Complex)) || \ - __tg_type3(e1, e2, e3, __typeof__(_Complex_I)) + __tg_type3(e1, e2, e3, long double _Complex) || \ + __tg_type3(e1, e2, e3, __typeof__(_Complex_I))) #define __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) \ __builtin_choose_expr(__tg_type_corr(x, y, z, long double), \ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/C.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.12 2007/02/04 20:07:07 rse Exp $"); #include #include @@ -114,7 +114,7 @@ */ case '"': case '\'': - (void)skip_string(c); + skip_string(c); break; /* ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/fortran.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.12 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.13 2007/02/04 20:06:10 rse Exp $"); #include #include @@ -124,7 +124,7 @@ continue; for (cp = lbp + 1; *cp && intoken(*cp); ++cp) continue; - if ((cp = lbp + 1)) + if (cp == lbp + 1) continue; *cp = EOS; (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ctags/tree.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.12 2007/02/04 20:04:29 rse Exp $"); #include #include @@ -126,10 +126,12 @@ static void free_tree(NODE *node) { + NODE *node_next; while (node) { if (node->right) free_tree(node->right); + node_next = node->left; free(node); - node = node->left; + node = node_next; } } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/getent/getent.c#2 (text) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.2 2006/05/04 11:28:16 ume Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.3 2007/02/04 20:52:57 rse Exp $"); #include #include @@ -77,7 +77,7 @@ RV_OK = 0, RV_USAGE = 1, RV_NOTFOUND = 2, - RV_NOENUM = 3, + RV_NOENUM = 3 }; static struct getentdb { @@ -109,7 +109,6 @@ for (curdb = databases; curdb->name != NULL; curdb++) { if (strcmp(curdb->name, argv[1]) == 0) { exit(curdb->callback(argc, argv)); - break; } } fprintf(stderr, "Unknown database: %s\n", argv[1]); @@ -178,6 +177,7 @@ curpref = sep; } printf("\n"); + va_end(ap); } /* ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/mklocale/yacc.y#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.25 2005/05/16 09:32:41 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.26 2007/02/06 08:48:28 kevlo Exp $"); #include @@ -227,7 +227,7 @@ fp = stdout; - while ((x = getopt(ac, av, "do:")) != EOF) { + while ((x = getopt(ac, av, "do:")) != -1) { switch(x) { case 'd': debug = 1; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplist/ncplist.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.2 2002/04/28 12:21:31 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.3 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -380,7 +380,7 @@ bzero(args, sizeof(args)); what = LO_NONE; - while ((opt = getopt(argc, argv, "h")) != EOF) { + while ((opt = getopt(argc, argv, "h")) != -1) { switch (opt) { case 'h': case '?': help(); ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplogin/ncplogin.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2002/09/04 23:29:04 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.5 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -69,7 +69,7 @@ login(int argc, char *argv[], struct ncp_conn_loginfo *li) { int error = 0, connid, opt, setprimary = 0; - while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != EOF){ + while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != -1) { switch(opt){ case STDPARAM_ARGS: if (ncp_li_arg(li, opt, optarg)) ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/quota/quota.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ * Disk quota reporting program. */ #include -__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.26 2007/02/01 08:37:44 mpp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.28 2007/02/04 14:06:58 mpp Exp $"); #include #include @@ -85,7 +85,7 @@ char fsname[MAXPATHLEN + 1]; }; -static const char *timeprt(time_t seconds); +static char *timeprt(time_t seconds, int *needfree); static struct quotause *getprivs(long id, int quotatype); static void usage(void); static int showuid(u_long uid); @@ -271,6 +271,8 @@ struct quotause *quplist; const char *msgi, *msgb; const char *nam; + char *bgrace, *igrace; + int bfree, ifree; int lines = 0, overquota = 0; static time_t now; @@ -348,16 +350,22 @@ , (u_long) (dbtob(qup->dqblk.dqb_bhardlimit) / 1024)); } + if (msgb != NULL) + bgrace = timeprt(qup->dqblk.dqb_btime, &bfree); + if (msgi != NULL) + igrace = timeprt(qup->dqblk.dqb_itime, &ifree); printf("%8s%8lu%c%7lu%8lu%8s\n" - , (msgb == (char *)0) ? "" - :timeprt(qup->dqblk.dqb_btime) + , (msgb == (char *)0) ? "" : bgrace , (u_long)qup->dqblk.dqb_curinodes , (msgi == (char *)0) ? ' ' : '*' , (u_long)qup->dqblk.dqb_isoftlimit , (u_long)qup->dqblk.dqb_ihardlimit - , (msgi == (char *)0) ? "" - : timeprt(qup->dqblk.dqb_itime) + , (msgi == (char *)0) ? "" : igrace ); + if (msgb != NULL && bfree) + free(bgrace); + if (msgi != NULL && ifree) + free(igrace); continue; } } @@ -390,30 +398,38 @@ /* * Calculate the grace period and return a printable string for it. */ -static const char * -timeprt(time_t seconds) +static char * +timeprt(time_t seconds, int *needfree) { time_t hours, minutes; - static char buf[20]; + char *buf; static time_t now; if (now == 0) time(&now); - if (now > seconds) + if (now > seconds) { + *needfree = 0; return ("none"); + } seconds -= now; minutes = (seconds + 30) / 60; hours = (minutes + 30) / 60; if (hours >= 36) { - sprintf(buf, "%lddays", ((long)hours + 12) / 24); + if (asprintf(&buf, "%lddays", ((long)hours + 12) / 24) < 0) + errx(1, "asprintf failed in timeprt(1)"); + *needfree = 1; return (buf); } if (minutes >= 60) { - sprintf(buf, "%2ld:%ld", (long)minutes / 60, - (long)minutes % 60); + if (asprintf(&buf, "%2ld:%ld", (long)minutes / 60, + (long)minutes % 60) < 0) + errx(1, "asprintf failed in timeprt(2)"); + *needfree = 1; return (buf); } - sprintf(buf, "%2ld", (long)minutes); + if (asprintf(&buf, "%2ld", (long)minutes) < 0) + errx(1, "asprintf failed in timeprt(3)"); + *needfree = 1; return (buf); } @@ -483,13 +499,17 @@ static int ufshasquota(struct fstab *fs, int type, char **qfnamep) { + char *opt; + char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; - char *opt, *cp; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -503,12 +523,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/apmd/apmd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.8 2005/03/24 01:26:40 mdodd Exp $"; + "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.9 2007/02/05 07:35:23 kevlo Exp $"; #endif /* not lint */ #include @@ -650,7 +650,7 @@ char *prog; int logopt = LOG_NDELAY | LOG_PID; - while ((ch = getopt(ac, av, "df:sv")) != EOF) { + while ((ch = getopt(ac, av, "df:sv")) != -1) { switch (ch) { case 'd': daemonize = 0; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/apmd/contrib/pccardq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.5 2001/08/20 15:09:32 brian Exp $ */ +/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.6 2007/02/05 07:35:23 kevlo Exp $ */ #include #include @@ -36,7 +36,7 @@ tmp_dir = getenv("TMPDIR") ? getenv("TMPDIR") : tmp_dir; - while ((ch = getopt(ac, av, "ans:")) != EOF) { + while ((ch = getopt(ac, av, "ans:")) != -1) { switch (ch) { case 'a': slot_map = ~0; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * Bridge MIB implementation for SNMPd. * Bridge OS specific ioctls. * - * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.5 2006/12/29 19:23:38 bz Exp $ + * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.6 2007/02/04 13:31:05 syrinx Exp $ */ #include @@ -36,9 +36,7 @@ #include #include -#if __FreeBSD_version > 700018 #include -#endif #include #include #include @@ -238,10 +236,8 @@ bif->max_age = 100 * b_req.ifbop_maxage; bif->hello_time = 100 * b_req.ifbop_hellotime; bif->fwd_delay = 100 * b_req.ifbop_fwddelay; -#if __FreeBSD_version > 700024 bif->stp_version = b_req.ifbop_protocol; bif->tx_hold_count = b_req.ifbop_holdcount; -#endif if (b_req.ifbop_root_port == 0 && bif->root_port != b_req.ifbop_root_port) @@ -436,7 +432,6 @@ bridge_set_tx_hold_count(struct bridge_if *bif __unused, int32_t tx_hc __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -457,16 +452,12 @@ bif->tx_hold_count = b_param.ifbrp_txhc; return (0); -#else - return (-1); -#endif } int bridge_set_stp_version(struct bridge_if *bif __unused, int32_t stp_proto __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -484,9 +475,6 @@ bif->stp_version = b_param.ifbrp_proto; return (0); -#else - return (-1); -#endif } /* @@ -643,9 +631,7 @@ case BSTP_IFSTATE_FORWARDING: return (StpPortState_forwarding); case BSTP_IFSTATE_BLOCKING: -#if __FreeBSD_version > 700024 case BSTP_IFSTATE_DISCARDING: -#endif return (StpPortState_blocking); } @@ -671,12 +657,11 @@ * the maximum value." */ -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMCOST) bp->admin_path_cost = k_info->ifbr_path_cost; else bp->admin_path_cost = 0; -#endif + bp->path_cost = k_info->ifbr_path_cost; if (k_info->ifbr_ifsflags & IFBIF_STP) @@ -690,7 +675,6 @@ else bp->span_enable = begemotBridgeBaseSpanEnabled_disabled; -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMEDGE) bp->admin_edge = TruthValue_true; else @@ -714,7 +698,6 @@ bp->admin_ptp = StpPortAdminPointToPointType_forceFalse; bp->oper_ptp = TruthValue_false; } -#endif } /* @@ -830,11 +813,9 @@ struct ifdrv ifd; struct ifbreq b_req; -#if __FreeBSD_version < 700025 if (path_cost < SNMP_PORT_MIN_PATHCOST || path_cost > SNMP_PORT_PATHCOST_OBSOLETE) return (-2); -#endif strlcpy(ifd.ifd_name, bif_name, sizeof(ifd.ifd_name)); ifd.ifd_len = sizeof(b_req); @@ -850,11 +831,7 @@ return (-1); } -#if __FreeBSD_version > 700024 bp->admin_path_cost = path_cost; -#else - bp->path_cost = path_cost; -#endif return (0); } @@ -866,7 +843,6 @@ bridge_port_set_admin_ptp(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t admin_ptp __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -909,9 +885,6 @@ bp->admin_ptp = admin_ptp; return (0); -#else - return (-1); -#endif } /* @@ -921,7 +894,6 @@ bridge_port_set_admin_edge(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t enable __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -955,10 +927,8 @@ } bp->admin_edge = enable; + return (0); -#else - return (-1); -#endif } /* ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/edquota/edquota.8#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)edquota.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.23 2005/01/18 20:02:33 ru Exp $ +.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.24 2007/02/04 14:26:01 mpp Exp $ .\" .Dd June 6, 1993 .Dt EDQUOTA 8 @@ -222,6 +222,8 @@ grace period should be imposed. Setting a grace period to one second indicates that no grace period should be granted. +Quotas must be turned off for the file system and +then turned back on for the new grace period to take effect. .Pp Only the super-user may edit quotas. .Sh FILES ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/edquota/edquota.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.24 2006/09/14 04:45:44 charnier Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.26 2007/02/04 06:33:14 mpp Exp $"); /* * Disk quota editor. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -375,7 +376,13 @@ getentry(quotagroup, GRPQUOTA)); (void) fchmod(fd, 0640); } - lseek(fd, (long)(id * sizeof(struct dqblk)), L_SET); + if (lseek(fd, (off_t)id * sizeof(struct dqblk), + L_SET) < 0) { + warn("seek error on %s", qfpathname); + close(fd); + free(qup); + continue; + } switch (read(fd, &qup->dqblk, sizeof(struct dqblk))) { case 0: /* EOF */ /* @@ -421,21 +428,70 @@ { register struct quotause *qup; int qcmd, fd; + struct dqblk dqbuf; qcmd = QCMD(Q_SETQUOTA, quotatype); for (qup = quplist; qup; qup = qup->next) { if (quotactl(qup->fsname, qcmd, id, &qup->dqblk) == 0) continue; - if ((fd = open(qup->qfname, O_WRONLY)) < 0) { + if ((fd = open(qup->qfname, O_RDWR)) < 0) { warn("%s", qup->qfname); - } else { - lseek(fd, (long)id * (long)sizeof (struct dqblk), 0); - if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != - sizeof (struct dqblk)) { - warn("%s", qup->qfname); - } + continue; + } + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); + close(fd); + continue; + } + switch (read(fd, &dqbuf, sizeof(struct dqblk))) { + case 0: /* EOF */ + /* + * Convert implicit 0 quota (EOF) + * into an explicit one (zero'ed dqblk) + */ + bzero(&dqbuf, sizeof(struct dqblk)); + break; + + case sizeof(struct dqblk): /* OK */ + break; + + default: /* ERROR */ + warn("read error in %s", qup->qfname); + close(fd); + continue; + } + /* + * Reset time limit if have a soft limit and were + * previously under it, but are now over it + * or if there previously was no soft limit, but + * now have one and are over it. + */ + if (dqbuf.dqb_bsoftlimit && id != 0 && + dqbuf.dqb_curblocks < dqbuf.dqb_bsoftlimit && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_bsoftlimit == 0 && id != 0 && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_isoftlimit && id != 0 && + dqbuf.dqb_curinodes < dqbuf.dqb_isoftlimit && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + if (dqbuf.dqb_isoftlimit == 0 && id !=0 && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + qup->dqblk.dqb_curinodes = dqbuf.dqb_curinodes; + qup->dqblk.dqb_curblocks = dqbuf.dqb_curblocks; + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); close(fd); + continue; } + if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != + sizeof (struct dqblk)) { + warn("%s", qup->qfname); + } + close(fd); } } @@ -814,18 +870,21 @@ */ int hasquota(fs, type, qfnamep) - register struct fstab *fs; + struct fstab *fs; int type; char **qfnamep; { - register char *opt; + char *opt; char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -839,11 +898,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + sleep(3); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/iostat/iostat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.31 2006/04/16 22:30:24 maxim Exp $ + * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.32 2007/02/06 20:29:40 jhb Exp $ */ /* * Parts of this program are derived from the original FreeBSD iostat @@ -823,15 +823,16 @@ if (kd != NULL) { ssize_t nbytes; - nbytes = kvm_read(kd, nlid, ptr, len); + nbytes = kvm_read(kd, namelist[nlid].n_value, ptr, len); - if (nbytes == 0) { - warnx("kvm_read(%s): %s", name, kvm_geterr(kd)); + if (nbytes < 0) { + warnx("kvm_read(%s): %s", namelist[nlid].n_name, + kvm_geterr(kd)); return (1); } if (nbytes != len) { - warnx("kvm_read(%s): expected %lu bytes, got %ld bytes", - name, (unsigned long)len, (long)nbytes); + warnx("kvm_read(%s): expected %zu bytes, got %zd bytes", + namelist[nlid].n_name, len, nbytes); return (1); } } else { ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mountd.8 8.4 (Berkeley) 4/28/95 -.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.28 2006/05/02 21:00:43 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.30 2007/02/03 00:15:46 pjd Exp $ .\" -.Dd May 2, 2006 +.Dd February 3, 2007 .Dt MOUNTD 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nm .Op Fl 2dlnr .Op Fl p Ar port -.Op Ar exportsfile +.Op Ar exportsfile ... .Sh DESCRIPTION The .Nm @@ -106,6 +106,7 @@ .It Ar exportsfile Specify an alternate location for the exports file. +More than one exports file can be specified. .El .Pp When ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.92 2007/01/26 13:26:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.93 2007/02/03 00:12:18 pjd Exp $"); #include #include @@ -205,7 +205,8 @@ struct exportlist *exphead; struct mountlist *mlhead; struct grouplist *grphead; -char exname[MAXPATHLEN]; +char *exnames_default[2] = { _PATH_EXPORTS, NULL }; +char **exnames; struct xucred def_anon = { XUCRED_VERSION, (uid_t)-2, @@ -322,11 +323,10 @@ grphead = (struct grouplist *)NULL; exphead = (struct exportlist *)NULL; mlhead = (struct mountlist *)NULL; - if (argc == 1) { - strncpy(exname, *argv, MAXPATHLEN-1); - exname[MAXPATHLEN-1] = '\0'; - } else - strcpy(exname, _PATH_EXPORTS); + if (argc > 0) + exnames = argv; + else + exnames = exnames_default; openlog("mountd", LOG_PID, LOG_DAEMON); if (debug) warnx("getting export list"); @@ -541,7 +541,7 @@ { fprintf(stderr, "usage: mountd [-2] [-d] [-l] [-n] [-p ] [-r] " - "[export_file]\n"); + "[export_file ...]\n"); exit(1); } @@ -953,130 +953,20 @@ FILE *exp_file; /* - * Get the export list + * Get the export list from one, currently open file */ -void -get_exportlist() +static void +get_exportlist_one() { struct exportlist *ep, *ep2; struct grouplist *grp, *tgrp; struct exportlist **epp; - struct export_args export; struct dirlist *dirhead; - struct iovec *iov; - struct statfs fsb, *fsp, *mntbufp; + struct statfs fsb; struct xucred anon; - struct xvfsconf vfc; char *cp, *endcp, *dirp, *hst, *usr, *dom, savedc; - char errmsg[255]; - int len, has_host, exflags, got_nondir, dirplen, num, i, netgrp; - int iovlen; - - bzero(&export, sizeof(export)); - export.ex_flags = MNT_DELEXPORT; - dirp = NULL; - dirplen = 0; - iov = NULL; - iovlen = 0; - bzero(errmsg, sizeof(errmsg)); - - /* - * First, get rid of the old list - */ - ep = exphead; - while (ep) { - ep2 = ep; - ep = ep->ex_next; - free_exp(ep2); - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 7 15:59:19 2007 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 A5E6F16A404; Wed, 7 Feb 2007 15:59:18 +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 8078316A402 for ; Wed, 7 Feb 2007 15:59:18 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E50413C428 for ; Wed, 7 Feb 2007 15:59:18 +0000 (UTC) (envelope-from bushman@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 l17FxIGp094808 for ; Wed, 7 Feb 2007 15:59:18 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17FxHX8094805 for perforce@freebsd.org; Wed, 7 Feb 2007 15:59:17 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 15:59:17 GMT Message-Id: <200702071559.l17FxHX8094805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114177 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: Wed, 07 Feb 2007 15:59:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114177 Change 114177 by bushman@bushman_nss_ldap_cached on 2007/02/07 15:59:14 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/branches.bl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/create_patches.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/tgmath.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/C.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/getent/getent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/quota/quota.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/update_branches.sh#1 branch Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.6 2006/03/05 15:45:38 matteo Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | grep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 schweikh Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -6,23 +6,23 @@ * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -137,5 +137,5 @@ extern int svc_kerb_reg(SVCXPRT *, char *, char *, char *); extern enum auth_stat _svcauth_kerb(struct svc_req *, struct rpc_msg *); -#endif KERBEROS +#endif /* KERBEROS */ #endif /* !_RPC_AUTH_KERB_H */ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/tgmath.h#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/include/tgmath.h,v 1.4 2004/09/03 23:44:09 stefanf Exp $ + * $FreeBSD: src/include/tgmath.h,v 1.5 2007/02/02 18:30:23 schweikh Exp $ */ #ifndef _TGMATH_H_ @@ -64,8 +64,8 @@ #define __tg_is_complex(e1, e2, e3) \ (__tg_type3(e1, e2, e3, float _Complex) || \ __tg_type3(e1, e2, e3, double _Complex) || \ - __tg_type3(e1, e2, e3, long double _Complex)) || \ - __tg_type3(e1, e2, e3, __typeof__(_Complex_I)) + __tg_type3(e1, e2, e3, long double _Complex) || \ + __tg_type3(e1, e2, e3, __typeof__(_Complex_I))) #define __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) \ __builtin_choose_expr(__tg_type_corr(x, y, z, long double), \ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/C.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.12 2007/02/04 20:07:07 rse Exp $"); #include #include @@ -114,7 +114,7 @@ */ case '"': case '\'': - (void)skip_string(c); + skip_string(c); break; /* ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/fortran.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.12 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.13 2007/02/04 20:06:10 rse Exp $"); #include #include @@ -124,7 +124,7 @@ continue; for (cp = lbp + 1; *cp && intoken(*cp); ++cp) continue; - if ((cp = lbp + 1)) + if (cp == lbp + 1) continue; *cp = EOS; (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ctags/tree.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.12 2007/02/04 20:04:29 rse Exp $"); #include #include @@ -126,10 +126,12 @@ static void free_tree(NODE *node) { + NODE *node_next; while (node) { if (node->right) free_tree(node->right); + node_next = node->left; free(node); - node = node->left; + node = node_next; } } ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/getent/getent.c#2 (text) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.2 2006/05/04 11:28:16 ume Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.3 2007/02/04 20:52:57 rse Exp $"); #include #include @@ -77,7 +77,7 @@ RV_OK = 0, RV_USAGE = 1, RV_NOTFOUND = 2, - RV_NOENUM = 3, + RV_NOENUM = 3 }; static struct getentdb { @@ -109,7 +109,6 @@ for (curdb = databases; curdb->name != NULL; curdb++) { if (strcmp(curdb->name, argv[1]) == 0) { exit(curdb->callback(argc, argv)); - break; } } fprintf(stderr, "Unknown database: %s\n", argv[1]); @@ -178,6 +177,7 @@ curpref = sep; } printf("\n"); + va_end(ap); } /* ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/mklocale/yacc.y#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.25 2005/05/16 09:32:41 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.26 2007/02/06 08:48:28 kevlo Exp $"); #include @@ -227,7 +227,7 @@ fp = stdout; - while ((x = getopt(ac, av, "do:")) != EOF) { + while ((x = getopt(ac, av, "do:")) != -1) { switch(x) { case 'd': debug = 1; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ncplist/ncplist.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.2 2002/04/28 12:21:31 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.3 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -380,7 +380,7 @@ bzero(args, sizeof(args)); what = LO_NONE; - while ((opt = getopt(argc, argv, "h")) != EOF) { + while ((opt = getopt(argc, argv, "h")) != -1) { switch (opt) { case 'h': case '?': help(); ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ncplogin/ncplogin.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2002/09/04 23:29:04 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.5 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -69,7 +69,7 @@ login(int argc, char *argv[], struct ncp_conn_loginfo *li) { int error = 0, connid, opt, setprimary = 0; - while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != EOF){ + while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != -1) { switch(opt){ case STDPARAM_ARGS: if (ncp_li_arg(li, opt, optarg)) ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/quota/quota.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ * Disk quota reporting program. */ #include -__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.26 2007/02/01 08:37:44 mpp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.28 2007/02/04 14:06:58 mpp Exp $"); #include #include @@ -85,7 +85,7 @@ char fsname[MAXPATHLEN + 1]; }; -static const char *timeprt(time_t seconds); +static char *timeprt(time_t seconds, int *needfree); static struct quotause *getprivs(long id, int quotatype); static void usage(void); static int showuid(u_long uid); @@ -271,6 +271,8 @@ struct quotause *quplist; const char *msgi, *msgb; const char *nam; + char *bgrace, *igrace; + int bfree, ifree; int lines = 0, overquota = 0; static time_t now; @@ -348,16 +350,22 @@ , (u_long) (dbtob(qup->dqblk.dqb_bhardlimit) / 1024)); } + if (msgb != NULL) + bgrace = timeprt(qup->dqblk.dqb_btime, &bfree); + if (msgi != NULL) + igrace = timeprt(qup->dqblk.dqb_itime, &ifree); printf("%8s%8lu%c%7lu%8lu%8s\n" - , (msgb == (char *)0) ? "" - :timeprt(qup->dqblk.dqb_btime) + , (msgb == (char *)0) ? "" : bgrace , (u_long)qup->dqblk.dqb_curinodes , (msgi == (char *)0) ? ' ' : '*' , (u_long)qup->dqblk.dqb_isoftlimit , (u_long)qup->dqblk.dqb_ihardlimit - , (msgi == (char *)0) ? "" - : timeprt(qup->dqblk.dqb_itime) + , (msgi == (char *)0) ? "" : igrace ); + if (msgb != NULL && bfree) + free(bgrace); + if (msgi != NULL && ifree) + free(igrace); continue; } } @@ -390,30 +398,38 @@ /* * Calculate the grace period and return a printable string for it. */ -static const char * -timeprt(time_t seconds) +static char * +timeprt(time_t seconds, int *needfree) { time_t hours, minutes; - static char buf[20]; + char *buf; static time_t now; if (now == 0) time(&now); - if (now > seconds) + if (now > seconds) { + *needfree = 0; return ("none"); + } seconds -= now; minutes = (seconds + 30) / 60; hours = (minutes + 30) / 60; if (hours >= 36) { - sprintf(buf, "%lddays", ((long)hours + 12) / 24); + if (asprintf(&buf, "%lddays", ((long)hours + 12) / 24) < 0) + errx(1, "asprintf failed in timeprt(1)"); + *needfree = 1; return (buf); } if (minutes >= 60) { - sprintf(buf, "%2ld:%ld", (long)minutes / 60, - (long)minutes % 60); + if (asprintf(&buf, "%2ld:%ld", (long)minutes / 60, + (long)minutes % 60) < 0) + errx(1, "asprintf failed in timeprt(2)"); + *needfree = 1; return (buf); } - sprintf(buf, "%2ld", (long)minutes); + if (asprintf(&buf, "%2ld", (long)minutes) < 0) + errx(1, "asprintf failed in timeprt(3)"); + *needfree = 1; return (buf); } @@ -483,13 +499,17 @@ static int ufshasquota(struct fstab *fs, int type, char **qfnamep) { + char *opt; + char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; - char *opt, *cp; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -503,12 +523,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/apmd/apmd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.8 2005/03/24 01:26:40 mdodd Exp $"; + "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.9 2007/02/05 07:35:23 kevlo Exp $"; #endif /* not lint */ #include @@ -650,7 +650,7 @@ char *prog; int logopt = LOG_NDELAY | LOG_PID; - while ((ch = getopt(ac, av, "df:sv")) != EOF) { + while ((ch = getopt(ac, av, "df:sv")) != -1) { switch (ch) { case 'd': daemonize = 0; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/apmd/contrib/pccardq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.5 2001/08/20 15:09:32 brian Exp $ */ +/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.6 2007/02/05 07:35:23 kevlo Exp $ */ #include #include @@ -36,7 +36,7 @@ tmp_dir = getenv("TMPDIR") ? getenv("TMPDIR") : tmp_dir; - while ((ch = getopt(ac, av, "ans:")) != EOF) { + while ((ch = getopt(ac, av, "ans:")) != -1) { switch (ch) { case 'a': slot_map = ~0; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Bridge MIB implementation for SNMPd. * Bridge OS specific ioctls. * - * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.5 2006/12/29 19:23:38 bz Exp $ + * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.6 2007/02/04 13:31:05 syrinx Exp $ */ #include @@ -36,9 +36,7 @@ #include #include -#if __FreeBSD_version > 700018 #include -#endif #include #include #include @@ -238,10 +236,8 @@ bif->max_age = 100 * b_req.ifbop_maxage; bif->hello_time = 100 * b_req.ifbop_hellotime; bif->fwd_delay = 100 * b_req.ifbop_fwddelay; -#if __FreeBSD_version > 700024 bif->stp_version = b_req.ifbop_protocol; bif->tx_hold_count = b_req.ifbop_holdcount; -#endif if (b_req.ifbop_root_port == 0 && bif->root_port != b_req.ifbop_root_port) @@ -436,7 +432,6 @@ bridge_set_tx_hold_count(struct bridge_if *bif __unused, int32_t tx_hc __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -457,16 +452,12 @@ bif->tx_hold_count = b_param.ifbrp_txhc; return (0); -#else - return (-1); -#endif } int bridge_set_stp_version(struct bridge_if *bif __unused, int32_t stp_proto __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -484,9 +475,6 @@ bif->stp_version = b_param.ifbrp_proto; return (0); -#else - return (-1); -#endif } /* @@ -643,9 +631,7 @@ case BSTP_IFSTATE_FORWARDING: return (StpPortState_forwarding); case BSTP_IFSTATE_BLOCKING: -#if __FreeBSD_version > 700024 case BSTP_IFSTATE_DISCARDING: -#endif return (StpPortState_blocking); } @@ -671,12 +657,11 @@ * the maximum value." */ -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMCOST) bp->admin_path_cost = k_info->ifbr_path_cost; else bp->admin_path_cost = 0; -#endif + bp->path_cost = k_info->ifbr_path_cost; if (k_info->ifbr_ifsflags & IFBIF_STP) @@ -690,7 +675,6 @@ else bp->span_enable = begemotBridgeBaseSpanEnabled_disabled; -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMEDGE) bp->admin_edge = TruthValue_true; else @@ -714,7 +698,6 @@ bp->admin_ptp = StpPortAdminPointToPointType_forceFalse; bp->oper_ptp = TruthValue_false; } -#endif } /* @@ -830,11 +813,9 @@ struct ifdrv ifd; struct ifbreq b_req; -#if __FreeBSD_version < 700025 if (path_cost < SNMP_PORT_MIN_PATHCOST || path_cost > SNMP_PORT_PATHCOST_OBSOLETE) return (-2); -#endif strlcpy(ifd.ifd_name, bif_name, sizeof(ifd.ifd_name)); ifd.ifd_len = sizeof(b_req); @@ -850,11 +831,7 @@ return (-1); } -#if __FreeBSD_version > 700024 bp->admin_path_cost = path_cost; -#else - bp->path_cost = path_cost; -#endif return (0); } @@ -866,7 +843,6 @@ bridge_port_set_admin_ptp(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t admin_ptp __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -909,9 +885,6 @@ bp->admin_ptp = admin_ptp; return (0); -#else - return (-1); -#endif } /* @@ -921,7 +894,6 @@ bridge_port_set_admin_edge(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t enable __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -955,10 +927,8 @@ } bp->admin_edge = enable; + return (0); -#else - return (-1); -#endif } /* ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/edquota/edquota.8#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)edquota.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.23 2005/01/18 20:02:33 ru Exp $ +.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.24 2007/02/04 14:26:01 mpp Exp $ .\" .Dd June 6, 1993 .Dt EDQUOTA 8 @@ -222,6 +222,8 @@ grace period should be imposed. Setting a grace period to one second indicates that no grace period should be granted. +Quotas must be turned off for the file system and +then turned back on for the new grace period to take effect. .Pp Only the super-user may edit quotas. .Sh FILES ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/edquota/edquota.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.24 2006/09/14 04:45:44 charnier Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.26 2007/02/04 06:33:14 mpp Exp $"); /* * Disk quota editor. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -375,7 +376,13 @@ getentry(quotagroup, GRPQUOTA)); (void) fchmod(fd, 0640); } - lseek(fd, (long)(id * sizeof(struct dqblk)), L_SET); + if (lseek(fd, (off_t)id * sizeof(struct dqblk), + L_SET) < 0) { + warn("seek error on %s", qfpathname); + close(fd); + free(qup); + continue; + } switch (read(fd, &qup->dqblk, sizeof(struct dqblk))) { case 0: /* EOF */ /* @@ -421,21 +428,70 @@ { register struct quotause *qup; int qcmd, fd; + struct dqblk dqbuf; qcmd = QCMD(Q_SETQUOTA, quotatype); for (qup = quplist; qup; qup = qup->next) { if (quotactl(qup->fsname, qcmd, id, &qup->dqblk) == 0) continue; - if ((fd = open(qup->qfname, O_WRONLY)) < 0) { + if ((fd = open(qup->qfname, O_RDWR)) < 0) { warn("%s", qup->qfname); - } else { - lseek(fd, (long)id * (long)sizeof (struct dqblk), 0); - if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != - sizeof (struct dqblk)) { - warn("%s", qup->qfname); - } + continue; + } + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); + close(fd); + continue; + } + switch (read(fd, &dqbuf, sizeof(struct dqblk))) { + case 0: /* EOF */ + /* + * Convert implicit 0 quota (EOF) + * into an explicit one (zero'ed dqblk) + */ + bzero(&dqbuf, sizeof(struct dqblk)); + break; + + case sizeof(struct dqblk): /* OK */ + break; + + default: /* ERROR */ + warn("read error in %s", qup->qfname); + close(fd); + continue; + } + /* + * Reset time limit if have a soft limit and were + * previously under it, but are now over it + * or if there previously was no soft limit, but + * now have one and are over it. + */ + if (dqbuf.dqb_bsoftlimit && id != 0 && + dqbuf.dqb_curblocks < dqbuf.dqb_bsoftlimit && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_bsoftlimit == 0 && id != 0 && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_isoftlimit && id != 0 && + dqbuf.dqb_curinodes < dqbuf.dqb_isoftlimit && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + if (dqbuf.dqb_isoftlimit == 0 && id !=0 && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + qup->dqblk.dqb_curinodes = dqbuf.dqb_curinodes; + qup->dqblk.dqb_curblocks = dqbuf.dqb_curblocks; + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); close(fd); + continue; } + if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != + sizeof (struct dqblk)) { + warn("%s", qup->qfname); + } + close(fd); } } @@ -814,18 +870,21 @@ */ int hasquota(fs, type, qfnamep) - register struct fstab *fs; + struct fstab *fs; int type; char **qfnamep; { - register char *opt; + char *opt; char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -839,11 +898,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + sleep(3); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/iostat/iostat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.31 2006/04/16 22:30:24 maxim Exp $ + * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.32 2007/02/06 20:29:40 jhb Exp $ */ /* * Parts of this program are derived from the original FreeBSD iostat @@ -823,15 +823,16 @@ if (kd != NULL) { ssize_t nbytes; - nbytes = kvm_read(kd, nlid, ptr, len); + nbytes = kvm_read(kd, namelist[nlid].n_value, ptr, len); - if (nbytes == 0) { - warnx("kvm_read(%s): %s", name, kvm_geterr(kd)); + if (nbytes < 0) { + warnx("kvm_read(%s): %s", namelist[nlid].n_name, + kvm_geterr(kd)); return (1); } if (nbytes != len) { - warnx("kvm_read(%s): expected %lu bytes, got %ld bytes", - name, (unsigned long)len, (long)nbytes); + warnx("kvm_read(%s): expected %zu bytes, got %zd bytes", + namelist[nlid].n_name, len, nbytes); return (1); } } else { ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/mountd/mountd.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mountd.8 8.4 (Berkeley) 4/28/95 -.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.28 2006/05/02 21:00:43 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.30 2007/02/03 00:15:46 pjd Exp $ .\" -.Dd May 2, 2006 +.Dd February 3, 2007 .Dt MOUNTD 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nm .Op Fl 2dlnr .Op Fl p Ar port -.Op Ar exportsfile +.Op Ar exportsfile ... .Sh DESCRIPTION The .Nm @@ -106,6 +106,7 @@ .It Ar exportsfile Specify an alternate location for the exports file. +More than one exports file can be specified. .El .Pp When ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/mountd/mountd.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.92 2007/01/26 13:26:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.93 2007/02/03 00:12:18 pjd Exp $"); #include #include @@ -205,7 +205,8 @@ struct exportlist *exphead; struct mountlist *mlhead; struct grouplist *grphead; -char exname[MAXPATHLEN]; +char *exnames_default[2] = { _PATH_EXPORTS, NULL }; +char **exnames; struct xucred def_anon = { XUCRED_VERSION, (uid_t)-2, @@ -322,11 +323,10 @@ grphead = (struct grouplist *)NULL; exphead = (struct exportlist *)NULL; mlhead = (struct mountlist *)NULL; - if (argc == 1) { - strncpy(exname, *argv, MAXPATHLEN-1); - exname[MAXPATHLEN-1] = '\0'; - } else - strcpy(exname, _PATH_EXPORTS); + if (argc > 0) + exnames = argv; + else + exnames = exnames_default; openlog("mountd", LOG_PID, LOG_DAEMON); if (debug) warnx("getting export list"); @@ -541,7 +541,7 @@ { fprintf(stderr, "usage: mountd [-2] [-d] [-l] [-n] [-p ] [-r] " - "[export_file]\n"); + "[export_file ...]\n"); exit(1); } @@ -953,130 +953,20 @@ FILE *exp_file; /* - * Get the export list + * Get the export list from one, currently open file */ -void -get_exportlist() +static void +get_exportlist_one() { struct exportlist *ep, *ep2; struct grouplist *grp, *tgrp; struct exportlist **epp; - struct export_args export; struct dirlist *dirhead; - struct iovec *iov; - struct statfs fsb, *fsp, *mntbufp; + struct statfs fsb; struct xucred anon; - struct xvfsconf vfc; char *cp, *endcp, *dirp, *hst, *usr, *dom, savedc; - char errmsg[255]; - int len, has_host, exflags, got_nondir, dirplen, num, i, netgrp; - int iovlen; - - bzero(&export, sizeof(export)); - export.ex_flags = MNT_DELEXPORT; - dirp = NULL; - dirplen = 0; - iov = NULL; - iovlen = 0; - bzero(errmsg, sizeof(errmsg)); - - /* - * First, get rid of the old list - */ - ep = exphead; - while (ep) { - ep2 = ep; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:02:23 2007 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 5A7A916A404; Wed, 7 Feb 2007 16:02:23 +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 1B56E16A400 for ; Wed, 7 Feb 2007 16:02:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F403D13C4AA for ; Wed, 7 Feb 2007 16:02:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17G2MKn095605 for ; Wed, 7 Feb 2007 16:02:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17G2MOf095602 for perforce@freebsd.org; Wed, 7 Feb 2007 16:02:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 16:02:22 GMT Message-Id: <200702071602.l17G2MOf095602@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 Cc: Subject: PERFORCE change 114178 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: Wed, 07 Feb 2007 16:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114178 Change 114178 by rwatson@rwatson_cinnamon on 2007/02/07 16:01:37 Rename bpf_ioctl_rotate to bpf_ioctl_rotzbuf in order to match the ioctl constant name. Discussed with: csjp Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#18 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#19 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#8 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#18 (text+ko) ==== @@ -336,15 +336,15 @@ } static int -bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +bpf_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); #ifdef BPF_ZEROCOPY - return (bpf_zerocopy_ioctl_rotate(td, d, bz)); + return (bpf_zerocopy_ioctl_rotzbuf(td, d, bz)); #else - panic("bpf_ioctl_rotate"); + panic("bpf_ioctl_rotzbuf"); #endif } @@ -1298,7 +1298,7 @@ return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); case BIOCROTZBUF: - return (bpf_ioctl_rotate(td, d, (struct bpf_zbuf *) addr)); + return (bpf_ioctl_rotzbuf(td, d, (struct bpf_zbuf *)addr)); } return (error); } ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#19 (text+ko) ==== @@ -579,7 +579,7 @@ } int -bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, +bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { struct zbuf *bzh; ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#8 (text+ko) ==== @@ -51,7 +51,7 @@ size_t *i); int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); -int bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, +int bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:03:26 2007 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 AC41716A404; Wed, 7 Feb 2007 16:03:25 +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 6492C16A402 for ; Wed, 7 Feb 2007 16:03:25 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 530EB13C4B2 for ; Wed, 7 Feb 2007 16:03:25 +0000 (UTC) (envelope-from bushman@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 l17G3Puc097040 for ; Wed, 7 Feb 2007 16:03:25 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17G3OXg097034 for perforce@freebsd.org; Wed, 7 Feb 2007 16:03:24 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 16:03:24 GMT Message-Id: <200702071603.l17G3OXg097034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114179 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: Wed, 07 Feb 2007 16:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=114179 Change 114179 by bushman@bushman_nss_ldap_cached on 2007/02/07 16:02:27 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/branches.bl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/create_patches.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/tgmath.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/C.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/getent/getent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/quota/quota.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/update_branches.sh#1 branch Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#3 (text+ko) ==== @@ -100,7 +100,11 @@ { struct nss_ldap_connection_error conn_err; int dummy_fd, backup_fd, rv; - + + /* + * If we can't get the socket from ldap connection, then don't + * close it gracefully and just ignore it. + */ if (conn->sock_fd == -1) return (NSS_LDAP_CONNECTION_ERROR); @@ -114,7 +118,7 @@ if (dummy_fd != conn->sock_fd) { backup_fd = dup(conn->sock_fd); dup2(dummy_fd, conn->sock_fd); - close (conn->sock_fd); + close(conn->sock_fd); } memset(&conn_err, 0, sizeof(struct nss_ldap_connection_error)); rv = __nss_ldap_disconnect(&__nss_ldap_conf->connection_method, conn, @@ -138,13 +142,9 @@ struct nss_ldap_connection_error conn_err_; int rv; - if (check_connection_socket(conn) != 0) { + if (check_connection_socket(conn) != 0 || conn->last_pid != getpid()) { rv = close_lost_connection(conn); return (NSS_LDAP_CONNECTION_ERROR); - } else if (conn->last_pid != getpid()) { - (void)__nss_ldap_disconnect(&__nss_ldap_conf->connection_method, - conn, __nss_ldap_conf, &conn_err_); - return (NSS_LDAP_CONNECTION_ERROR); } else return (NSS_LDAP_SUCCESS); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#3 (text+ko) ==== @@ -118,7 +118,7 @@ static pthread_rwlock_t nss_ldap_lock = PTHREAD_RWLOCK_INITIALIZER; static struct nss_ldap_configuration nss_ldap_conf; struct nss_ldap_configuration *__nss_ldap_conf = NULL; -int __nss_ldap_debug_level = 4; +int __nss_ldap_debug_level = 1; static int nss_ldap_configure(); static void nss_ldap_atexit(); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.6 2006/03/05 15:45:38 matteo Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | grep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 schweikh Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -6,23 +6,23 @@ * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -137,5 +137,5 @@ extern int svc_kerb_reg(SVCXPRT *, char *, char *, char *); extern enum auth_stat _svcauth_kerb(struct svc_req *, struct rpc_msg *); -#endif KERBEROS +#endif /* KERBEROS */ #endif /* !_RPC_AUTH_KERB_H */ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/tgmath.h#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/include/tgmath.h,v 1.4 2004/09/03 23:44:09 stefanf Exp $ + * $FreeBSD: src/include/tgmath.h,v 1.5 2007/02/02 18:30:23 schweikh Exp $ */ #ifndef _TGMATH_H_ @@ -64,8 +64,8 @@ #define __tg_is_complex(e1, e2, e3) \ (__tg_type3(e1, e2, e3, float _Complex) || \ __tg_type3(e1, e2, e3, double _Complex) || \ - __tg_type3(e1, e2, e3, long double _Complex)) || \ - __tg_type3(e1, e2, e3, __typeof__(_Complex_I)) + __tg_type3(e1, e2, e3, long double _Complex) || \ + __tg_type3(e1, e2, e3, __typeof__(_Complex_I))) #define __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) \ __builtin_choose_expr(__tg_type_corr(x, y, z, long double), \ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/C.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.12 2007/02/04 20:07:07 rse Exp $"); #include #include @@ -114,7 +114,7 @@ */ case '"': case '\'': - (void)skip_string(c); + skip_string(c); break; /* ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/fortran.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.12 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.13 2007/02/04 20:06:10 rse Exp $"); #include #include @@ -124,7 +124,7 @@ continue; for (cp = lbp + 1; *cp && intoken(*cp); ++cp) continue; - if ((cp = lbp + 1)) + if (cp == lbp + 1) continue; *cp = EOS; (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ctags/tree.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.11 2002/07/28 15:50:38 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.12 2007/02/04 20:04:29 rse Exp $"); #include #include @@ -126,10 +126,12 @@ static void free_tree(NODE *node) { + NODE *node_next; while (node) { if (node->right) free_tree(node->right); + node_next = node->left; free(node); - node = node->left; + node = node_next; } } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/getent/getent.c#2 (text) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.2 2006/05/04 11:28:16 ume Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.3 2007/02/04 20:52:57 rse Exp $"); #include #include @@ -77,7 +77,7 @@ RV_OK = 0, RV_USAGE = 1, RV_NOTFOUND = 2, - RV_NOENUM = 3, + RV_NOENUM = 3 }; static struct getentdb { @@ -109,7 +109,6 @@ for (curdb = databases; curdb->name != NULL; curdb++) { if (strcmp(curdb->name, argv[1]) == 0) { exit(curdb->callback(argc, argv)); - break; } } fprintf(stderr, "Unknown database: %s\n", argv[1]); @@ -178,6 +177,7 @@ curpref = sep; } printf("\n"); + va_end(ap); } /* ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/mklocale/yacc.y#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.25 2005/05/16 09:32:41 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.26 2007/02/06 08:48:28 kevlo Exp $"); #include @@ -227,7 +227,7 @@ fp = stdout; - while ((x = getopt(ac, av, "do:")) != EOF) { + while ((x = getopt(ac, av, "do:")) != -1) { switch(x) { case 'd': debug = 1; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ncplist/ncplist.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.2 2002/04/28 12:21:31 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.3 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -380,7 +380,7 @@ bzero(args, sizeof(args)); what = LO_NONE; - while ((opt = getopt(argc, argv, "h")) != EOF) { + while ((opt = getopt(argc, argv, "h")) != -1) { switch (opt) { case 'h': case '?': help(); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ncplogin/ncplogin.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2002/09/04 23:29:04 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.5 2007/02/05 07:35:23 kevlo Exp $"); #include #include @@ -69,7 +69,7 @@ login(int argc, char *argv[], struct ncp_conn_loginfo *li) { int error = 0, connid, opt, setprimary = 0; - while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != EOF){ + while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != -1) { switch(opt){ case STDPARAM_ARGS: if (ncp_li_arg(li, opt, optarg)) ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/quota/quota.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ * Disk quota reporting program. */ #include -__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.26 2007/02/01 08:37:44 mpp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.28 2007/02/04 14:06:58 mpp Exp $"); #include #include @@ -85,7 +85,7 @@ char fsname[MAXPATHLEN + 1]; }; -static const char *timeprt(time_t seconds); +static char *timeprt(time_t seconds, int *needfree); static struct quotause *getprivs(long id, int quotatype); static void usage(void); static int showuid(u_long uid); @@ -271,6 +271,8 @@ struct quotause *quplist; const char *msgi, *msgb; const char *nam; + char *bgrace, *igrace; + int bfree, ifree; int lines = 0, overquota = 0; static time_t now; @@ -348,16 +350,22 @@ , (u_long) (dbtob(qup->dqblk.dqb_bhardlimit) / 1024)); } + if (msgb != NULL) + bgrace = timeprt(qup->dqblk.dqb_btime, &bfree); + if (msgi != NULL) + igrace = timeprt(qup->dqblk.dqb_itime, &ifree); printf("%8s%8lu%c%7lu%8lu%8s\n" - , (msgb == (char *)0) ? "" - :timeprt(qup->dqblk.dqb_btime) + , (msgb == (char *)0) ? "" : bgrace , (u_long)qup->dqblk.dqb_curinodes , (msgi == (char *)0) ? ' ' : '*' , (u_long)qup->dqblk.dqb_isoftlimit , (u_long)qup->dqblk.dqb_ihardlimit - , (msgi == (char *)0) ? "" - : timeprt(qup->dqblk.dqb_itime) + , (msgi == (char *)0) ? "" : igrace ); + if (msgb != NULL && bfree) + free(bgrace); + if (msgi != NULL && ifree) + free(igrace); continue; } } @@ -390,30 +398,38 @@ /* * Calculate the grace period and return a printable string for it. */ -static const char * -timeprt(time_t seconds) +static char * +timeprt(time_t seconds, int *needfree) { time_t hours, minutes; - static char buf[20]; + char *buf; static time_t now; if (now == 0) time(&now); - if (now > seconds) + if (now > seconds) { + *needfree = 0; return ("none"); + } seconds -= now; minutes = (seconds + 30) / 60; hours = (minutes + 30) / 60; if (hours >= 36) { - sprintf(buf, "%lddays", ((long)hours + 12) / 24); + if (asprintf(&buf, "%lddays", ((long)hours + 12) / 24) < 0) + errx(1, "asprintf failed in timeprt(1)"); + *needfree = 1; return (buf); } if (minutes >= 60) { - sprintf(buf, "%2ld:%ld", (long)minutes / 60, - (long)minutes % 60); + if (asprintf(&buf, "%2ld:%ld", (long)minutes / 60, + (long)minutes % 60) < 0) + errx(1, "asprintf failed in timeprt(2)"); + *needfree = 1; return (buf); } - sprintf(buf, "%2ld", (long)minutes); + if (asprintf(&buf, "%2ld", (long)minutes) < 0) + errx(1, "asprintf failed in timeprt(3)"); + *needfree = 1; return (buf); } @@ -483,13 +499,17 @@ static int ufshasquota(struct fstab *fs, int type, char **qfnamep) { + char *opt; + char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; - char *opt, *cp; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -503,12 +523,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/apmd/apmd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.8 2005/03/24 01:26:40 mdodd Exp $"; + "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.9 2007/02/05 07:35:23 kevlo Exp $"; #endif /* not lint */ #include @@ -650,7 +650,7 @@ char *prog; int logopt = LOG_NDELAY | LOG_PID; - while ((ch = getopt(ac, av, "df:sv")) != EOF) { + while ((ch = getopt(ac, av, "df:sv")) != -1) { switch (ch) { case 'd': daemonize = 0; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/apmd/contrib/pccardq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.5 2001/08/20 15:09:32 brian Exp $ */ +/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.6 2007/02/05 07:35:23 kevlo Exp $ */ #include #include @@ -36,7 +36,7 @@ tmp_dir = getenv("TMPDIR") ? getenv("TMPDIR") : tmp_dir; - while ((ch = getopt(ac, av, "ans:")) != EOF) { + while ((ch = getopt(ac, av, "ans:")) != -1) { switch (ch) { case 'a': slot_map = ~0; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Bridge MIB implementation for SNMPd. * Bridge OS specific ioctls. * - * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.5 2006/12/29 19:23:38 bz Exp $ + * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.6 2007/02/04 13:31:05 syrinx Exp $ */ #include @@ -36,9 +36,7 @@ #include #include -#if __FreeBSD_version > 700018 #include -#endif #include #include #include @@ -238,10 +236,8 @@ bif->max_age = 100 * b_req.ifbop_maxage; bif->hello_time = 100 * b_req.ifbop_hellotime; bif->fwd_delay = 100 * b_req.ifbop_fwddelay; -#if __FreeBSD_version > 700024 bif->stp_version = b_req.ifbop_protocol; bif->tx_hold_count = b_req.ifbop_holdcount; -#endif if (b_req.ifbop_root_port == 0 && bif->root_port != b_req.ifbop_root_port) @@ -436,7 +432,6 @@ bridge_set_tx_hold_count(struct bridge_if *bif __unused, int32_t tx_hc __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -457,16 +452,12 @@ bif->tx_hold_count = b_param.ifbrp_txhc; return (0); -#else - return (-1); -#endif } int bridge_set_stp_version(struct bridge_if *bif __unused, int32_t stp_proto __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbrparam b_param; @@ -484,9 +475,6 @@ bif->stp_version = b_param.ifbrp_proto; return (0); -#else - return (-1); -#endif } /* @@ -643,9 +631,7 @@ case BSTP_IFSTATE_FORWARDING: return (StpPortState_forwarding); case BSTP_IFSTATE_BLOCKING: -#if __FreeBSD_version > 700024 case BSTP_IFSTATE_DISCARDING: -#endif return (StpPortState_blocking); } @@ -671,12 +657,11 @@ * the maximum value." */ -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMCOST) bp->admin_path_cost = k_info->ifbr_path_cost; else bp->admin_path_cost = 0; -#endif + bp->path_cost = k_info->ifbr_path_cost; if (k_info->ifbr_ifsflags & IFBIF_STP) @@ -690,7 +675,6 @@ else bp->span_enable = begemotBridgeBaseSpanEnabled_disabled; -#if __FreeBSD_version > 700024 if (k_info->ifbr_ifsflags & IFBIF_BSTP_ADMEDGE) bp->admin_edge = TruthValue_true; else @@ -714,7 +698,6 @@ bp->admin_ptp = StpPortAdminPointToPointType_forceFalse; bp->oper_ptp = TruthValue_false; } -#endif } /* @@ -830,11 +813,9 @@ struct ifdrv ifd; struct ifbreq b_req; -#if __FreeBSD_version < 700025 if (path_cost < SNMP_PORT_MIN_PATHCOST || path_cost > SNMP_PORT_PATHCOST_OBSOLETE) return (-2); -#endif strlcpy(ifd.ifd_name, bif_name, sizeof(ifd.ifd_name)); ifd.ifd_len = sizeof(b_req); @@ -850,11 +831,7 @@ return (-1); } -#if __FreeBSD_version > 700024 bp->admin_path_cost = path_cost; -#else - bp->path_cost = path_cost; -#endif return (0); } @@ -866,7 +843,6 @@ bridge_port_set_admin_ptp(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t admin_ptp __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -909,9 +885,6 @@ bp->admin_ptp = admin_ptp; return (0); -#else - return (-1); -#endif } /* @@ -921,7 +894,6 @@ bridge_port_set_admin_edge(const char *bif_name __unused, struct bridge_port *bp __unused, uint32_t enable __unused) { -#if __FreeBSD_version > 700024 struct ifdrv ifd; struct ifbreq b_req; @@ -955,10 +927,8 @@ } bp->admin_edge = enable; + return (0); -#else - return (-1); -#endif } /* ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/edquota/edquota.8#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)edquota.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.23 2005/01/18 20:02:33 ru Exp $ +.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.24 2007/02/04 14:26:01 mpp Exp $ .\" .Dd June 6, 1993 .Dt EDQUOTA 8 @@ -222,6 +222,8 @@ grace period should be imposed. Setting a grace period to one second indicates that no grace period should be granted. +Quotas must be turned off for the file system and +then turned back on for the new grace period to take effect. .Pp Only the super-user may edit quotas. .Sh FILES ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/edquota/edquota.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.24 2006/09/14 04:45:44 charnier Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.26 2007/02/04 06:33:14 mpp Exp $"); /* * Disk quota editor. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -375,7 +376,13 @@ getentry(quotagroup, GRPQUOTA)); (void) fchmod(fd, 0640); } - lseek(fd, (long)(id * sizeof(struct dqblk)), L_SET); + if (lseek(fd, (off_t)id * sizeof(struct dqblk), + L_SET) < 0) { + warn("seek error on %s", qfpathname); + close(fd); + free(qup); + continue; + } switch (read(fd, &qup->dqblk, sizeof(struct dqblk))) { case 0: /* EOF */ /* @@ -421,21 +428,70 @@ { register struct quotause *qup; int qcmd, fd; + struct dqblk dqbuf; qcmd = QCMD(Q_SETQUOTA, quotatype); for (qup = quplist; qup; qup = qup->next) { if (quotactl(qup->fsname, qcmd, id, &qup->dqblk) == 0) continue; - if ((fd = open(qup->qfname, O_WRONLY)) < 0) { + if ((fd = open(qup->qfname, O_RDWR)) < 0) { warn("%s", qup->qfname); - } else { - lseek(fd, (long)id * (long)sizeof (struct dqblk), 0); - if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != - sizeof (struct dqblk)) { - warn("%s", qup->qfname); - } + continue; + } + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); + close(fd); + continue; + } + switch (read(fd, &dqbuf, sizeof(struct dqblk))) { + case 0: /* EOF */ + /* + * Convert implicit 0 quota (EOF) + * into an explicit one (zero'ed dqblk) + */ + bzero(&dqbuf, sizeof(struct dqblk)); + break; + + case sizeof(struct dqblk): /* OK */ + break; + + default: /* ERROR */ + warn("read error in %s", qup->qfname); + close(fd); + continue; + } + /* + * Reset time limit if have a soft limit and were + * previously under it, but are now over it + * or if there previously was no soft limit, but + * now have one and are over it. + */ + if (dqbuf.dqb_bsoftlimit && id != 0 && + dqbuf.dqb_curblocks < dqbuf.dqb_bsoftlimit && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_bsoftlimit == 0 && id != 0 && + dqbuf.dqb_curblocks >= qup->dqblk.dqb_bsoftlimit) + qup->dqblk.dqb_btime = 0; + if (dqbuf.dqb_isoftlimit && id != 0 && + dqbuf.dqb_curinodes < dqbuf.dqb_isoftlimit && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + if (dqbuf.dqb_isoftlimit == 0 && id !=0 && + dqbuf.dqb_curinodes >= qup->dqblk.dqb_isoftlimit) + qup->dqblk.dqb_itime = 0; + qup->dqblk.dqb_curinodes = dqbuf.dqb_curinodes; + qup->dqblk.dqb_curblocks = dqbuf.dqb_curblocks; + if (lseek(fd, (off_t)id * sizeof(struct dqblk), L_SET) < 0) { + warn("seek error on %s", qup->qfname); close(fd); + continue; } + if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != + sizeof (struct dqblk)) { + warn("%s", qup->qfname); + } + close(fd); } } @@ -814,18 +870,21 @@ */ int hasquota(fs, type, qfnamep) - register struct fstab *fs; + struct fstab *fs; int type; char **qfnamep; { - register char *opt; + char *opt; char *cp; + struct statfs sfb; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; if (!initname) { - sprintf(usrname, "%s%s", qfextension[USRQUOTA], qfname); - sprintf(grpname, "%s%s", qfextension[GRPQUOTA], qfname); + (void)snprintf(usrname, sizeof(usrname), "%s%s", + qfextension[USRQUOTA], qfname); + (void)snprintf(grpname, sizeof(grpname), "%s%s", + qfextension[GRPQUOTA], qfname); initname = 1; } strcpy(buf, fs->fs_mntops); @@ -839,11 +898,22 @@ } if (!opt) return (0); - if (cp) { + if (cp) *qfnamep = cp; - return (1); + else { + (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, + qfname, qfextension[type]); + *qfnamep = buf; + } + if (statfs(fs->fs_file, &sfb) != 0) { + warn("cannot statfs mount point %s", fs->fs_file); + return (0); + } + if (strcmp(fs->fs_file, sfb.f_mntonname)) { + warnx("%s not mounted for %s quotas", fs->fs_file, + type == USRQUOTA ? "user" : "group"); + sleep(3); + return (0); } - (void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]); - *qfnamep = buf; return (1); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/iostat/iostat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.31 2006/04/16 22:30:24 maxim Exp $ + * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.32 2007/02/06 20:29:40 jhb Exp $ */ /* * Parts of this program are derived from the original FreeBSD iostat @@ -823,15 +823,16 @@ if (kd != NULL) { ssize_t nbytes; - nbytes = kvm_read(kd, nlid, ptr, len); + nbytes = kvm_read(kd, namelist[nlid].n_value, ptr, len); - if (nbytes == 0) { - warnx("kvm_read(%s): %s", name, kvm_geterr(kd)); + if (nbytes < 0) { + warnx("kvm_read(%s): %s", namelist[nlid].n_name, + kvm_geterr(kd)); return (1); } if (nbytes != len) { - warnx("kvm_read(%s): expected %lu bytes, got %ld bytes", - name, (unsigned long)len, (long)nbytes); + warnx("kvm_read(%s): expected %zu bytes, got %zd bytes", + namelist[nlid].n_name, len, nbytes); return (1); } } else { ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mountd.8 8.4 (Berkeley) 4/28/95 -.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.28 2006/05/02 21:00:43 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.30 2007/02/03 00:15:46 pjd Exp $ .\" -.Dd May 2, 2006 +.Dd February 3, 2007 .Dt MOUNTD 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nm .Op Fl 2dlnr .Op Fl p Ar port -.Op Ar exportsfile +.Op Ar exportsfile ... .Sh DESCRIPTION The .Nm @@ -106,6 +106,7 @@ .It Ar exportsfile Specify an alternate location for the exports file. +More than one exports file can be specified. .El .Pp When ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.92 2007/01/26 13:26:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.93 2007/02/03 00:12:18 pjd Exp $"); #include #include @@ -205,7 +205,8 @@ struct exportlist *exphead; struct mountlist *mlhead; struct grouplist *grphead; -char exname[MAXPATHLEN]; +char *exnames_default[2] = { _PATH_EXPORTS, NULL }; +char **exnames; struct xucred def_anon = { XUCRED_VERSION, (uid_t)-2, @@ -322,11 +323,10 @@ grphead = (struct grouplist *)NULL; exphead = (struct exportlist *)NULL; mlhead = (struct mountlist *)NULL; - if (argc == 1) { - strncpy(exname, *argv, MAXPATHLEN-1); - exname[MAXPATHLEN-1] = '\0'; - } else - strcpy(exname, _PATH_EXPORTS); + if (argc > 0) + exnames = argv; + else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:19:47 2007 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 06F6016A404; Wed, 7 Feb 2007 16:19:47 +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 AA81E16A401 for ; Wed, 7 Feb 2007 16:19:46 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD9B13C4A6 for ; Wed, 7 Feb 2007 16:19:46 +0000 (UTC) (envelope-from bushman@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 l17GJkA9000387 for ; Wed, 7 Feb 2007 16:19:46 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17GJk9r000384 for perforce@freebsd.org; Wed, 7 Feb 2007 16:19:46 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 16:19:46 GMT Message-Id: <200702071619.l17GJk9r000384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114181 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: Wed, 07 Feb 2007 16:19:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=114181 Change 114181 by bushman@bushman_nss_ldap_cached on 2007/02/07 16:19:13 Minor bug Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#20 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#20 (text+ko) ==== @@ -323,7 +323,7 @@ else { pwd->pw_change = 0; __nss_ldap_log(NSS_LDAP_LL_WARN_INT, - "nss_ldap_parse_passwd: ", + "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowLastChange), rv, __nss_ldap_err2str(rv)); @@ -337,7 +337,7 @@ else { pwd->pw_expire = 0; __nss_ldap_log(NSS_LDAP_LL_WARN_INT, - "nss_ldap_parse_passwd: ", + "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowExpire), rv, __nss_ldap_err2str(rv)); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:19:47 2007 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 7A78416A51C; Wed, 7 Feb 2007 16:19:47 +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 097DE16A406 for ; Wed, 7 Feb 2007 16:19:47 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EE01F13C494 for ; Wed, 7 Feb 2007 16:19:46 +0000 (UTC) (envelope-from bushman@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 l17GJkob000394 for ; Wed, 7 Feb 2007 16:19:46 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17GJkSG000390 for perforce@freebsd.org; Wed, 7 Feb 2007 16:19:46 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 16:19:46 GMT Message-Id: <200702071619.l17GJkSG000390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114182 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: Wed, 07 Feb 2007 16:19:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=114182 Change 114182 by bushman@bushman_nss_ldap_cached on 2007/02/07 16:19:38 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.c#4 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.c#4 (text+ko) ==== @@ -323,7 +323,7 @@ else { pwd->pw_change = 0; __nss_ldap_log(NSS_LDAP_LL_WARN_INT, - "nss_ldap_parse_passwd: ", + "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowLastChange), rv, __nss_ldap_err2str(rv)); @@ -337,7 +337,7 @@ else { pwd->pw_expire = 0; __nss_ldap_log(NSS_LDAP_LL_WARN_INT, - "nss_ldap_parse_passwd: ", + "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowExpire), rv, __nss_ldap_err2str(rv)); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:29:00 2007 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 D637E16A4C8; Wed, 7 Feb 2007 16:28:59 +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 7C10616A49C for ; Wed, 7 Feb 2007 16:28:59 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 53A4613C4A8 for ; Wed, 7 Feb 2007 16:28:59 +0000 (UTC) (envelope-from bushman@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 l17GSxuf002197 for ; Wed, 7 Feb 2007 16:28:59 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17GSxkn002194 for perforce@freebsd.org; Wed, 7 Feb 2007 16:28:59 GMT (envelope-from bushman@freebsd.org) Date: Wed, 7 Feb 2007 16:28:59 GMT Message-Id: <200702071628.l17GSxkn002194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114184 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: Wed, 07 Feb 2007 16:29:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=114184 Change 114184 by bushman@bushman_nss_ldap_cached on 2007/02/07 16:28:40 Small bugfix in buildport.sh utility Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#2 (text+ko) ==== @@ -36,7 +36,7 @@ lastdir=`pwd` cd $1 - make -DDISTDIR='$2' makesum + make DISTDIR="$2" makesum cd $lastdir } @@ -72,4 +72,4 @@ cp $new_src_path.tar.gz $DEST_DIST_ARCHIVE_PATH #removing temp dir -rm -rf $TMPDIR+rm -rf $TMPDIR From owner-p4-projects@FreeBSD.ORG Wed Feb 7 17:23:11 2007 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 4F87916A406; Wed, 7 Feb 2007 17:23:10 +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 61CF416A401 for ; Wed, 7 Feb 2007 17:23:08 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5221013C47E for ; Wed, 7 Feb 2007 17:23:08 +0000 (UTC) (envelope-from csjp@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 l17HN8vo023902 for ; Wed, 7 Feb 2007 17:23:08 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17HN8Yo023899 for perforce@freebsd.org; Wed, 7 Feb 2007 17:23:08 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 17:23:08 GMT Message-Id: <200702071723.l17HN8Yo023899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114188 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: Wed, 07 Feb 2007 17:23:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=114188 Change 114188 by csjp@csjp_rnd01 on 2007/02/07 17:22:19 Dont try to free a pointer which references packets within mmaped pages. This explains why things seemed to randomly segfault on SIGINT Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#7 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#7 (text+ko) ==== @@ -1245,9 +1245,17 @@ munmap(p->zbuf1, v); if (p->zbuf2 != NULL) munmap(p->zbuf2, v); -#endif + /* + * If we are using zerocopy, the packet buffer will be referencing + * an address in one of the shared pages, if any. In which case + * we will not free it. + */ + if (getenv("BPF_ZERO_COPY") == NULL && p->buffer != NULL) + free(p->buffer); +#else if (p->buffer != NULL) free(p->buffer); +#endif if (p->dlt_list != NULL) free(p->dlt_list); free(p); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:28:31 2007 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 D539616A402; Wed, 7 Feb 2007 18:28:30 +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 6B0CB16A400 for ; Wed, 7 Feb 2007 18:28:30 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A9A313C471 for ; Wed, 7 Feb 2007 18:28:30 +0000 (UTC) (envelope-from rdivacky@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 l17ISUGO036230 for ; Wed, 7 Feb 2007 18:28:30 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17ISTsb036227 for perforce@freebsd.org; Wed, 7 Feb 2007 18:28:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 18:28:29 GMT Message-Id: <200702071828.l17ISTsb036227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114193 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: Wed, 07 Feb 2007 18:28:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114193 Change 114193 by rdivacky@rdivacky_witten on 2007/02/07 18:27:32 Dont "return" in linux_clone() after we forked the new process in a case of problems. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#34 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#28 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#34 (text+ko) ==== @@ -610,6 +610,10 @@ if ((args->flags & 0xffffff00) == THREADING_FLAGS) ff |= RFTHREAD; + if (args->flags & CLONE_PARENT_SETTID) + if (args->parent_tidptr == NULL) + return (EINVAL); + error = fork1(td, ff, 0, &p2); if (error) return (error); @@ -629,15 +633,9 @@ KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ if (args->flags & CLONE_PARENT_SETTID) { - if (args->parent_tidptr == NULL) { - EMUL_UNLOCK(&emul_lock); - return (EINVAL); - } error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) { - EMUL_UNLOCK(&emul_lock); - return (error); - } + if (error) + printf(LMSG("copyout failed!")); } if (args->flags & CLONE_THREAD) { @@ -679,52 +677,56 @@ int idx; error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); - if (error) - return (error); + if (error) { + printf(LMSG("copyin failed!")); + } else { - idx = info.entry_number; + idx = info.entry_number; - /* - * looks like we're getting the idx we returned - * in the set_thread_area() syscall - */ - if (idx != 6 && idx != GUGS32_SEL) - return (EINVAL); + /* + * looks like we're getting the idx we returned + * in the set_thread_area() syscall + */ + if (idx != 6 && idx != GUGS32_SEL) { + printf(LMSG("resetting idx!")); + idx = 6; /* or GUGS32_SEL? */ + } - /* this doesnt happen in practice */ - if (idx == 6) { - /* we might copy out the entry_number as GUGS32_SEL */ - info.entry_number = GUGS32_SEL; - error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); - if (error) - return (error); - } + /* this doesnt happen in practice */ + if (idx == 6) { + /* we might copy out the entry_number as GUGS32_SEL */ + info.entry_number = GUGS32_SEL; + error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); + if (error) + printf(LMSG("copyout failed!")); + } - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); - memcpy(&sd, &a, sizeof(a)); + memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG - if (ldebug(clone)) - printf("Segment created in clone with CLONE_SETTLS: " - "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " - "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " - "def32: %i, gran: %i\n", - sd.sd_lobase, - sd.sd_hibase, - sd.sd_lolimit, - sd.sd_hilimit, - sd.sd_type, - sd.sd_dpl, - sd.sd_p, - sd.sd_xx, - sd.sd_long, - sd.sd_def32, - sd.sd_gran); + if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: " + "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " + "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", + sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_long, + sd.sd_def32, + sd.sd_gran); #endif - td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; - td2->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; - memcpy(&td2->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); + td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; + td2->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; + memcpy(&td2->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); + } } #ifdef DEBUG ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#28 (text+ko) ==== @@ -423,6 +423,10 @@ if ((args->flags & 0xffffff00) == THREADING_FLAGS) ff |= RFTHREAD; + if (args->flags & CLONE_PARENT_SETTID) + if (args->parent_tidptr == NULL) + return (EINVAL); + error = fork1(td, ff, 0, &p2); if (error) return (error); @@ -442,15 +446,9 @@ KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ if (args->flags & CLONE_PARENT_SETTID) { - if (args->parent_tidptr == NULL) { - EMUL_UNLOCK(&emul_lock); - return (EINVAL); - } error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) { - EMUL_UNLOCK(&emul_lock); - return (error); - } + if (error) + printf(LMSG("copyout failed!")); } if (args->flags & CLONE_THREAD) { @@ -492,34 +490,37 @@ struct segment_descriptor sd; error = copyin((void *)td->td_frame->tf_esi, &info, sizeof(struct l_user_desc)); - if (error) - return (error); + if (error) { + printf(LMSG("copyin failed!")); + } else { - idx = info.entry_number; + idx = info.entry_number; - /* - * looks like we're getting the idx we returned - * in the set_thread_area() syscall - */ - if (idx != 6 && idx != 3) - return (EINVAL); + /* + * looks like we're getting the idx we returned + * in the set_thread_area() syscall + */ + if (idx != 6 && idx != 3) { + printf(LMSG("resetting idx!")); + idx = 3; + } - /* this doesnt happen in practice */ - if (idx == 6) { - /* we might copy out the entry_number as 3 */ - info.entry_number = 3; - error = copyout(&info, (void *) td->td_frame->tf_esi, sizeof(struct l_user_desc)); - if (error) - return (error); - } + /* this doesnt happen in practice */ + if (idx == 6) { + /* we might copy out the entry_number as 3 */ + info.entry_number = 3; + error = copyout(&info, (void *) td->td_frame->tf_esi, sizeof(struct l_user_desc)); + if (error) + printf(LMSG("copyout failed!")); + } - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); - memcpy(&sd, &a, sizeof(a)); + memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG - if (ldebug(clone)) - printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, + if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, sd.sd_hibase, sd.sd_lolimit, sd.sd_hilimit, @@ -531,9 +532,10 @@ sd.sd_gran); #endif - /* set %gs */ - td2->td_pcb->pcb_gsd = sd; - td2->td_pcb->pcb_gs = GSEL(GUGS_SEL, SEL_UPL); + /* set %gs */ + td2->td_pcb->pcb_gsd = sd; + td2->td_pcb->pcb_gs = GSEL(GUGS_SEL, SEL_UPL); + } } #ifdef DEBUG From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:29:32 2007 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 5195116A402; Wed, 7 Feb 2007 18:29:32 +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 26A5116A400 for ; Wed, 7 Feb 2007 18:29:32 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1636513C48E for ; Wed, 7 Feb 2007 18:29:32 +0000 (UTC) (envelope-from rdivacky@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 l17ITVDf036287 for ; Wed, 7 Feb 2007 18:29:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17ITVhg036284 for perforce@freebsd.org; Wed, 7 Feb 2007 18:29:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 18:29:31 GMT Message-Id: <200702071829.l17ITVhg036284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114194 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: Wed, 07 Feb 2007 18:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114194 Change 114194 by rdivacky@rdivacky_witten on 2007/02/07 18:29:24 Move the copyout of p2->p_pid outside the emul_lock coverage. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#35 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#29 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#35 (text+ko) ==== @@ -632,11 +632,6 @@ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_PARENT_SETTID) { - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) - printf(LMSG("copyout failed!")); - } if (args->flags & CLONE_THREAD) { #ifdef notyet @@ -659,6 +654,12 @@ EMUL_UNLOCK(&emul_lock); + if (args->flags & CLONE_PARENT_SETTID) { + error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); + if (error) + printf(LMSG("copyout failed!")); + } + PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#29 (text+ko) ==== @@ -445,11 +445,6 @@ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_PARENT_SETTID) { - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) - printf(LMSG("copyout failed!")); - } if (args->flags & CLONE_THREAD) { #ifdef notyet @@ -472,6 +467,12 @@ EMUL_UNLOCK(&emul_lock); + if (args->flags & CLONE_PARENT_SETTID) { + error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); + if (error) + printf(LMSG("copyout failed!")); + } + PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:33:38 2007 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 7D9AC16A40B; Wed, 7 Feb 2007 18:33:38 +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 87D5B16A408 for ; Wed, 7 Feb 2007 18:33:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7793313C49D for ; Wed, 7 Feb 2007 18:33:37 +0000 (UTC) (envelope-from rdivacky@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 l17IXbQn037443 for ; Wed, 7 Feb 2007 18:33:37 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17IXbpC037440 for perforce@freebsd.org; Wed, 7 Feb 2007 18:33:37 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 18:33:37 GMT Message-Id: <200702071833.l17IXbpC037440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114195 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: Wed, 07 Feb 2007 18:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=114195 Change 114195 by rdivacky@rdivacky_witten on 2007/02/07 18:33:12 Cache the em->pdeath_signal in a local variable and move the copyout out of the emul_lock coverage. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#56 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#56 (text+ko) ==== @@ -1652,6 +1652,7 @@ struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; struct linux_emuldata *em; + int pdeath_signal; #ifdef DEBUG if (ldebug(prctl)) @@ -1671,10 +1672,11 @@ case LINUX_PR_GET_PDEATHSIG: em = em_find(p, EMUL_DOLOCK); KASSERT(em != NULL, ("prctl: emuldata not found.\n")); - error = copyout(&em->pdeath_signal, + pdeath_signal = em->pdeath_signal; + EMUL_UNLOCK(&emul_lock); + error = copyout(&pdeath_signal, (void *)(register_t)args->arg2, - sizeof(em->pdeath_signal)); - EMUL_UNLOCK(&emul_lock); + sizeof(pdeath_signal)); break; case LINUX_PR_SET_NAME: /* From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:50:01 2007 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 5A5FC16A40E; Wed, 7 Feb 2007 18:49:59 +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 B182D16A40B for ; Wed, 7 Feb 2007 18:49:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A256E13C442 for ; Wed, 7 Feb 2007 18:49:58 +0000 (UTC) (envelope-from sam@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 l17InwQC039454 for ; Wed, 7 Feb 2007 18:49:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17InwNc039451 for perforce@freebsd.org; Wed, 7 Feb 2007 18:49:58 GMT (envelope-from sam@freebsd.org) Date: Wed, 7 Feb 2007 18:49:58 GMT Message-Id: <200702071849.l17InwNc039451@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 Cc: Subject: PERFORCE change 114197 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: Wed, 07 Feb 2007 18:50:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=114197 Change 114197 by sam@sam_ebb on 2007/02/07 18:49:20 oops, this explains why the sr9 didn't scan properly Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 (text+ko) ==== @@ -693,13 +693,7 @@ okrate = badrate = fixedrate = 0; - if (IEEE80211_IS_CHAN_HALF(se->se_chan)) { - srs = &ic->ic_sup_half_rates; - } else if (IEEE80211_IS_CHAN_QUARTER(se->se_chan)) { - srs = &ic->ic_sup_quarter_rates; - } else { - srs = &ic->ic_sup_rates[ieee80211_chan2mode(se->se_chan)]; - } + srs = ieee80211_get_suprates(ic, se->se_chan); nrs = se->se_rates[1]; rs = se->se_rates+2; fixedrate = IEEE80211_FIXED_RATE_NONE; ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 (text+ko) ==== @@ -114,8 +114,6 @@ u_int16_t ic_modecaps; /* set of mode capabilities */ u_int16_t ic_curmode; /* current mode */ struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX]; - struct ieee80211_rateset ic_sup_half_rates; - struct ieee80211_rateset ic_sup_quarter_rates; u_int16_t ic_bintval; /* beacon interval */ u_int16_t ic_lintval; /* listen interval */ u_int16_t ic_holdover; /* PM hold over duration */ From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:55:09 2007 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 A231C16A402; Wed, 7 Feb 2007 18:55:06 +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 353C716A400 for ; Wed, 7 Feb 2007 18:55:05 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C31BB13C481 for ; Wed, 7 Feb 2007 18:55:05 +0000 (UTC) (envelope-from rdivacky@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 l17It5AE040794 for ; Wed, 7 Feb 2007 18:55:05 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17It5U3040791 for perforce@freebsd.org; Wed, 7 Feb 2007 18:55:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 18:55:05 GMT Message-Id: <200702071855.l17It5U3040791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114198 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: Wed, 07 Feb 2007 18:55:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114198 Change 114198 by rdivacky@rdivacky_witten on 2007/02/07 18:54:39 Turn emul_lock into a mutex and emul_shared_lock into a rwlock. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#9 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#34 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#9 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#57 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -1078,8 +1079,8 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); - sx_init(&emul_shared_lock, "emuldata->shared lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); + rw_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, @@ -1109,8 +1110,8 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); - sx_destroy(&emul_shared_lock); + mtx_destroy(&emul_lock); + rw_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#34 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -55,8 +56,8 @@ #include #endif -struct sx emul_shared_lock; -struct sx emul_lock; +struct rwlock emul_shared_lock; +struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ struct linux_emuldata * ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#9 (text+ko) ==== @@ -57,13 +57,13 @@ struct linux_emuldata *em_find(struct proc *, int locked); -#define EMUL_LOCK(l) sx_xlock(l) -#define EMUL_UNLOCK(l) sx_xunlock(l) +#define EMUL_LOCK(l) mtx_lock(l) +#define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) +#define EMUL_SHARED_RLOCK(l) rw_rlock(l) +#define EMUL_SHARED_RUNLOCK(l) rw_runlock(l) +#define EMUL_SHARED_WLOCK(l) rw_wlock(l) +#define EMUL_SHARED_WUNLOCK(l) rw_wunlock(l) /* for em_find use */ #define EMUL_DOLOCK 1 @@ -74,7 +74,7 @@ void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct sx emul_shared_lock; -extern struct sx emul_lock; +extern struct rwlock emul_shared_lock; +extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#57 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#4 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -917,8 +918,8 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); - sx_init(&emul_shared_lock, "emuldata->shared lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); + rw_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, @@ -948,8 +949,8 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); - sx_destroy(&emul_shared_lock); + mtx_destroy(&emul_lock); + rw_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 18:58:14 2007 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 AB0EE16A402; Wed, 7 Feb 2007 18:58:12 +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 4ED9816A406 for ; Wed, 7 Feb 2007 18:58:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F21C13C4AA for ; Wed, 7 Feb 2007 18:58:11 +0000 (UTC) (envelope-from rdivacky@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 l17IwB7o041291 for ; Wed, 7 Feb 2007 18:58:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17IwBGj041287 for perforce@freebsd.org; Wed, 7 Feb 2007 18:58:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 18:58:11 GMT Message-Id: <200702071858.l17IwBGj041287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114200 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: Wed, 07 Feb 2007 18:58:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114200 Change 114200 by rdivacky@rdivacky_witten on 2007/02/07 18:57:25 Move the free() out of the emul_shared_lock coverage as its not sleepable lock anymore. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 (text+ko) ==== @@ -187,9 +187,11 @@ LIST_REMOVE(em, threads); em->shared->refs--; - if (em->shared->refs == 0) + if (em->shared->refs == 0) { + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); + } else + EMUL_SHARED_WUNLOCK(&emul_shared_lock); if (child_clear_tid != NULL) { struct linux_sys_futex_args cup; @@ -274,9 +276,11 @@ PROC_UNLOCK(p); em->shared->refs--; - if (em->shared->refs == 0) + if (em->shared->refs == 0) { + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); + } else + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em, M_LINUX); } From owner-p4-projects@FreeBSD.ORG Wed Feb 7 19:04:23 2007 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 0849616A408; Wed, 7 Feb 2007 19:04:23 +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 3BAD116A400 for ; Wed, 7 Feb 2007 19:04:22 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D80B313C4BA for ; Wed, 7 Feb 2007 19:04:21 +0000 (UTC) (envelope-from rdivacky@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 l17J4L6A044998 for ; Wed, 7 Feb 2007 19:04:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17J4Iwn044990 for perforce@freebsd.org; Wed, 7 Feb 2007 19:04:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 7 Feb 2007 19:04:18 GMT Message-Id: <200702071904.l17J4Iwn044990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114201 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: Wed, 07 Feb 2007 19:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114201 Change 114201 by rdivacky@rdivacky_witten on 2007/02/07 19:03:33 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#17 integrate .. //depot/projects/linuxolator/src/sys/conf/files#17 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options#16 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_apple.c#2 delete .. //depot/projects/linuxolator/src/sys/geom/geom_gpt.c#3 delete .. //depot/projects/linuxolator/src/sys/geom/part/g_part.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part.h#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_tap.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_tun.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#8 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/sys/_label.h#2 delete .. //depot/projects/linuxolator/src/sys/sys/apm.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/conf.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/mac.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#10 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $ cpu HAMMER ident GENERIC @@ -43,7 +43,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/linuxolator/src/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,13 +23,13 @@ * (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/amd64/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 500 +#define GDB_BUFSZ (GDB_NREGS * 16) #define GDB_NREGS 56 #define GDB_REG_PC 16 ==== //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#2 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.46 2007/02/06 18:04:02 bde Exp $ */ #ifndef _MACHINE_PCPU_H_ -#define _MACHINE_PCPU_H_ +#define _MACHINE_PCPU_H_ #ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite +#error "sys/cdefs.h is a prerequisite for this file" #endif #ifdef _KERNEL @@ -51,16 +51,15 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ -#if defined(lint) - +#ifdef lint + extern struct pcpu *pcpup; - -#define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_PTR(member) (&pcpup->pc_ ## member) -#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) - -#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \ - && defined(__GNUCLIKE___OFFSETOF) + +#define PCPU_GET(member) (pcpup->pc_ ## member) +#define PCPU_PTR(member) (&pcpup->pc_ ## member) +#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) + +#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) /* * Evaluates to the byte offset of the per-cpu variable name. @@ -92,69 +91,39 @@ * Evaluates to the value of the per-cpu variable name. */ #define __PCPU_GET(name) __extension__ ({ \ - __pcpu_type(name) __result; \ + __pcpu_type(name) __res; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__result) == 1) { \ - u_char __b; \ - __asm __volatile("movb %%gs:%1,%0" \ - : "=r" (__b) \ - : "m" (*(u_char *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__b; \ - } else if (sizeof(__result) == 2) { \ - u_short __w; \ - __asm __volatile("movw %%gs:%1,%0" \ - : "=r" (__w) \ - : "m" (*(u_short *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__w; \ - } else if (sizeof(__result) == 4) { \ - u_int __i; \ - __asm __volatile("movl %%gs:%1,%0" \ - : "=r" (__i) \ - : "m" (*(u_int *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__i; \ - } else if (sizeof(__result) == 8) { \ - u_long __l; \ - __asm __volatile("movq %%gs:%1,%0" \ - : "=r" (__l) \ - : "m" (*(u_long *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__l; \ + if (sizeof(__res) == 1 || sizeof(__res) == 2 || \ + sizeof(__res) == 4 || sizeof(__res) == 8) { \ + __asm __volatile("mov %%gs:%1,%0" \ + : "=r" (__s) \ + : "m" (*(struct __s *)(__pcpu_offset(name)))); \ + *(struct __s *)(void *)&__res = __s; \ } else { \ - __result = *__PCPU_PTR(name); \ + __res = *__PCPU_PTR(name); \ } \ - \ - __result; \ + __res; \ }) /* * Sets the value of the per-cpu variable name to value val. */ #define __PCPU_SET(name, val) { \ - __pcpu_type(name) __val = (val); \ + __pcpu_type(name) __val; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__val) == 1) { \ - u_char __b; \ - __b = *(u_char *)&__val; \ - __asm __volatile("movb %1,%%gs:%0" \ - : "=m" (*(u_char *)(__pcpu_offset(name))) \ - : "r" (__b)); \ - } else if (sizeof(__val) == 2) { \ - u_short __w; \ - __w = *(u_short *)&__val; \ - __asm __volatile("movw %1,%%gs:%0" \ - : "=m" (*(u_short *)(__pcpu_offset(name))) \ - : "r" (__w)); \ - } else if (sizeof(__val) == 4) { \ - u_int __i; \ - __i = *(u_int *)&__val; \ - __asm __volatile("movl %1,%%gs:%0" \ - : "=m" (*(u_int *)(__pcpu_offset(name))) \ - : "r" (__i)); \ - } else if (sizeof(__val) == 8) { \ - u_long __l; \ - __l = *(u_long *)&__val; \ - __asm __volatile("movq %1,%%gs:%0" \ - : "=m" (*(u_long *)(__pcpu_offset(name))) \ - : "r" (__l)); \ + __val = (val); \ + if (sizeof(__val) == 1 || sizeof(__val) == 2 || \ + sizeof(__val) == 4 || sizeof(__val) == 8) { \ + __s = *(struct __s *)(void *)&__val; \ + __asm __volatile("mov %1,%%gs:%0" \ + : "=m" (*(struct __s *)(__pcpu_offset(name))) \ + : "r" (__s)); \ } else { \ *__PCPU_PTR(name) = __val; \ } \ @@ -172,12 +141,14 @@ __asm __volatile("movq %%gs:0,%0" : "=r" (td)); return (td); } -#define curthread (__curthread()) +#define curthread (__curthread()) + +#else /* !lint || defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) */ + +#error "this file needs to be ported to your compiler" -#else -#error this file needs to be ported to your compiler -#endif +#endif /* lint, etc. */ -#endif /* _KERNEL */ +#endif /* _KERNEL */ -#endif /* ! _MACHINE_PCPU_H_ */ +#endif /* !_MACHINE_PCPU_H_ */ ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#6 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); #include #include #include @@ -157,7 +157,6 @@ #include #include #include -#include #include #include ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.7 2006/11/29 08:15:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.8 2007/02/06 12:07:14 imp Exp $"); #include #include @@ -375,3 +375,4 @@ DRIVER_MODULE(at91_twi, atmelarm, at91_twi_driver, at91_twi_devclass, 0, 0); DRIVER_MODULE(iicbus, at91_twi, iicbus_driver, iicbus_devclass, 0, 0); +MODULE_DEPEND(at91_twi, iicbus, 1, 1, 1); ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#5 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.16 2007/02/03 07:46:26 kevlo Exp $"); #include #include @@ -203,7 +203,6 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ==== //depot/projects/linuxolator/src/sys/arm/conf/EP80219#3 (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/EP80219,v 1.3 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.4 2007/02/07 18:55:29 marcel Exp $ machine arm ident EP80219 @@ -56,7 +56,7 @@ 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 GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options GEOM_MBR # DOS/MBR partitioning options GEOM_LABEL # Providers labelization. ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.3 2007/01/30 01:18:29 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.4 2007/02/03 07:46:26 kevlo Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -325,7 +325,6 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = npestart; ifp->if_ioctl = npeioctl; ==== //depot/projects/linuxolator/src/sys/boot/common/loader.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.90 2006/11/29 05:53:25 yar Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.91 2007/02/04 06:35:10 imp Exp $ .\" .Dd November 29, 2006 .Dt LOADER 8 @@ -423,12 +423,63 @@ .It Va currdev Selects the default device. Syntax for devices is odd. +.It Va init_chroot +If set to a valid directory in the root file system, it causes +.Xr init 8 +to perform a +.Xr chroot 2 +operation on that directory, making it the new root directory. +That happens before entering single-user mode or multi-user +mode (but after executing the +.Va init_script +if enabled). .It Va init_path Sets the list of binaries which the kernel will try to run as the initial process. The first matching binary is used. The default list is .Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.It Va init_script +If set to a valid file name in the root file system, +instructs +.Xr init 8 +to run that script as the very first action, +before doing anything else. +Signal handling and exit code interpretation is similar to +running the +.Pa /etc/rc +script. +In particular, single-user operation is enforced +if the script terminates with a non-zero exit code, +or if a SIGTERM is delivered to the +.Xr init 8 +process (PID 1). +.It Va init_script +Defines the shell binary to be used for executing the various shell scripts. +The default is +.Dq Li /bin/sh . +It is used for running the +.Va init_script +if set, as well as for the +.Pa /etc/rc +and +.Pa /etc/rc.shutdown +scripts. +The value of the corresponding +.Xr kenv 2 +variable is evaluated every time +.Xr init 8 +calls a shell script, so it can be changed later on using the +.Xr kenv 1 +utility. +In particular, if a non-default shell is used for running an +.Va init_script , +it might be desirable to have that script reset the value of +.Va init_shell +back to the default, so that the +.Pa /etc/rc +script is executed with the standard shell +.Pa /bin/sh . .It Va interpret Has the value .Dq Li OK ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.117 2007/01/14 13:55:43 maxim Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ ############################################################## ### Basic configuration options ############################ @@ -77,6 +77,9 @@ #boot_verbose="" # -v: Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates +#init_shell="/bin/sh" # The shell binary used by init(8). +#init_script="" # Initial script to run by init(8) before chrooting. +#init_chroot="" # Directory for init(8) to chroot into. ############################################################## ==== //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.10 2005/02/20 23:01:57 das Exp $ + * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.11 2007/02/02 15:47:28 pjd Exp $ * */ @@ -57,7 +57,6 @@ vfs_statfs_t coda_nb_statfs; vfs_sync_t coda_sync; vfs_vget_t coda_vget; -vfs_vptofh_t coda_vptofh; vfs_init_t coda_init; int getNewVnode(struct vnode **vpp); ==== //depot/projects/linuxolator/src/sys/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1408 2007/01/30 05:01:06 rodrigc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1409 2007/02/07 18:55:29 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -136,7 +136,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options GEOM_AES # Don't use, use GEOM_BDE -options GEOM_APPLE # Apple partitioning options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels options GEOM_CACHE # Disk cache. @@ -144,12 +143,13 @@ options GEOM_ELI # Disk encryption. options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. -options GEOM_GPT # GPT partitioning options GEOM_JOURNAL # Journaling. options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_MIRROR # Disk mirroring. options GEOM_NOP # Test class. +options GEOM_PART_APM # Apple partitioning +options GEOM_PART_GPT # GPT partitioning options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. options GEOM_SHSEC # Shared secret. ==== //depot/projects/linuxolator/src/sys/conf/files#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1173 2007/01/30 03:11:45 rodrigc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1175 2007/02/07 18:55:29 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -754,8 +754,8 @@ dev/mlx/mlx_pci.c optional mlx pci dev/mly/mly.c optional mly dev/mmc/mmc.c optional mmc -dev/mmc/mmcbr_if.m optional mmc -dev/mmc/mmcbus_if.m optional mmc +dev/mmc/mmcbr_if.m standard +dev/mmc/mmcbus_if.m standard dev/mmc/mmcsd.c optional mmcsd dev/mpt/mpt.c optional mpt dev/mpt/mpt_cam.c optional mpt @@ -1178,7 +1178,6 @@ geom/eli/pkcs5v2.c optional geom_eli geom/gate/g_gate.c optional geom_gate geom/geom_aes.c optional geom_aes -geom/geom_apple.c optional geom_apple geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd geom/geom_ccd.c optional ccd | geom_ccd @@ -1188,7 +1187,6 @@ geom/geom_dump.c standard geom/geom_event.c standard geom/geom_fox.c optional geom_fox -geom/geom_gpt.c optional geom_gpt geom/geom_io.c standard geom/geom_kern.c standard geom/geom_mbr.c optional geom_mbr @@ -1213,6 +1211,10 @@ geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror geom/nop/g_nop.c optional geom_nop +geom/part/g_part.c standard +geom/part/g_part_if.m standard +geom/part/g_part_apm.c optional geom_part_apm +geom/part/g_part_gpt.c optional geom_part_gpt geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 geom/shsec/g_shsec.c optional geom_shsec ==== //depot/projects/linuxolator/src/sys/conf/files.powerpc#4 (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.61 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.62 2007/02/07 18:55:29 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,7 +32,6 @@ dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_powerpc.c optional uart -geom/geom_apple.c standard kern/syscalls.c optional ktr powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard ==== //depot/projects/linuxolator/src/sys/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.213 2006/10/20 07:31:15 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.214 2007/02/03 06:46:11 imp Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -318,7 +318,7 @@ MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ - dev/mmc/mmcbr_if.m mmc/mmcbus_if.m \ + dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ ==== //depot/projects/linuxolator/src/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.574 2007/01/30 05:01:06 rodrigc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.575 2007/02/07 18:55:29 marcel Exp $ # # On the handling of kernel options # @@ -74,7 +74,6 @@ FULL_PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h GEOM_AES opt_geom.h -GEOM_APPLE opt_geom.h GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h GEOM_CACHE opt_geom.h @@ -82,12 +81,13 @@ GEOM_ELI opt_geom.h GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h -GEOM_GPT opt_geom.h GEOM_JOURNAL opt_geom.h GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h GEOM_NOP opt_geom.h +GEOM_PART_APM opt_geom.h +GEOM_PART_GPT opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h GEOM_SHSEC opt_geom.h ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.179 2007/01/04 16:09:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.180 2007/02/03 20:12:00 rink Exp $"); #include "opt_ata.h" #include @@ -118,6 +118,8 @@ static void ata_marvell_edma_dmainit(device_t dev); static int ata_national_chipinit(device_t dev); static void ata_national_setmode(device_t dev, int mode); +static int ata_netcell_chipinit(device_t dev); +static int ata_netcell_allocate(device_t dev); static int ata_nvidia_chipinit(device_t dev); static int ata_nvidia_allocate(device_t dev); static int ata_nvidia_status(device_t dev); @@ -2855,6 +2857,49 @@ } } +/* + * NetCell chipset support functions + */ +int +ata_netcell_ident(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + + if (pci_get_devid(dev) == ATA_NETCELL_SR) { + device_set_desc(dev, "Netcell SyncRAID SR3000/5000 RAID Controller"); + ctlr->chipinit = ata_netcell_chipinit; + return 0; + } + return ENXIO; +} + +static int +ata_netcell_chipinit(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + + if (ata_generic_chipinit(dev)) + return ENXIO; + + ctlr->allocate = ata_netcell_allocate; + return 0; +} + +static int +ata_netcell_allocate(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + /* setup the usual register normal pci style */ + if (ata_pci_allocate(dev)) + return ENXIO; + + /* don't use 32 bit PIO transfers; these cause the NetCell to return + * garbage */ + ch->flags |= ATA_USE_16BIT; + + return 0; +} /* * nVidia chipset support functions ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.117 2006/05/12 05:04:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.118 2007/02/03 20:12:00 rink Exp $"); #include "opt_ata.h" #include @@ -120,6 +120,10 @@ if (!ata_national_ident(dev)) return ATA_PROBE_OK; break; + case ATA_NETCELL_ID: + if (!ata_netcell_ident(dev)) + return ATA_PROBE_OK; + break; case ATA_NVIDIA_ID: if (!ata_nvidia_ident(dev)) return ATA_PROBE_OK; ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#4 (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/sys/dev/ata/ata-pci.h,v 1.73 2007/01/04 16:09:11 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.74 2007/02/03 20:12:00 rink Exp $ */ /* structure holding chipset config info */ @@ -198,6 +198,9 @@ #define ATA_NATIONAL_ID 0x100b #define ATA_SC1100 0x0502100b +#define ATA_NETCELL_ID 0x169c +#define ATA_NETCELL_SR 0x0044169c + #define ATA_NVIDIA_ID 0x10de #define ATA_NFORCE1 0x01bc10de #define ATA_NFORCE2 0x006510de @@ -450,6 +453,7 @@ int ata_marvell_ident(device_t); int ata_national_ident(device_t); int ata_nvidia_ident(device_t); +int ata_netcell_ident(device_t); int ata_promise_ident(device_t); int ata_serverworks_ident(device_t); int ata_sii_ident(device_t); ==== //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.90 2006/12/18 18:48:28 keramida Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.91 2007/02/04 12:47:52 dumbbell Exp $"); #include "opt_isa.h" #include "opt_psm.h" @@ -1251,6 +1251,16 @@ endprobe(ENXIO); } + /* + * Synaptics TouchPad seems to go back to Relative Mode after + * the previous set_controller_command_byte() call; by issueing + * a Read Mode Byte command, the touchpad is in Absolute Mode + * again. + */ + if (sc->hw.model == MOUSE_MODEL_SYNAPTICS) { + mouse_ext_command(sc->kbdc, 1); + } + /* done */ kbdc_set_device_mask(sc->kbdc, mask | KBD_AUX_CONTROL_BITS); kbdc_lock(sc->kbdc, FALSE); ==== //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.115 2006/04/27 20:47:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.116 2007/02/03 07:09:36 imp Exp $"); #include #include @@ -297,6 +297,7 @@ struct pccard_softc *sc = PCCARD_SOFTC(dev); struct pccard_function *pf; struct pccard_config_entry *cfe; + struct pccard_ivar *devi; int state; /* @@ -312,7 +313,9 @@ if (pf->cfe != NULL) pccard_function_disable(pf); pccard_function_free(pf); + devi = PCCARD_IVAR(pf->dev); device_delete_child(dev, pf->dev); + free(devi, M_DEVBUF); } if (sc->sc_enabled_count == 0) POWER_DISABLE_SOCKET(device_get_parent(dev), dev); ==== //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#6 (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/sys/dev/pci/pcireg.h,v 1.57 2007/01/19 22:37:52 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.58 2007/02/02 19:48:25 jhb Exp $ * */ @@ -506,9 +506,31 @@ #define PCIR_HTMSI_ADDRESS_LO 0x4 #define PCIR_HTMSI_ADDRESS_HI 0x8 +/* PCI Vendor capability definitions */ +#define PCIR_VENDOR_LENGTH 0x2 +#define PCIR_VENDOR_DATA 0x3 + +/* PCI EHCI Debug Port definitions */ +#define PCIR_DEBUG_PORT 0x2 +#define PCIM_DEBUG_PORT_OFFSET 0x1FFF +#define PCIM_DEBUG_PORT_BAR 0xe000 + /* PCI-PCI Bridge Subvendor definitions */ #define PCIR_SUBVENDCAP_ID 0x4 +/* PCI Express definitions */ +#define PCIR_EXPRESS_FLAGS 0x2 +#define PCIM_EXP_FLAGS_VERSION 0x000F +#define PCIM_EXP_FLAGS_TYPE 0x00F0 +#define PCIM_EXP_TYPE_ENDPOINT 0x0000 +#define PCIM_EXP_TYPE_LEGACY_ENDPOINT 0x0010 +#define PCIM_EXP_TYPE_ROOT_PORT 0x0040 +#define PCIM_EXP_TYPE_UPSTREAM_PORT 0x0050 +#define PCIM_EXP_TYPE_DOWNSTREAM_PORT 0x0060 +#define PCIM_EXP_TYPE_PCI_BRIDGE 0x0070 +#define PCIM_EXP_FLAGS_SLOT 0x0100 +#define PCIM_EXP_FLAGS_IRQ 0x3e00 + /* MSI-X definitions */ #define PCIR_MSIX_CTRL 0x2 #define PCIM_MSIXCTRL_MSIX_ENABLE 0x8000 ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright Luigi Rizzo, 1997,1998 - * Copyright by Hannu Savolainen 1994, 1995 + * Copyright (c) 1997,1998 Luigi Rizzo + * Copyright (c) 1994,1995 Hannu Savolainen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.39 2006/03/21 03:47:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.40 2007/02/02 13:39:20 joel Exp $"); struct ad1816_info; ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ==== @@ -1,10 +1,34 @@ /*- - * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it) + * Copyright (c) 1997 Luigi Rizzo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * + * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.4 2007/02/02 13:44:09 joel Exp $ + */ + +/* * This file contains information and macro definitions for * the ad1816 chip - * - * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.2 2005/01/06 01:43:17 imp Exp $ */ /* AD1816 register macros */ ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright 1997,1998 Luigi Rizzo. + * Copyright (c) 1997,1998 Luigi Rizzo * * Derived from files in the Voxware 3.5 distribution, * Copyright by Hannu Savolainen 1994, under the same copyright @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.36 2006/01/16 20:01:33 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.37 2007/02/02 13:39:20 joel Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 7 19:08:28 2007 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 1CD1116A40A; Wed, 7 Feb 2007 19:08:28 +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 E2FBC16A408 for ; Wed, 7 Feb 2007 19:08:27 +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 D278813C47E for ; Wed, 7 Feb 2007 19:08:27 +0000 (UTC) (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 l17J8RXK045482 for ; Wed, 7 Feb 2007 19:08:27 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17J8Rbl045479 for perforce@freebsd.org; Wed, 7 Feb 2007 19:08:27 GMT (envelope-from piso@freebsd.org) Date: Wed, 7 Feb 2007 19:08:27 GMT Message-Id: <200702071908.l17J8Rbl045479@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 114202 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: Wed, 07 Feb 2007 19:08:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=114202 Change 114202 by piso@piso_newluxor on 2007/02/07 19:07:31 Start teaching mbuf to libalias's modules: for now, just modify the interfaces, and make all the modules compile. Moreover, in the main libalias code, pullup & fix pointers after modules usage (find_handler()). Next to go: review all the modules one by one, and pullup enough data when they peek & poke packet's payload. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#60 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#22 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#27 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#24 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#14 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#14 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#12 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#17 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#60 (text+ko) ==== @@ -761,10 +761,12 @@ alias_port = ud->uh_dport; ud->uh_dport = GetOriginalPort(lnk); - /* XXX broken - Walk out chain. */ - error = find_handler(IN, UDP, la, pip, &ad); - // XXX m_pullup() - + error = find_handler(IN, UDP, la, ptr, &ad); + PULLUP_IPUDPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); + ud = (struct udphdr *)ip_next(pip); + /* If UDP checksum is not zero, then adjust since destination port */ /* is being unaliased and destination address is being altered. */ if (ud->uh_sum != 0) { @@ -827,9 +829,11 @@ alias_address = GetAliasAddress(lnk); alias_port = GetAliasPort(lnk); - /* XXX broken - Walk out chain. */ - error = find_handler(OUT, UDP, la, pip, &ad); - // XXX m_pullup() + error = find_handler(OUT, UDP, la, ptr, &ad); + PULLUP_IPUDPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); + ud = (struct udphdr *)ip_next(pip); /* If UDP checksum is not zero, adjust since source port is */ /* being aliased and source address is being altered */ @@ -898,9 +902,11 @@ .maxpktsize = 0 }; - /* XXX broken - Walk out chain. */ - error = find_handler(IN, TCP, la, pip, &ad); - // XXX m_pullup() + error = find_handler(IN, TCP, la, ptr, &ad); + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); + tc = (struct tcphdr *)ip_next(pip); alias_address = GetAliasAddress(lnk); original_address = GetOriginalAddress(lnk); @@ -1068,9 +1074,11 @@ /* Monitor TCP connection state */ TcpMonitorOut(lnk, tc->th_flags); - /* XXX broken - Walk out chain. */ - error = find_handler(OUT, TCP, la, pip, &ad); - // XXX m_pullup() + error = find_handler(OUT, TCP, la, ptr, &ad); + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); + tc = (struct tcphdr *)ip_next(pip); /* Adjust TCP checksum since source port is being aliased */ /* and source address is being altered */ @@ -1333,9 +1341,10 @@ .maxpktsize = 0 }; - /* XXX broken - Walk out chain. */ - error = find_handler(IN, IP, la, pip, &ad); - // XXX m_pullup() + error = find_handler(IN, IP, la, ptr, &ad); + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); if (error == 0) iresult = PKT_ALIAS_OK; else @@ -1481,9 +1490,11 @@ .dport = NULL, .maxpktsize = 0 }; - /* XXX broken - Walk out chain. */ - error = find_handler(OUT, IP, la, pip, &ad); - // XXX m_pullup() + + error = find_handler(OUT, IP, la, ptr, &ad); + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (PKT_ALIAS_IGNORED); if (error == 0) iresult = PKT_ALIAS_OK; else ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#15 (text+ko) ==== @@ -56,11 +56,11 @@ #define CUSEEME_PORT_NUMBER 7648 static void -AliasHandleCUSeeMeOut(struct libalias *la, struct ip *pip, +AliasHandleCUSeeMeOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk); static void -AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, +AliasHandleCUSeeMeIn(struct libalias *la, pkt_t ptr, struct in_addr original_addr); static int @@ -75,18 +75,18 @@ } static int -protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlerin(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleCUSeeMeIn(la, pip, *ah->oaddr); + AliasHandleCUSeeMeIn(la, ptr, *ah->oaddr); return (0); } static int -protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlerout(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleCUSeeMeOut(la, pip, ah->lnk); + AliasHandleCUSeeMeOut(la, ptr, ah->lnk); return (0); } @@ -173,14 +173,21 @@ }; static void -AliasHandleCUSeeMeOut(struct libalias *la, struct ip *pip, struct alias_link *lnk) +AliasHandleCUSeeMeOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk) { - struct udphdr *ud = ip_next(pip); + struct ip *pip; + struct udphdr *ud; + + PULLUP_UDPHDR(pip, ptr); + if (pip == NULL) + return; + ud = ip_next(pip); if (ntohs(ud->uh_ulen) - sizeof(struct udphdr) >= sizeof(struct cu_header)) { struct cu_header *cu; struct alias_link *cu_lnk; + // XXX broken cu = udp_next(ud); if (cu->addr) cu->addr = (u_int32_t) GetAliasAddress(lnk).s_addr; @@ -196,9 +203,10 @@ } static void -AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, struct in_addr original_addr) +AliasHandleCUSeeMeIn(struct libalias *la, pkt_t ptr, struct in_addr original_addr) { struct in_addr alias_addr; + struct ip *pip; struct udphdr *ud; struct cu_header *cu; struct oc_header *oc; @@ -207,8 +215,12 @@ int i; (void)la; + PULLUP_UDPHDR(pip, ptr); + if (pip == NULL) + return; alias_addr.s_addr = pip->ip_dst.s_addr; ud = ip_next(pip); + // XXX broken cu = udp_next(ud); oc = (struct oc_header *)(cu + 1); ci = (struct client_info *)(oc + 1); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#15 (text+ko) ==== @@ -57,7 +57,7 @@ #endif static void -AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah); +AliasHandleDummy(struct libalias *la, pkt_t ptr, struct alias_data *ah); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) @@ -86,10 +86,10 @@ */ static int -protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleDummy(la, pip, ah); + AliasHandleDummy(la, ptr, ah); return (0); } @@ -146,7 +146,7 @@ #endif static void -AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah) +AliasHandleDummy(struct libalias *la, pkt_t ptr, struct alias_data *ah) { ; /* Dummy. */ } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#16 (text+ko) ==== @@ -98,7 +98,7 @@ #define FTP_CONTROL_PORT_NUMBER 21 static void -AliasHandleFtpOut(struct libalias *, struct ip *, struct alias_link *, +AliasHandleFtpOut(struct libalias *, pkt_t, struct alias_link *, int maxpacketsize); static int @@ -115,10 +115,10 @@ } static int -protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleFtpOut(la, pip, ah->lnk, ah->maxpktsize); + AliasHandleFtpOut(la, ptr, ah->lnk, ah->maxpktsize); return (0); } @@ -189,23 +189,28 @@ static void AliasHandleFtpOut( struct libalias *la, - struct ip *pip, /* IP packet to examine/patch */ + pkt_t ptr, /* IP packet to examine/patch */ struct alias_link *lnk, /* The link to go through (aliased port) */ int maxpacketsize /* The maximum size this packet can grow to (including headers) */ ) { int hlen, tlen, dlen, pflags; char *sptr; + struct ip *pip; struct tcphdr *tc; int ftp_message_type; /* Calculate data length of TCP packet */ + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; /* Place string pointer and beginning of data */ + // XXX broken sptr = (char *)pip; sptr += hlen; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#17 (text+ko) ==== @@ -83,7 +83,7 @@ #define DBprintf(a) static void -AliasHandleIrcOut(struct libalias *, struct ip *, struct alias_link *, +AliasHandleIrcOut(struct libalias *, pkt_t, struct alias_link *, int maxpacketsize); static int @@ -100,10 +100,10 @@ } static int -protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleIrcOut(la, pip, ah->lnk, ah->maxpktsize); + AliasHandleIrcOut(la, ptr, ah->lnk, ah->maxpktsize); return (0); } @@ -154,7 +154,7 @@ static void AliasHandleIrcOut(struct libalias *la, - struct ip *pip, /* IP packet to examine */ + pkt_t ptr, /* IP packet to examine */ struct alias_link *lnk, /* Which link are we on? */ int maxsize /* Maximum size of IP packet including * headers */ @@ -164,10 +164,14 @@ struct in_addr true_addr; u_short true_port; char *sptr; + struct ip *pip; struct tcphdr *tc; int i; /* Iterator through the source */ /* Calculate data length of TCP packet */ + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); @@ -181,6 +185,7 @@ return; /* Place string pointer at beginning of data */ + // XXX broken sptr = (char *)pip; sptr += hlen; maxsize -= hlen; /* We're interested in maximum size of ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#22 (text+ko) ==== @@ -214,8 +214,19 @@ #define PULLUP_IPTCPHDR(pip, ptr) do { \ *ptr = m_pullup((*ptr), sizeof(struct ip)); \ (pip) = mtod(*ptr, struct ip *); \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(*ptr, struct ip *); \ + if (pip != NULL) { \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + (pip) = mtod(*ptr, struct ip *); \ + } \ +} while (0) + +#define PULLUP_IPUDPHDR(pip, ptr) do { \ + *ptr = m_pullup((*ptr), sizeof(struct ip)); \ + (pip) = mtod(*ptr, struct ip *); \ + if (pip != NULL) { \ + *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ + (pip) = mtod(*ptr, struct ip *); \ + } \ } while (0) #else typedef char * pkt_t; @@ -226,6 +237,7 @@ #define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_ICMPIP64(pip, ptr, ic) pip = (struct ip *)ptr #define PULLUP_IPTCPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_IPUDPHDR(pip, ptr) pip = (struct ip *)ptr #endif /* ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#27 (text+ko) ==== @@ -215,18 +215,22 @@ } int -find_handler(int8_t dir, int8_t proto, struct libalias *la, struct ip *pip, +find_handler(int8_t dir, int8_t proto, struct libalias *la, pkt_t ptr, struct alias_data *ad) { + struct ip *pip; struct proto_handler *p; int error = ENOENT; + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (error); LIBALIAS_RLOCK(); LIST_FOREACH(p, &handler_chain, entries) { if ((p->dir & dir) && (p->proto & proto)) if (p->fingerprint(la, pip, ad) == 0) { - error = p->protohandler(la, pip, ad); + error = p->protohandler(la, ptr, ad); break; } } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#24 (text+ko) ==== @@ -83,7 +83,7 @@ int (*fingerprint)(struct libalias *la, /* Fingerprint * function. */ struct ip *pip, struct alias_data *ah); int (*protohandler)(struct libalias *la, /* Aliasing * function. */ - struct ip *pip, struct alias_data *ah); + pkt_t ptr, struct alias_data *ah); LIST_ENTRY(proto_handler) entries; }; @@ -114,7 +114,7 @@ int LibAliasDetachHandlers(struct proto_handler *); int detach_handler(struct proto_handler *); int find_handler(int8_t, int8_t, struct libalias *, - struct ip *, struct alias_data *); + pkt_t ptr, struct alias_data *); struct proto_handler *first_handler(void); /* Functions used with dll module. */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#14 (text+ko) ==== @@ -69,11 +69,11 @@ #define NETBIOS_DGM_PORT_NUMBER 138 static int -AliasHandleUdpNbt(struct libalias *, struct ip *, struct alias_link *, +AliasHandleUdpNbt(struct libalias *, pkt_t, struct alias_link *, struct in_addr *, u_short); static int -AliasHandleUdpNbtNS(struct libalias *, struct ip *, struct alias_link *, +AliasHandleUdpNbtNS(struct libalias *, pkt_t, struct alias_link *, struct in_addr *, u_short *, struct in_addr *, u_short *); static int fingerprint1(struct libalias *la, struct ip *pip, struct alias_data *ah) @@ -89,10 +89,10 @@ } static int -protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler1(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport); + AliasHandleUdpNbt(la, ptr, ah->lnk, ah->aaddr, *ah->aport); return (0); } @@ -110,19 +110,23 @@ } static int -protohandler2in(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler2in(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleUdpNbtNS(la, pip, ah->lnk, ah->aaddr, ah->aport, + AliasHandleUdpNbtNS(la, ptr, ah->lnk, ah->aaddr, ah->aport, ah->oaddr, ah->dport); return (0); } static int -protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler2out(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - - AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport, + struct ip *pip; + + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (-1); + AliasHandleUdpNbtNS(la, ptr, ah->lnk, &pip->ip_src, ah->sport, ah->aaddr, ah->aport); return (0); } @@ -335,12 +339,13 @@ static int AliasHandleUdpNbt( struct libalias *la, - struct ip *pip, /* IP packet to examine/patch */ + pkt_t ptr, /* IP packet to examine/patch */ struct alias_link *lnk, struct in_addr *alias_address, u_short alias_port ) { + struct ip *pip; struct udphdr *uh; NbtDataHeader *ndh; u_char *p = NULL; @@ -350,9 +355,13 @@ (void)lnk; /* Calculate data length of UDP packet */ + PULLUP_UDPHDR(pip ,ptr); + if (pip == NULL) + return (-1); uh = (struct udphdr *)ip_next(pip); pmax = (char *)uh + ntohs(uh->uh_ulen); + // XXX broken ndh = (NbtDataHeader *)udp_next(uh); if ((char *)(ndh + 1) > pmax) return (-1); @@ -763,13 +772,14 @@ static int AliasHandleUdpNbtNS( struct libalias *la, - struct ip *pip, /* IP packet to examine/patch */ + pkt_t ptr, /* IP packet to examine/patch */ struct alias_link *lnk, struct in_addr *alias_address, u_short * alias_port, struct in_addr *original_address, u_short * original_port) { + struct ip *pip; struct udphdr *uh; NbtNSHeader *nsh; u_char *p; @@ -784,8 +794,17 @@ nbtarg.oldport = *alias_port; nbtarg.newaddr = *original_address; nbtarg.newport = *original_port; + + // XXX as we m_pullup() some more data below, alias_address could + // XXX point to junk data afterwards: invalidate it now to avoid + // XXX people using it later (for more info see above -> + // XXX protohandler2out()) + alias_address = NULL; /* Calculate data length of UDP packet */ + PULLUP_UDPHDR(pip, ptr); + if (pip == NULL) + return (-1); uh = (struct udphdr *)ip_next(pip); nbtarg.uh_sum = &(uh->uh_sum); nsh = (NbtNSHeader *)udp_next(uh); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#14 (text+ko) ==== @@ -67,16 +67,16 @@ #define PPTP_CONTROL_PORT_NUMBER 1723 static void -AliasHandlePptpOut(struct libalias *, struct ip *, struct alias_link *); +AliasHandlePptpOut(struct libalias *, pkt_t, struct alias_link *); static void -AliasHandlePptpIn(struct libalias *, struct ip *, struct alias_link *); +AliasHandlePptpIn(struct libalias *, pkt_t, struct alias_link *); static int -AliasHandlePptpGreOut(struct libalias *, struct ip *); +AliasHandlePptpGreOut(struct libalias *, pkt_t); static int -AliasHandlePptpGreIn(struct libalias *, struct ip *); +AliasHandlePptpGreIn(struct libalias *, pkt_t); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) @@ -98,36 +98,36 @@ } static int -protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlerin(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandlePptpIn(la, pip, ah->lnk); + AliasHandlePptpIn(la, ptr, ah->lnk); return (0); } static int -protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlerout(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandlePptpOut(la, pip, ah->lnk); + AliasHandlePptpOut(la, ptr, ah->lnk); return (0); } static int -protohandlergrein(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlergrein(struct libalias *la, pkt_t ptr, struct alias_data *ah) { if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY || - AliasHandlePptpGreIn(la, pip) == 0) + AliasHandlePptpGreIn(la, ptr) == 0) return (0); return (-1); } static int -protohandlergreout(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandlergreout(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - if (AliasHandlePptpGreOut(la, pip) == 0) + if (AliasHandlePptpGreOut(la, ptr) == 0) return (0); return (-1); } @@ -298,15 +298,19 @@ static void AliasHandlePptpOut(struct libalias *la, - struct ip *pip, /* IP packet to examine/patch */ + pkt_t ptr, /* IP packet to examine/patch */ struct alias_link *lnk) { /* The PPTP control link */ struct alias_link *pptp_lnk; PptpCallId cptr; PptpCode codes; u_int16_t ctl_type; /* control message type */ + struct ip *pip; struct tcphdr *tc; + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return; /* Verify valid PPTP control message */ if ((cptr = AliasVerifyPptp(pip, &ctl_type)) == NULL) return; @@ -345,6 +349,9 @@ cptr->cid1 = GetAliasPort(pptp_lnk); /* Compute TCP checksum for revised packet */ + PULLUP_TCPHDR(pip ,ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); accumulate -= cptr->cid1; ADJUST_CHECKSUM(accumulate, tc->th_sum); @@ -370,15 +377,19 @@ static void AliasHandlePptpIn(struct libalias *la, - struct ip *pip, /* IP packet to examine/patch */ + pkt_t ptr, /* IP packet to examine/patch */ struct alias_link *lnk) { /* The PPTP control link */ struct alias_link *pptp_lnk; PptpCallId cptr; u_int16_t *pcall_id; u_int16_t ctl_type; /* control message type */ + struct ip *pip; struct tcphdr *tc; + PULLUP_IPHDR(pip ,ptr); + if (pip == NULL) + return; /* Verify valid PPTP control message */ if ((cptr = AliasVerifyPptp(pip, &ctl_type)) == NULL) return; @@ -417,6 +428,9 @@ *pcall_id = GetOriginalPort(pptp_lnk); /* Compute TCP checksum for modified packet */ + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); accumulate -= *pcall_id; ADJUST_CHECKSUM(accumulate, tc->th_sum); @@ -472,11 +486,14 @@ } static int -AliasHandlePptpGreOut(struct libalias *la, struct ip *pip) +AliasHandlePptpGreOut(struct libalias *la, pkt_t ptr) { GreHdr *gr; struct alias_link *lnk; + struct ip *pip; + // XXX broken + PULLUP_IPHDR(pip, ptr); gr = (GreHdr *) ip_next(pip); /* Check GRE header bits. */ @@ -496,11 +513,14 @@ } static int -AliasHandlePptpGreIn(struct libalias *la, struct ip *pip) +AliasHandlePptpGreIn(struct libalias *la, pkt_t ptr) { GreHdr *gr; struct alias_link *lnk; + struct ip *pip; + // XXX broken + PULLUP_IPHDR(pip, ptr); gr = (GreHdr *) ip_next(pip); /* Check GRE header bits. */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#12 (text+ko) ==== @@ -54,7 +54,7 @@ #endif static void -AliasHandleSkinny(struct libalias *, struct ip *, struct alias_link *); +AliasHandleSkinny(struct libalias *, pkt_t ptr, struct alias_link *); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) @@ -69,10 +69,10 @@ } static int -protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - AliasHandleSkinny(la, pip, ah->lnk); + AliasHandleSkinny(la, ptr, ah->lnk); return (0); } @@ -300,20 +300,25 @@ } static void -AliasHandleSkinny(struct libalias *la, struct ip *pip, struct alias_link *lnk) +AliasHandleSkinny(struct libalias *la, pkt_t ptr, struct alias_link *lnk) { size_t hlen, tlen, dlen; + struct ip *pip; struct tcphdr *tc; u_int32_t msgId, t, len, lip; struct skinny_header *sd; size_t orig_len, skinny_hdr_len = sizeof(struct skinny_header); ConvDirection direction; + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; + // XXX broken sd = (struct skinny_header *)tcp_next(tc); /* ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#17 (text+ko) ==== @@ -129,7 +129,7 @@ #define TFTP_PORT_NUMBER 69 static void -AliasHandleRtspOut(struct libalias *, struct ip *, struct alias_link *, +AliasHandleRtspOut(struct libalias *, pkt_t ptr, struct alias_link *, int maxpacketsize); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) @@ -150,13 +150,17 @@ } static int -protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) +protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah) { - - if (ntohs(*ah->dport) == TFTP_PORT_NUMBER) + struct ip *pip; + + if (ntohs(*ah->dport) == TFTP_PORT_NUMBER) { + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + return (-1); FindRtspOut(la, pip->ip_src, pip->ip_dst, *ah->sport, *ah->aport, IPPROTO_UDP); - else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpktsize); + } else AliasHandleRtspOut(la, ptr, ah->lnk, ah->maxpktsize); return (0); } @@ -477,9 +481,10 @@ } static void -AliasHandleRtspOut(struct libalias *la, struct ip *pip, struct alias_link *lnk, int maxpacketsize) +AliasHandleRtspOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk, int maxpacketsize) { int hlen, tlen, dlen; + struct ip *pip; struct tcphdr *tc; char *data; const char *setup = "SETUP", *pna = "PNA", *str200 = "200"; @@ -489,11 +494,15 @@ (void)maxpacketsize; + PULLUP_TCPHDR(pip, ptr); + if (pip == NULL) + return; tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; + // XXX broken data = (char *)pip; data += hlen; From owner-p4-projects@FreeBSD.ORG Wed Feb 7 19:44:14 2007 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 EF9BA16A402; Wed, 7 Feb 2007 19:44:13 +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 6996516A401 for ; Wed, 7 Feb 2007 19:44:12 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A74113C441 for ; Wed, 7 Feb 2007 19:44:12 +0000 (UTC) (envelope-from csjp@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 l17JiCMZ063187 for ; Wed, 7 Feb 2007 19:44:12 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17JiCUe063184 for perforce@freebsd.org; Wed, 7 Feb 2007 19:44:12 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 19:44:12 GMT Message-Id: <200702071944.l17JiCUe063184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114203 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: Wed, 07 Feb 2007 19:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114203 Change 114203 by csjp@csjp_rnd01 on 2007/02/07 19:43:27 Add -t for touch headers only Add -T for touching each byte in the packet Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#9 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#9 (text+ko) ==== @@ -63,6 +63,8 @@ static int wflag; static int vflag; static int zflag; +static int tflag; +static int Tflag; static u_char *bufa, *bufb; static int @@ -99,8 +101,21 @@ clen = bhp->bh_caplen; hlen = bhp->bh_hdrlen; p = (u_char *)bp + hlen; - (void) gettimeofday(&phd.ts, NULL); + phd.ts.tv_sec = bhp->bh_tstamp.tv_sec; + phd.ts.tv_usec = bhp->bh_tstamp.tv_usec; phd.caplen = phd.len = bhp->bh_datalen; + if (Tflag) { + int i; + char c; + for (i = 0; i < phd.caplen; i++) + c = p[i]; + bp += BPF_WORDALIGN(clen + hlen); + continue; + } + if (tflag) { + bp += BPF_WORDALIGN(clen + hlen); + continue; + } pcap_dump((u_char *)dp, &phd, p); if (ferror((FILE *)dp)) { perror("dump.pcap"); @@ -117,12 +132,17 @@ fd_set s_set, r_set; struct bpf_zbuf bz; char *pbuf; - int n; + int processed_data, n; struct bpf_zbuf_header *bzha, *bzhb; + struct timeval tv; + void *prev2, *prev; + prev2 = prev = NULL; pbuf = malloc(bflag + 1); if (pbuf == NULL) err(1, "malloc"); + tv.tv_sec = 1; + tv.tv_usec = 0; FD_SET(fd, &s_set); for (;;) { r_set = s_set; @@ -131,13 +151,11 @@ fprintf(stderr,"owned by select\n"); err(1, "select failed"); } - if (!FD_ISSET(fd, &r_set)) { - fprintf(stderr, "FD is NOT set\n"); - continue; - } + if (n != 0 && !FD_ISSET(fd, &r_set)) + printf("No timeout and fd is not ready!\n"); if (vflag) (void) fprintf(stderr, - "DEBUG: wokeup and bpf is ready to read from\n"); + "DEBUG: wokeup and bpf is ready to read from: %d\n", n); if (zflag == 0) { n = read(fd, pbuf, bflag); if (n < 0) @@ -147,8 +165,18 @@ if (wflag) bpf_process_packets(&bz, "W"); } else { + processed_data = 0; bzha = (struct bpf_zbuf_header *)bufa; bzhb = (struct bpf_zbuf_header *)bufb; + + if (n == 0) { + if (ioctl(fd, BIOCROTZBUF, &bz) < 0) + err(1, "ioctl"); + if (bz.bz_bufa == NULL) { + printf("timeout no data\n"); + continue; + } + } if (bzha->bzh_kernel_gen > bzha->bzh_user_gen) { bz.bz_bufa = bufa; bz.bz_bufa += sizeof(struct bpf_zbuf_header); @@ -156,15 +184,17 @@ if (wflag) bpf_process_packets(&bz, "A"); bzha->bzh_user_gen++; - } - if (bzhb->bzh_kernel_gen > bzhb->bzh_user_gen) { + processed_data++; + } else if (bzhb->bzh_kernel_gen > bzhb->bzh_user_gen) { bz.bz_bufa = bufb; bz.bz_bufa += sizeof(struct bpf_zbuf_header); bz.bz_buflen = bzhb->bzh_kernel_len; if (wflag) bpf_process_packets(&bz, "B"); bzhb->bzh_user_gen++; + processed_data++; } + assert(processed_data != 0); } } } @@ -250,7 +280,7 @@ char ch; signal(SIGINT, (void *)handle_int); - while ((ch = getopt(argc, argv, "b:f:hIi:wvz")) != -1) { + while ((ch = getopt(argc, argv, "b:f:hIi:tTwvz")) != -1) { switch (ch) { case 'b': bflag = atoi(optarg); @@ -265,6 +295,12 @@ case 'I': Iflag = 1; break; + case 't': + tflag = 1; + break; + case 'T': + Tflag = 1; + break; case 'w': wflag = 1; break; From owner-p4-projects@FreeBSD.ORG Wed Feb 7 19:46:17 2007 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 0CE0716A405; Wed, 7 Feb 2007 19:46:16 +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 6F4B616A401 for ; Wed, 7 Feb 2007 19:46:15 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5FEE313C46B for ; Wed, 7 Feb 2007 19:46:15 +0000 (UTC) (envelope-from csjp@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 l17JkFTG063323 for ; Wed, 7 Feb 2007 19:46:15 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17JkFH2063320 for perforce@freebsd.org; Wed, 7 Feb 2007 19:46:15 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 19:46:15 GMT Message-Id: <200702071946.l17JkFH2063320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114204 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: Wed, 07 Feb 2007 19:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=114204 Change 114204 by csjp@csjp_rnd01 on 2007/02/07 19:46:06 cleanup local variables Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#10 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#10 (text+ko) ==== @@ -91,8 +91,8 @@ bpf_process_packets(struct bpf_zbuf *bz, char *bufname) { struct pcap_pkthdr phd; - int clen, hlen; - u_char *b,*bp, *ep, *p; + int clen, hlen, c; + u_char *b,*bp, *ep, *p, c; #define bhp ((struct bpf_hdr *)bp) b = bp = bz->bz_bufa; @@ -105,8 +105,6 @@ phd.ts.tv_usec = bhp->bh_tstamp.tv_usec; phd.caplen = phd.len = bhp->bh_datalen; if (Tflag) { - int i; - char c; for (i = 0; i < phd.caplen; i++) c = p[i]; bp += BPF_WORDALIGN(clen + hlen); From owner-p4-projects@FreeBSD.ORG Wed Feb 7 19:48:23 2007 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 CF75D16A496; Wed, 7 Feb 2007 19:48:19 +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 7B13016A411 for ; Wed, 7 Feb 2007 19:48:19 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BFE613C49D for ; Wed, 7 Feb 2007 19:48:19 +0000 (UTC) (envelope-from csjp@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 l17JmJhw063420 for ; Wed, 7 Feb 2007 19:48:19 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17JmJlR063417 for perforce@freebsd.org; Wed, 7 Feb 2007 19:48:19 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 19:48:19 GMT Message-Id: <200702071948.l17JmJlR063417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114205 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: Wed, 07 Feb 2007 19:48:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114205 Change 114205 by csjp@csjp_rnd01 on 2007/02/07 19:47:39 Doh.. fix build Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#11 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#11 (text+ko) ==== @@ -91,8 +91,8 @@ bpf_process_packets(struct bpf_zbuf *bz, char *bufname) { struct pcap_pkthdr phd; - int clen, hlen, c; - u_char *b,*bp, *ep, *p, c; + int clen, hlen, i; + u_char *b,*bp, *ep, *p, by; #define bhp ((struct bpf_hdr *)bp) b = bp = bz->bz_bufa; @@ -106,7 +106,7 @@ phd.caplen = phd.len = bhp->bh_datalen; if (Tflag) { for (i = 0; i < phd.caplen; i++) - c = p[i]; + by = p[i]; bp += BPF_WORDALIGN(clen + hlen); continue; } From owner-p4-projects@FreeBSD.ORG Wed Feb 7 20:45:37 2007 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 BBCD916A402; Wed, 7 Feb 2007 20:45:36 +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 6C56216A4CF for ; Wed, 7 Feb 2007 20:45:36 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A0FA13C4D3 for ; Wed, 7 Feb 2007 20:45:36 +0000 (UTC) (envelope-from soc-andrew@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 l17Kjaf9074302 for ; Wed, 7 Feb 2007 20:45:36 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17KjZ3Z074299 for perforce@freebsd.org; Wed, 7 Feb 2007 20:45:35 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 7 Feb 2007 20:45:35 GMT Message-Id: <200702072045.l17KjZ3Z074299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 114209 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: Wed, 07 Feb 2007 20:45:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114209 Change 114209 by soc-andrew@soc-andrew_serv on 2007/02/07 20:44:45 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#57 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#15 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#57 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.918 2006/11/16 23:09:35 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.920 2007/02/01 15:12:44 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -159,8 +159,8 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata -DIST_DOCS_ARCH_DEP= installation relnotes hardware +DIST_DOCS_ARCH_INDEP= readme relnotes errata +DIST_DOCS_ARCH_DEP= installation hardware .endif # Things which without too much trouble can be considered variables @@ -192,6 +192,7 @@ .undef MAKE_FLOPPIES .if ${TARGET_ARCH} == "i386" MAKE_FLOPPIES= true +SPLIT_MFSROOT= .if ${TARGET} == "pc98" SMALLFLOPPYSIZE= 1200 SMALLFLOPPYSPLITSIZE= 1152 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.306 2006/10/01 13:14:07 joel Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.308 2006/12/30 18:22:09 bmah Exp $ Supported Devices @@ -55,7 +55,7 @@ Disk Controllers - IDE/ATA controllers (&man.ata.4; driver) + IDE/ATA controllers (&man.ata.4; driver) IDE/ATA controllers (wdc driver) @@ -98,9 +98,6 @@ Booting from these controllers is supported. EISA adapters are not supported. - - Booting from these controllers is not - supported due to SRM limitations. &hwlist.esp; @@ -122,13 +119,6 @@ Booting from these controllers is supported. EISA adapters are not supported. - - Booting from these controllers is not - supported due to SRM limitations. - DAC960 controllers sold by Digital/Compaq for Alpha systems as part - of the StorageWorks family, e.g. KZPSC or KZPAC are bootable from SRM. - Note that these cards used 2.x firmware. SRM bootability of newer - firmware is unknown. &hwlist.mly; @@ -248,6 +238,8 @@ &hwlist.lge; + &hwlist.msk; + &hwlist.mxge; &hwlist.my; @@ -312,7 +304,7 @@ FDDI Interfaces - DEC DEFPA PCI (&man.fpa.4; driver) + DEC DEFPA PCI (&man.fpa.4; driver) DEC DEFEA EISA (&man.fpa.4; driver) @@ -480,13 +472,13 @@ Serial Interfaces - PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) + PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) &hwlist.uart; &hwlist.scc; - AST 4 port serial card using shared IRQ + AST 4 port serial card using shared IRQ ARNET serial cards (&man.ar.4; driver) @@ -518,7 +510,7 @@ - Comtrol Rocketport card (&man.rp.4; driver) + Comtrol Rocketport card (&man.rp.4; driver) Cyclades Cyclom-Y serial board (&man.cy.4; driver) @@ -764,18 +756,18 @@ USB Devices - A range of USB peripherals are supported; devices known to + A range of USB peripherals are supported; devices known to work are listed in this section. Owing to the generic nature of most USB devices, with some exceptions any device of a given class will be supported, even if not explicitly listed here. - + USB Ethernet adapters can be found in the section listing Ethernet interfaces. - + USB Bluetooth adapters can be found in Bluetooth section. @@ -787,9 +779,9 @@ USB 2.0 controllers using the EHCI interface (&man.ehci.4; driver) - Hubs + Hubs - Keyboards (&man.ukbd.4; driver) + Keyboards (&man.ukbd.4; driver) Miscellaneous @@ -815,7 +807,7 @@ &hwlist.umodem; - Mice (&man.ums.4; driver) + Mice (&man.ums.4; driver) &hwlist.ulpt; @@ -884,9 +876,9 @@ - Floppy drives (&man.fdc.4; driver) + Floppy drives (&man.fdc.4; driver) - VGA-compatible video cards + VGA-compatible video cards (&man.vga.4; driver) @@ -898,36 +890,36 @@ - Keyboards including: + Keyboards including: - + AT-style keyboards (&man.atkbd.4; driver) - + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards - + USB keyboards (&man.ukbd.4; driver) - Pointing devices including: + Pointing devices including: Bus mice and compatible devices (&man.mse.4; driver) - + PS/2 mice and compatible devices, including many laptop pointing devices (&man.psm.4; driver) Serial mice and compatible devices - + USB mice (&man.ums.4; driver) @@ -940,7 +932,7 @@ - PC standard parallel ports (&man.ppc.4; driver) + PC standard parallel ports (&man.ppc.4; driver) PC-9821 standard parallel ports (&man.ppc.4; driver) PC-compatible joysticks (&man.joy.4; driver) ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#3 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,8 +11,8 @@ + - ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.37 2005/04/19 09:43:53 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.38 2006/12/28 21:12:57 bmah Exp $ 2000 @@ -21,6 +21,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project @@ -340,11 +341,10 @@ Several of these documents (in particular, - RELNOTES.TXT, - HARDWARE.TXT, and + HARDWARE.TXT and INSTALL.TXT) contain information that is specific to a particular hardware architecture. For - example, the alpha release notes contain information not + example, the alpha hardware notes contain information not applicable to the &i386;, and vice versa. The architecture for which each document applies will be listed in that document's title. ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 (text+ko) ==== @@ -1,13 +1,24 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.11 2006/12/07 17:45:45 hrs Exp $ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR= amd64 -SUBDIR+= ia64 -SUBDIR+= i386 -SUBDIR+= pc98 -SUBDIR+= powerpc -SUBDIR+= sparc64 +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +# SGML content +SRCS+= article.sgml + +URL_RELPREFIX?= ../../../.. .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ==== @@ -1,9 +1,36 @@ + +%articles.ent; + + +%release; + + + + + + + + + + + + + + + + + + +]> + +
- &os;/&arch; &release.current; Release Notes + &os; &release.current; Release Notes The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.991 2006/12/05 18:30:05 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.997 2007/01/11 19:44:45 bmah Exp $ 2000 @@ -13,6 +40,7 @@ 2004 2005 2006 + 2007 The &os; Documentation Project @@ -40,7 +68,7 @@ Introduction This document contains the release notes for &os; - &release.current; on the &arch.print; hardware platform. It + &release.current;. It describes recently added, changed, or deleted features of &os;. It also provides some notes on upgrading from previous versions of &os;. @@ -175,7 +203,7 @@ For more details see security advisory FreeBSD-SA-06:13.sendmail. &merged; - An information disclosure issue found in the + [&arch.amd64;, &arch.i386] An information disclosure issue found in the &os; kernel running on 7th- and 8th-generation AMD processors has been fixed. For more details see security advisory FreeBSD-SA-06:14.fpu. &merged; @@ -232,6 +260,17 @@ fixed. More details are available in FreeBSD-SA-06:24.libarchive. &merged; + A bug that could allow users in + the operator group to read parts of kernel + memory has been corrected. For more details, consult security + advisory + FreeBSD-SA-06:25.kmem. &merged; + + A bug in the jail startup script that + could permit privilege escalation via a symlink attack has been + fixed. More information is available in + FreeBSD-SA-07:01.jail. &merged; + @@ -329,7 +368,7 @@ which can control the behavior, setting it to zero disables the SIGCHLD queuing feature. - Instead of including all of physical + [&arch.amd64;, &arch.i386;] Instead of including all of physical memory in a kernel crash dump, the kernel now defaults to dumping only pages that are actively mapped into kernel virtual memory. A new debug.minidump sysctl variable @@ -344,11 +383,6 @@ to sigexit if a trap signal is being held by the current thread or ignored by the current process. It is enabled by default. - Support for Linux emulation on the Alpha - platform has been removed, due to the lack of a - linux_base port that both supports the - Alpha architecture and is in good working condition. - The pcvt(4) driver, an alternative to &man.syscons.4;, has been removed, as it had fallen out of sync with the rest of the kernel. @@ -381,7 +415,7 @@ and 3 means power them all down unconditionally. The default is 1. - The GENERIC kernel now enables + [&arch.ia64;] The GENERIC kernel now enables SMP support by default. Sample kernel configuration files @@ -407,7 +441,7 @@ file or on the boot: prompt line, has been added. - A new loader tunable + [&arch.amd64;, &arch.i386;] A new loader tunable comconsole_speed to change the serial console speed has been added. If the previous stage boot loader requested a serial console, @@ -418,10 +452,10 @@ - A bootable CDROM loader has been implemented + [&arch.pc98;] A bootable CDROM loader has been implemented for the pc98 platform. &merged; - A bug in the i386 boot loader, which could + [&arch.i386;] A bug in the i386 boot loader, which could cause filesystem corruption if a nextboot.conf file was used and landed after cylinder 1023, has been fixed. &merged; @@ -449,16 +483,13 @@ the _PSV, _HOT, and _CRT temperature values. - Support for the alpha architecture has been removed. Alpha support will remain on the RELENG_5 and RELENG_6 codelines. The &man.cardbus.4; driver now supports /dev/cardbus%d.cis. - The &man.ce.4; driver, + [&arch.i386, &arch.pc98;] The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters, has been added. &merged; @@ -475,11 +506,11 @@ A bug which prevented the &man.ichsmb.4; kernel module from unloading has been fixed. - Dual-core processors (such as the Intel + [&arch.amd64;, &arch.i386;] Dual-core processors (such as the Intel Core Duo) now have both cores available for use by default in SMP-enabled kernels. &merged; - &man.ipmi.4;, an OpenIPMI compatible driver, + [&arch.amd64;, &arch.i386;] &man.ipmi.4;, an OpenIPMI compatible driver, has been added. OpenIPMI (Intelligent Platform Management Interface) is an open standard designed to enable remote monitoring and control of server, @@ -494,7 +525,7 @@ or at runtime via &man.kldload.8; and releasing the active keyboard. &merged; - The &man.kbdmux.4; driver is now included in the + [&arch.amd64;, &arch.i386;] The &man.kbdmux.4; driver is now included in the GENERIC kernel by default. Also, the Boot FreeBSD with USB keyboard menu item in the boot loader menu has been removed @@ -504,7 +535,7 @@ The &man.nfsmb.4; driver, which supports the NVIDIA nForce 2/3/4 SMBus 2.0 controller, has been added. &merged; - The loader tunable debug.mpsafevfs + [&arch.ia64;] The loader tunable debug.mpsafevfs is set to 1 by default. The &man.sab.4; driver has been removed (it has been @@ -515,11 +546,11 @@ controllers and delegates the control over each channel and mode to a subordinate driver such as &man.uart.4;. - The smbios(4) driver support for amd64 has been + [&arch.amd64;] The smbios(4) driver support for amd64 has been added. - &os; now has preliminary support for the Sun Microsystems - UltraSPARC-T1 archicture. &os;/sun4v has been demonstrated + [&arch.sun4v;] &os; now has preliminary support for the Sun Microsystems + UltraSPARC-T1 architecture. &os;/sun4v has been demonstrated to run on the Sun Fire T1000 and Sun Fire T2000 servers. More information can be found on the sun4v @@ -529,7 +560,7 @@ The tnt4882(4) driver, which supports the National Instruments PCI-GPIB card, has been added. - The &man.uart.4; driver has been included in the + [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.sparc64;] The &man.uart.4; driver has been included in the GENERIC kernel by default. When both &man.sio.4; and &man.uart.4; can handle a given serial port, &man.sio.4; will claim it. @@ -537,14 +568,14 @@ The &man.uart.4; driver now supports LOM (Lights Out Management) and RSC (Remote System Control) devices as consoles. - A new loader tunable + [&arch.i386;] A new loader tunable hw.apic.enable_extint has been added. This tunable can be used to disable masking of the ExtINT pin on the first I/O APIC. At least one chipset for the Intel Pentium III seems to need this, even though all of the pins in the 8259As are masked. The default is still to mask the ExtINT pin. - Support has been improved for + [&arch.i386;] Support has been improved for so-called legacy-free hardware, in particular, i386 systems without AT-style keyboard controllers such as the Macbook Pro. &merged; @@ -590,7 +621,7 @@ The &man.snd.via82c686.4; driver is now MPSAFE. &merged; - The &man.speaker.4; driver now supports &os;/amd64. &merged; + [&arch.amd64;] The &man.speaker.4; driver now supports &os;/amd64. &merged; The &man.uaudio.4; driver now supports 24/32 bit audio formats and conversion. @@ -602,12 +633,13 @@ The &man.ath.4; driver has been updated to HAL version 0.9.17.2. &merged; - The &man.ath.4;, &man.ath.hal.4;, and + [&arch.amd64;, &arch.i386;, &arch.pc98;, &arch.sparc64;] + The &man.ath.4;, &man.ath.hal.4;, and ath_rate_sample drivers have been included in the GENERIC kernel by default. &merged; - The &man.bce.4; driver, which supports Broadcom + [&arch.amd64;, &arch.i386;] The &man.bce.4; driver, which supports Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers, has been added. For more details, see &man.bce.4;. &merged; @@ -675,11 +707,15 @@ &man.pcn.4; drivers support all devices that were supported by lnc(4). + The &man.msk.4; driver has been added. It supports + network interfaces using the Marvell/SysKonnect Yukon II + Gigabit Ethernet controller. + The &man.my.4; driver is now MPSAFE. &merged; The &man.my.4; driver now supports &man.altq.4;. &merged; - The &man.mxge.4; driver, + [&arch.amd64;, &arch.i386;] The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet adapters, has been added. For more details, see &man.mxge.4;. @@ -725,7 +761,7 @@ The &man.wi.4; driver is now buildable as a kernel module. - The &man.wlan.wep.4;, + [&arch.amd64;, &arch.i386;, &arch.pc98;] The &man.wlan.wep.4;, &man.wlan.ccmp.4;, and &man.wlan.tkip.4; drivers have been included in the GENERIC kernel by default. @@ -754,7 +790,7 @@ to suppress logging of attempts to modify permanent ARP entries. &merged; - An experimental BPF Just-In-Time compiler + [&arch.amd64;, &arch.i386;, &arch.pc98;] An experimental BPF Just-In-Time compiler has been implemented for both &man.bpf.4; and &man.ng.bpf.4;. To enable this, the options BPF_JITTER kernel option is needed. @@ -964,6 +1000,9 @@ environment. &merged; + The &man.arcmsr.4; driver has been updated to version + 1.20.00.13. &merged; + The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For affected controllers, @@ -1039,7 +1078,7 @@ has been renamed to geom_md.ko for consistency. - The &man.hptmv.4; driver has been updated and now supports + [&arch.amd64;, &arch.i386;] The &man.hptmv.4; driver has been updated and now supports amd64 as well as PAE. The &man.mfi.4; driver, which supports @@ -1103,7 +1142,7 @@ File Systems - The &man.linsysfs.5; + [&arch.amd64;, &arch.i386;, &arch.pc98;] The &man.linsysfs.5; pseudo-filesystem driver has been added. It provides a subset of the Linux sys filesystem, and is required for @@ -1470,7 +1509,7 @@ been moved from /usr/bin to /bin so that it can be used by startup scripts. Symbolic links from its former location have been - created for backward compatibliity. &merged; + created for backward compatibility. &merged; The &man.powerd.8; program now supports a option, which specifies a pidfile to use. @@ -1491,7 +1530,7 @@ &merged; The DNS resolver library in &os;'s libc - has been updated to BIND9's one. &merged; + has been updated to that from BIND 9.3.3. &merged; The &man.rfcomm.sppd.1; program now supports service names in addition to option with channel number. @@ -1560,7 +1599,7 @@ flag for the same functionality as the strace utility (devel/strace). - The &man.truss.1; utility now supports &os;/ppc. + [&arch.powerpc;] The &man.truss.1; utility now supports &os;/powerpc. The usbd(8) utility has been removed. The &man.devd.8; utility and its configuration @@ -1694,7 +1733,7 @@ has been updated to 20051021. BIND has been updated from 9.3.1 - to 9.3.2-P1. &merged; + to 9.3.3. &merged; BSNMPD has been updated from 1.11 to 1.12. @@ -1935,7 +1974,7 @@ (x11/kde3) has been updated from 3.4.2 to 3.5.4. &merged; - The supported Linux emulation now uses the + [&arch.amd64;, &arch.i386;] The supported Linux emulation now uses the libraries in the emulators/linux_base-fc4 package. &merged; @@ -1950,7 +1989,7 @@ (x11/xorg) has been updated from 6.8.2 to 6.9.0. &merged; - &os;/pc98 release CDROMs are now + [&arch.pc98;] &os;/pc98 release CDROMs are now bootable on systems with some supported SCSI adapters. &merged; @@ -1990,3 +2029,4 @@ files. +
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/examples/Makefile.relnotesng#4 (text+ko) ==== @@ -1,14 +1,14 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.14 2006/12/06 18:07:40 bmah Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 -MULTITEXTS= installation relnotes hardware -UNITEXTS= readme errata +MULTITEXTS= installation hardware +UNITEXTS= readme relnotes errata IMAGEDIR= .imagedir RHOST= freefall.freebsd.org ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 2004-2005 The FreeBSD Project +# Copyright (c) 2004-2006 The FreeBSD Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.90 2006/10/01 13:14:07 joel Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.92 2006/12/30 18:22:08 bmah Exp $ # # @@ -63,7 +63,7 @@ ctau i386 cue i386,pc98,ia64,amd64,powerpc cx i386 -de i386,pc98,alpha,ia64,amd64 +de i386,pc98,ia64,amd64 dpt i386,ia64,amd64 ed i386,pc98 ep i386,pc98,amd64 @@ -81,30 +81,31 @@ ixgb i386,amd64 kue i386,pc98,ia64,amd64,powerpc lge i386,pc98,amd64 -mfi i386,alpha,ia64,amd64 -mlx i386,alpha,ia64,amd64 +mfi i386,ia64,amd64 +mlx i386,ia64,amd64 mly i386,ia64,amd64 +msk i386,amd64 mxge i386,amd64 my i386,pc98 -ncr i386,pc98,alpha,sparc64,amd64 +ncr i386,pc98,sparc64,amd64 ncv i386,pc98 ng_bt3c i386,pc98,amd64 ng_ubt i386,pc98,amd64 -nge i386,pc98,alpha,amd64 +nge i386,pc98,amd64 nsp i386,pc98 nve i386,amd64 -ohci i386,pc98,alpha,ia64,amd64,powerpc +ohci i386,pc98,ia64,amd64,powerpc oltr i386 -pcn i386,pc98,alpha,ia64,amd64 +pcn i386,pc98,ia64,amd64 pst i386 rc i386 rr232x i386,amd64 rue i386,pc98,amd64 safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 -sf i386,pc98,alpha,ia64,amd64 -sis i386,pc98,alpha,ia64,amd64 -sk i386,sparc64,pc98,alpha,amd64 +sf i386,pc98,ia64,amd64 +sis i386,pc98,ia64,amd64 +sk i386,sparc64,pc98,amd64 sn i386,amd64 snc pc98 snd_ad1816 i386,amd64 @@ -125,11 +126,11 @@ snd_gusc i386,amd64 snd_hda i386,amd64 snd_ich i386,amd64 -snd_maestro i386,alpha,amd64 -snd_maestro3 i386,alpha,amd64 +snd_maestro i386,amd64 +snd_maestro3 i386,amd64 snd_mss i386 snd_neomagic i386,amd64 -snd_sbc i386,alpha,amd64 +snd_sbc i386,amd64 snd_solo i386,amd64 snd_spicds i386,amd64 snd_t4dwave i386,amd64 @@ -137,24 +138,24 @@ snd_via82c686 i386,amd64 snd_vibes i386,amd64 sr i386 -ste i386,pc98,alpha,amd64 +ste i386,pc98,amd64 stg i386,pc98 stge i386,amd64,sparc64 ti i386,pc98,amd64,sparc64 -tl i386,pc98,alpha,amd64 +tl i386,pc98,amd64 trm i386,amd64 twa i386,amd64 twe i386,amd64 -txp i386,pc98,alpha,ia64,amd64 +txp i386,pc98,ia64,amd64 ubsa i386,pc98,amd64 ubsec i386,pc98,amd64 ubser i386,pc98,amd64 ucycom i386,pc98,amd64 udav i386,pc98,amd64 uftdi i386,pc98,amd64 -uhci i386,pc98,alpha,ia64,amd64,powerpc -ulpt i386,pc98,alpha,amd64,powerpc -umass i386,pc98,alpha,amd64,powerpc +uhci i386,pc98,ia64,amd64,powerpc +ulpt i386,pc98,amd64,powerpc +umass i386,pc98,amd64,powerpc umodem i386,pc98,amd64 uplcom i386,pc98,amd64 urio i386,pc98,amd64,powerpc @@ -163,7 +164,7 @@ uvscom i386,pc98,amd64 vge i386,pc98,amd64 vpo i386 -vr i386,pc98,alpha,amd64 +vr i386,pc98,amd64 vx i386,pc98,ia64,amd64 -wb i386,pc98,alpha,amd64 +wb i386,pc98,amd64 xe i386,amd64 From owner-p4-projects@FreeBSD.ORG Wed Feb 7 20:50:18 2007 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 4697A16A40A; Wed, 7 Feb 2007 20:50:18 +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 8CF0D16A409 for ; Wed, 7 Feb 2007 20:50:17 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.171]) by mx1.freebsd.org (Postfix) with ESMTP id E775413C494 for ; Wed, 7 Feb 2007 20:50:16 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by ug-out-1314.google.com with SMTP id o2so275442uge for ; Wed, 07 Feb 2007 12:50:15 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=YYkjUGnPHmc+rxeptTnKqpVz9lb21h/nQ78P9gVvPX/beoEagSLl8tqb8+lKF6+QTX0ZhBPKPC95CJYwNMGfh/n7296NJEjN1hjoJx8IH92enPIBv3vS3J/fRCJIcZi4CebVelwtx14qZnBKlweLMDDm0SUo5YO9OSnobirRxE0= Received: by 10.82.189.5 with SMTP id m5mr1145601buf.1170881408263; Wed, 07 Feb 2007 12:50:08 -0800 (PST) Received: by 10.48.238.14 with HTTP; Wed, 7 Feb 2007 12:50:08 -0800 (PST) Message-ID: <3bbf2fe10702071250p65989b81v9872ff7203c92b91@mail.gmail.com> Date: Wed, 7 Feb 2007 21:50:08 +0100 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Roman Divacky" In-Reply-To: <200702071858.l17IwBGj041287@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200702071858.l17IwBGj041287@repoman.freebsd.org> X-Google-Sender-Auth: 97fa7e4c16cf13a3 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114200 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: Wed, 07 Feb 2007 20:50:18 -0000 2007/2/7, Roman Divacky : > http://perforce.freebsd.org/chv.cgi?CH=114200 > > Change 114200 by rdivacky@rdivacky_witten on 2007/02/07 18:57:25 > > Move the free() out of the emul_shared_lock coverage as its not > sleepable lock anymore. > > Affected files ... > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 edit > > Differences ... > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 (text+ko) ==== > > @@ -187,9 +187,11 @@ > LIST_REMOVE(em, threads); > > em->shared->refs--; > - if (em->shared->refs == 0) > + if (em->shared->refs == 0) { > + EMUL_SHARED_WUNLOCK(&emul_shared_lock); > free(em->shared, M_LINUX); > - EMUL_SHARED_WUNLOCK(&emul_shared_lock); > + } else > + EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > if (child_clear_tid != NULL) { > struct linux_sys_futex_args cup; > @@ -274,9 +276,11 @@ > PROC_UNLOCK(p); > > em->shared->refs--; > - if (em->shared->refs == 0) > + if (em->shared->refs == 0) { > + EMUL_SHARED_WUNLOCK(&emul_shared_lock); > free(em->shared, M_LINUX); > - EMUL_SHARED_WUNLOCK(&emul_shared_lock); > + } else > + EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > free(em, M_LINUX); > } > Would you convert em->shared->refs with a refcount() ? (sys/refcount.h) Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Feb 7 21:54:48 2007 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 6466B16A405; Wed, 7 Feb 2007 21:54:48 +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 D875316A402; Wed, 7 Feb 2007 21:54:47 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB0713C428; Wed, 7 Feb 2007 21:54:47 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l17LskKO072503 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Feb 2007 22:54:46 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l17LsjEo072500; Wed, 7 Feb 2007 22:54:45 +0100 (CET) Date: Wed, 7 Feb 2007 22:54:45 +0100 From: Divacky Roman To: Attilio Rao Message-ID: <20070207215445.GA69385@stud.fit.vutbr.cz> References: <200702071858.l17IwBGj041287@repoman.freebsd.org> <3bbf2fe10702071250p65989b81v9872ff7203c92b91@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3bbf2fe10702071250p65989b81v9872ff7203c92b91@mail.gmail.com> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114200 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: Wed, 07 Feb 2007 21:54:48 -0000 On Wed, Feb 07, 2007 at 09:50:08PM +0100, Attilio Rao wrote: > 2007/2/7, Roman Divacky : > >http://perforce.freebsd.org/chv.cgi?CH=114200 > > > >Change 114200 by rdivacky@rdivacky_witten on 2007/02/07 18:57:25 > > > > Move the free() out of the emul_shared_lock coverage as its not > > sleepable lock anymore. > > > >Affected files ... > > > >.. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 edit > > > >Differences ... > > > >==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#35 > >(text+ko) ==== > > > >@@ -187,9 +187,11 @@ > > LIST_REMOVE(em, threads); > > > > em->shared->refs--; > >- if (em->shared->refs == 0) > >+ if (em->shared->refs == 0) { > >+ EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > free(em->shared, M_LINUX); > >- EMUL_SHARED_WUNLOCK(&emul_shared_lock); > >+ } else > >+ EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > > > if (child_clear_tid != NULL) { > > struct linux_sys_futex_args cup; > >@@ -274,9 +276,11 @@ > > PROC_UNLOCK(p); > > > > em->shared->refs--; > >- if (em->shared->refs == 0) > >+ if (em->shared->refs == 0) { > >+ EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > free(em->shared, M_LINUX); > >- EMUL_SHARED_WUNLOCK(&emul_shared_lock); > >+ } else > >+ EMUL_SHARED_WUNLOCK(&emul_shared_lock); > > > > free(em, M_LINUX); > > } > > > > Would you convert em->shared->refs with a refcount() ? (sys/refcount.h) as we discussed. its not much of a use in this particular case as I have to lock anyway so this doesnt buy us much. thnx, roman From owner-p4-projects@FreeBSD.ORG Thu Feb 8 08:49:52 2007 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 B7E7B16A406; Thu, 8 Feb 2007 08:49:50 +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 8568D16A400 for ; Thu, 8 Feb 2007 08:49:50 +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 75B8C13C481 for ; Thu, 8 Feb 2007 08:49:50 +0000 (UTC) (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 l188no4k043992 for ; Thu, 8 Feb 2007 08:49:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l188noaK043988 for perforce@freebsd.org; Thu, 8 Feb 2007 08:49:50 GMT (envelope-from piso@freebsd.org) Date: Thu, 8 Feb 2007 08:49:50 GMT Message-Id: <200702080849.l188noaK043988@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 114230 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: Thu, 08 Feb 2007 08:49:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114230 Change 114230 by piso@piso_newluxor on 2007/02/08 08:49:42 o redefine mtod() -> MYMTOD() and correctly check for NULL value after an m_pullup() o add a new PULLUP macro (PULLUP_SIZE()) to m_pullup() an arbitrary num of bytes Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#23 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#23 (text+ko) ==== @@ -179,27 +179,29 @@ #ifdef _KERNEL typedef struct mbuf ** pkt_t; +#define MYMTOD(p, foo) (p != NULL) ? mtod(p, foo) : NULL + #define PULLUP_IPHDR(pip, ptr) do { \ *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } while (0) #define PULLUP_UDPHDR(pip, ptr) do { \ pip = mtod(*ptr, struct ip *); \ *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } while (0) #define PULLUP_TCPHDR(pip, ptr) do { \ pip = mtod(*ptr, struct ip *); \ *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } while (0) #define PULLUP_ICMPHDR(pip, ptr) do { \ pip = mtod(*ptr, struct ip *); \ *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } while (0) #define PULLUP_ICMPIP64(pip, ptr, ic) do { \ @@ -208,26 +210,32 @@ s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ *ptr = m_pullup((*ptr), s); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } while (0) #define PULLUP_IPTCPHDR(pip, ptr) do { \ *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ if (pip != NULL) { \ *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } \ } while (0) #define PULLUP_IPUDPHDR(pip, ptr) do { \ *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ if (pip != NULL) { \ *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = mtod(*ptr, struct ip *); \ + (pip) = MYMTOD(*ptr, struct ip *); \ } \ } while (0) + +#define PULLUP_SIZE(pip, ptr, s) do { \ + *ptr = m_pullup((*ptr), s); \ + (pip) = MYMTOD(*ptr, struct ip *); \ +} while (0) + #else typedef char * pkt_t; @@ -238,6 +246,7 @@ #define PULLUP_ICMPIP64(pip, ptr, ic) pip = (struct ip *)ptr #define PULLUP_IPTCPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_IPUDPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_SIZE(pip, ptr, s) pip = (struct ip *)ptr #endif /* From owner-p4-projects@FreeBSD.ORG Thu Feb 8 11:00:05 2007 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 71E1616A409; Thu, 8 Feb 2007 10:59:38 +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 CD1D716A400 for ; Thu, 8 Feb 2007 10:59:34 +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 BC14E13C481 for ; Thu, 8 Feb 2007 10:59:34 +0000 (UTC) (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 l18AxYcj070563 for ; Thu, 8 Feb 2007 10:59:34 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18AxY9Y070560 for perforce@freebsd.org; Thu, 8 Feb 2007 10:59:34 GMT (envelope-from piso@freebsd.org) Date: Thu, 8 Feb 2007 10:59:34 GMT Message-Id: <200702081059.l18AxY9Y070560@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 114233 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: Thu, 08 Feb 2007 11:00:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=114233 Change 114233 by piso@piso_newluxor on 2007/02/08 10:58:34 o when pulling up an ip hdr, if present, pullup the options too. o rewrite some PULLUP macros, using PULLUP_SIZE. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#24 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#24 (text+ko) ==== @@ -181,59 +181,50 @@ #define MYMTOD(p, foo) (p != NULL) ? mtod(p, foo) : NULL +#define PULLUP_SIZE(pip, ptr, s) do { \ + *ptr = m_pullup((*ptr), s); \ + (pip) = MYMTOD(*ptr, struct ip *); \ +} while (0) + #define PULLUP_IPHDR(pip, ptr) do { \ - *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, sizeof(struct ip)); \ + if (pip != NULL && ((pip->ip_hl << 2) > sizeof(struct ip))) \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2)); \ } while (0) #define PULLUP_UDPHDR(pip, ptr) do { \ - pip = mtod(*ptr, struct ip *); \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct udphdr)); \ } while (0) #define PULLUP_TCPHDR(pip, ptr) do { \ - pip = mtod(*ptr, struct ip *); \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ } while (0) #define PULLUP_ICMPHDR(pip, ptr) do { \ - pip = mtod(*ptr, struct ip *); \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct icmp)); \ } while (0) #define PULLUP_ICMPIP64(pip, ptr, ic) do { \ int s; \ - pip = mtod(*ptr, struct ip *); \ - s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ - (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ - *ptr = m_pullup((*ptr), s); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + pip = mtod(*ptr, struct ip *); \ + s = (pip->ip_hl << 2) + sizeof(struct icmp) + \ + (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8; \ + PULLUP_SIZE(pip, ptr, s); \ } while (0) #define PULLUP_IPTCPHDR(pip, ptr) do { \ - *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ - if (pip != NULL) { \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ - } \ + PULLUP_IPHDR(pip, ptr); \ + if (pip != NULL) \ + PULLUP_TCPHDR(pip, ptr); \ } while (0) #define PULLUP_IPUDPHDR(pip, ptr) do { \ - *ptr = m_pullup((*ptr), sizeof(struct ip)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ - if (pip != NULL) { \ - *ptr = m_pullup((*ptr), (pip->ip_hl << 2) + sizeof(struct udphdr)); \ - (pip) = MYMTOD(*ptr, struct ip *); \ - } \ -} while (0) - -#define PULLUP_SIZE(pip, ptr, s) do { \ - *ptr = m_pullup((*ptr), s); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + PULLUP_IPHDR(pip, ptr); \ + if (pip != NULL) \ + PULLUP_UDPHDR(pip, ptr); \ } while (0) #else From owner-p4-projects@FreeBSD.ORG Thu Feb 8 11:59:04 2007 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 A261316A407; Thu, 8 Feb 2007 11:58:54 +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 0517A16A400 for ; Thu, 8 Feb 2007 11:58:51 +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 EAB2B13C471 for ; Thu, 8 Feb 2007 11:58:50 +0000 (UTC) (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 l18BwoDI081158 for ; Thu, 8 Feb 2007 11:58:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18BwoDn081152 for perforce@freebsd.org; Thu, 8 Feb 2007 11:58:50 GMT (envelope-from piso@freebsd.org) Date: Thu, 8 Feb 2007 11:58:50 GMT Message-Id: <200702081158.l18BwoDn081152@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 114235 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: Thu, 08 Feb 2007 11:59:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=114235 Change 114235 by piso@piso_newluxor on 2007/02/08 11:58:25 When pulling up the tcp hdr, pull up the options too. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#25 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#25 (text+ko) ==== @@ -198,8 +198,15 @@ } while (0) #define PULLUP_TCPHDR(pip, ptr) do { \ + struct tcphdr *th; \ pip = mtod(*ptr, struct ip *); \ PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + if (pip != NULL) { \ + th = (struct tcphdr *)&(((char *)pip)[pip->ip_hl << 2]); \ + if ((th->th_off << 2) > sizeof(struct tcphdr)) \ + PULLUP_SIZE(pip, ptr, ((pip->ip_hl + th->th_off) << \ + 2)); \ + } \ } while (0) #define PULLUP_ICMPHDR(pip, ptr) do { \ From owner-p4-projects@FreeBSD.ORG Thu Feb 8 13:52:19 2007 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 9C86016A513; Thu, 8 Feb 2007 13:52:16 +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 CEAD116A4D6 for ; Thu, 8 Feb 2007 13:52:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8566913C4CE for ; Thu, 8 Feb 2007 13:52:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l18DqEHr010534 for ; Thu, 8 Feb 2007 13:52:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18DqECO010525 for perforce@freebsd.org; Thu, 8 Feb 2007 13:52:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 8 Feb 2007 13:52:14 GMT Message-Id: <200702081352.l18DqECO010525@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 Cc: Subject: PERFORCE change 114238 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: Thu, 08 Feb 2007 13:52:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114238 Change 114238 by rwatson@rwatson_noisier on 2007/02/08 13:51:50 Kernel configuration for BPF performance measurement. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/conf/BPF#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 8 14:29:14 2007 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 BAB1016A408; Thu, 8 Feb 2007 14:29:09 +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 A259E16A40B for ; Thu, 8 Feb 2007 14:28:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9306A13C4A5 for ; Thu, 8 Feb 2007 14:28:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l18ESxUW018797 for ; Thu, 8 Feb 2007 14:28:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18ESxie018794 for perforce@freebsd.org; Thu, 8 Feb 2007 14:28:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 8 Feb 2007 14:28:59 GMT Message-Id: <200702081428.l18ESxie018794@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 Cc: Subject: PERFORCE change 114239 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: Thu, 08 Feb 2007 14:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114239 Change 114239 by rwatson@rwatson_noisy on 2007/02/08 14:28:50 Workaround for VPD problems on my test hardware. Disabled by default. Affected files ... .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#2 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#2 (text+ko) ==== @@ -244,6 +244,11 @@ &pci_do_power_resume, 1, "Transition from D3 -> D0 on resume."); +static int pci_do_vpd = 1; +TUNABLE_INT("hw.pci.enable_vpd", &pci_do_vpd); +SYSCTL_INT(_hw_pci, OID_AUTO, enable_vpd, CTLFLAG_RW, &pci_do_vpd, 1, + "Enable support for VPD."); + static int pci_do_msi = 1; TUNABLE_INT("hw.pci.enable_msi", &pci_do_msi); SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RW, &pci_do_msi, 1, @@ -568,8 +573,10 @@ cfg->msix.msix_pba_offset = val & ~PCIM_MSIX_BIR_MASK; break; case PCIY_VPD: /* PCI Vital Product Data */ - cfg->vpd.vpd_reg = ptr; - pci_read_vpd(pcib, cfg); + if (pci_do_vpd) { + cfg->vpd.vpd_reg = ptr; + pci_read_vpd(pcib, cfg); + } break; case PCIY_SUBVENDOR: /* Should always be true. */ From owner-p4-projects@FreeBSD.ORG Thu Feb 8 16:35:13 2007 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 1A80D16A406; Thu, 8 Feb 2007 16:34:52 +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 A5CAB16A400 for ; Thu, 8 Feb 2007 16:34:48 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C2B013C441 for ; Thu, 8 Feb 2007 16:34:48 +0000 (UTC) (envelope-from csjp@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 l18GYmLQ043899 for ; Thu, 8 Feb 2007 16:34:48 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18GYm9X043894 for perforce@freebsd.org; Thu, 8 Feb 2007 16:34:48 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 16:34:48 GMT Message-Id: <200702081634.l18GYm9X043894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114242 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: Thu, 08 Feb 2007 16:35:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114242 Change 114242 by csjp@csjp_rnd01 on 2007/02/08 16:34:38 Clean up packet access options Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#12 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#12 (text+ko) ==== @@ -95,6 +95,8 @@ u_char *b,*bp, *ep, *p, by; #define bhp ((struct bpf_hdr *)bp) + if (!wflag && !tflag && !Tflag) + return; b = bp = bz->bz_bufa; ep = bp + bz->bz_buflen; while (bp < ep) { @@ -114,13 +116,15 @@ bp += BPF_WORDALIGN(clen + hlen); continue; } - pcap_dump((u_char *)dp, &phd, p); - if (ferror((FILE *)dp)) { - perror("dump.pcap"); - exit(1); + if (wflag) { + pcap_dump((u_char *)dp, &phd, p); + if (ferror((FILE *)dp)) { + perror("dump.pcap"); + exit(1); + } + fflush((FILE *)dp); + bp += BPF_WORDALIGN(clen + hlen); } - fflush((FILE *)dp); - bp += BPF_WORDALIGN(clen + hlen); } } @@ -160,8 +164,7 @@ err(1, "read failed"); bz.bz_bufa = pbuf; bz.bz_buflen = n; - if (wflag) - bpf_process_packets(&bz, "W"); + bpf_process_packets(&bz, "W"); } else { processed_data = 0; bzha = (struct bpf_zbuf_header *)bufa; @@ -179,16 +182,14 @@ bz.bz_bufa = bufa; bz.bz_bufa += sizeof(struct bpf_zbuf_header); bz.bz_buflen = bzha->bzh_kernel_len; - if (wflag) - bpf_process_packets(&bz, "A"); + bpf_process_packets(&bz, "A"); bzha->bzh_user_gen++; processed_data++; } else if (bzhb->bzh_kernel_gen > bzhb->bzh_user_gen) { bz.bz_bufa = bufb; bz.bz_bufa += sizeof(struct bpf_zbuf_header); bz.bz_buflen = bzhb->bzh_kernel_len; - if (wflag) - bpf_process_packets(&bz, "B"); + bpf_process_packets(&bz, "B"); bzhb->bzh_user_gen++; processed_data++; } From owner-p4-projects@FreeBSD.ORG Thu Feb 8 16:37:56 2007 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 BBB4216A401; Thu, 8 Feb 2007 16:37:54 +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 E309D16A400 for ; Thu, 8 Feb 2007 16:37:52 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 94A0613C442 for ; Thu, 8 Feb 2007 16:37:52 +0000 (UTC) (envelope-from csjp@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 l18Gbq8U044064 for ; Thu, 8 Feb 2007 16:37:52 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18GbqjV044061 for perforce@freebsd.org; Thu, 8 Feb 2007 16:37:52 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 16:37:52 GMT Message-Id: <200702081637.l18GbqjV044061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114243 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: Thu, 08 Feb 2007 16:37:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=114243 Change 114243 by csjp@csjp_rnd01 on 2007/02/08 16:37:35 Tweak printing of diagnostic messages Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#13 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#13 (text+ko) ==== @@ -153,11 +153,10 @@ fprintf(stderr,"owned by select\n"); err(1, "select failed"); } + if (vflag) + (void) fprintf(stderr, "select wakeup\n"); if (n != 0 && !FD_ISSET(fd, &r_set)) printf("No timeout and fd is not ready!\n"); - if (vflag) - (void) fprintf(stderr, - "DEBUG: wokeup and bpf is ready to read from: %d\n", n); if (zflag == 0) { n = read(fd, pbuf, bflag); if (n < 0) From owner-p4-projects@FreeBSD.ORG Thu Feb 8 16:51:28 2007 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 B90A016A408; Thu, 8 Feb 2007 16:51:16 +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 E713616A406 for ; Thu, 8 Feb 2007 16:51:09 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9508113C48E for ; Thu, 8 Feb 2007 16:51:09 +0000 (UTC) (envelope-from csjp@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 l18Gp9t8054141 for ; Thu, 8 Feb 2007 16:51:09 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18Gp9p6054131 for perforce@freebsd.org; Thu, 8 Feb 2007 16:51:09 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 16:51:09 GMT Message-Id: <200702081651.l18Gp9p6054131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114244 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: Thu, 08 Feb 2007 16:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=114244 Change 114244 by csjp@csjp_rnd01 on 2007/02/08 16:50:52 Add basic README for this tool Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 8 16:57:42 2007 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 45BA216A4A7; Thu, 8 Feb 2007 16:57:23 +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 7DD0216A4FD for ; Thu, 8 Feb 2007 16:57:21 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AA47413C48E for ; Thu, 8 Feb 2007 16:57:19 +0000 (UTC) (envelope-from csjp@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 l18GvJO5055397 for ; Thu, 8 Feb 2007 16:57:19 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18GvJr9055394 for perforce@freebsd.org; Thu, 8 Feb 2007 16:57:19 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 16:57:19 GMT Message-Id: <200702081657.l18GvJr9055394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114247 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: Thu, 08 Feb 2007 16:57:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114247 Change 114247 by csjp@csjp_rnd01 on 2007/02/08 16:57:01 Add notes about testing details Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/README#2 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/README#2 (text+ko) ==== @@ -40,3 +40,20 @@ SEE ALSO netstat, tcpreplay (port) + +TESTING + + +------------------+ +---------------+ + | packet generator | | IDS box | + | using tcpreplay |--------------| using bpfnull | + | | X-OVER CABLE | | + +------------------+ +---------------+ + + In some cases, for "sustained" testing, we go through a Catalyst 2950 + so we can monitor Tx/Rx packets, packet per second rates (over five + minnute samplings) to look at what is being transmitted and received. + + tcpreplay -l 5000 -R -i bge0 icmp.10.byte.packets.pcap + + Cycle through every packet in icmp.10.byte.packets.pcap (generated using + tcpdump -w) 5000 times, sending as fast as you can. From owner-p4-projects@FreeBSD.ORG Thu Feb 8 18:15:02 2007 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 5D69F16A4CD; Thu, 8 Feb 2007 18:15:02 +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 615E116A4A1 for ; Thu, 8 Feb 2007 18:15:01 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4B7EA13C4A5 for ; Thu, 8 Feb 2007 18:15:01 +0000 (UTC) (envelope-from csjp@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 l18IF1XE070930 for ; Thu, 8 Feb 2007 18:15:01 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18IF0OK070927 for perforce@freebsd.org; Thu, 8 Feb 2007 18:15:00 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 18:15:00 GMT Message-Id: <200702081815.l18IF0OK070927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114252 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: Thu, 08 Feb 2007 18:15:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=114252 Change 114252 by csjp@csjp_rnd01 on 2007/02/08 18:14:09 experimental prefetching code. Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/README#3 edit .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#14 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/README#3 (text+ko) ==== @@ -2,7 +2,7 @@ bpfnull -- Process packets from BPF SYNOPSIS - bpfnull [-IwtTvz] [-i interface] [-f pcap out file] + bpfnull [-IwptTvz] [-i interface] [-f pcap out file] DESCRIPTION Process packets from BPF using new zerocopy or regular buffer method. A @@ -17,6 +17,8 @@ -t After packet has been received in packet buffer, touch BPF headers associated with EACH packet + -p Prefetch packet data into cache lines prior to processing it + -T Touch each byte associated with the packet for EACH packet -v Print debug or diagnostic messages to stderr ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#14 (text+ko) ==== @@ -65,6 +65,7 @@ static int zflag; static int tflag; static int Tflag; +static int pflag; static u_char *bufa, *bufb; static int @@ -87,6 +88,8 @@ } } +#define CACHE_LINE_SIZE 32 + static void bpf_process_packets(struct bpf_zbuf *bz, char *bufname) { @@ -98,7 +101,14 @@ if (!wflag && !tflag && !Tflag) return; b = bp = bz->bz_bufa; - ep = bp + bz->bz_buflen; + p = ep = bp + bz->bz_buflen; + if (pflag) { + for (i = 0; i < bz->bz_buflen; + i += CACHE_LINE_SIZE) { + p += i; + __builtin_prefetch(p, 0, 2); + } + } while (bp < ep) { clen = bhp->bh_caplen; hlen = bhp->bh_hdrlen; @@ -107,7 +117,7 @@ phd.ts.tv_usec = bhp->bh_tstamp.tv_usec; phd.caplen = phd.len = bhp->bh_datalen; if (Tflag) { - for (i = 0; i < phd.caplen; i++) + for (i = 0; i < phd.len; i++) by = p[i]; bp += BPF_WORDALIGN(clen + hlen); continue; @@ -278,7 +288,7 @@ char ch; signal(SIGINT, (void *)handle_int); - while ((ch = getopt(argc, argv, "b:f:hIi:tTwvz")) != -1) { + while ((ch = getopt(argc, argv, "b:f:hIi:ptTwvz")) != -1) { switch (ch) { case 'b': bflag = atoi(optarg); @@ -293,6 +303,9 @@ case 'I': Iflag = 1; break; + case 'p': + pflag = 1; + break; case 't': tflag = 1; break; From owner-p4-projects@FreeBSD.ORG Thu Feb 8 18:17:05 2007 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 0A2C216A403; Thu, 8 Feb 2007 18:17:05 +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 A32BE16A400 for ; Thu, 8 Feb 2007 18:17:04 +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 95AA613C4BC for ; Thu, 8 Feb 2007 18:17:04 +0000 (UTC) (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 l18IH414071045 for ; Thu, 8 Feb 2007 18:17:04 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18IH4CR071042 for perforce@freebsd.org; Thu, 8 Feb 2007 18:17:04 GMT (envelope-from piso@freebsd.org) Date: Thu, 8 Feb 2007 18:17:04 GMT Message-Id: <200702081817.l18IH4CR071042@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 114253 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: Thu, 08 Feb 2007 18:17:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=114253 Change 114253 by piso@piso_newluxor on 2007/02/08 18:16:27 Convert the cu_seeme module to (almost)use mbuf. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#16 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#16 (text+ko) ==== @@ -187,7 +187,9 @@ struct cu_header *cu; struct alias_link *cu_lnk; - // XXX broken + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + ntohs(ud->uh_ulen) + + sizeof(struct cu_header)); + ud = ip_next(pip); cu = udp_next(ud); if (cu->addr) cu->addr = (u_int32_t) GetAliasAddress(lnk).s_addr; @@ -212,29 +214,56 @@ struct oc_header *oc; struct client_info *ci; char *end; - int i; + int i, client_count, ci_count, s; +#ifdef _KERNEL + int off; + struct mbuf *m; +#endif (void)la; - PULLUP_UDPHDR(pip, ptr); + PULLUP_IPHDR(pip, ptr); + s = (pip->ip_hl << 2) + sizeof(struct udphdr) + + sizeof(struct oc_header) + sizeof(struct client_info); + PULLUP_SIZE(pip, ptr, s); if (pip == NULL) return; alias_addr.s_addr = pip->ip_dst.s_addr; ud = ip_next(pip); - // XXX broken cu = udp_next(ud); oc = (struct oc_header *)(cu + 1); ci = (struct client_info *)(oc + 1); end = (char *)ud + ntohs(ud->uh_ulen); + client_count = oc->client_count; + ci_count = (ntohs(ud->uh_ulen) - sizeof(struct udphdr) - + sizeof(struct cu_header) - sizeof(struct oc_header)) / + sizeof(struct client_info); if ((char *)oc <= end) { if (cu->dest_addr) cu->dest_addr = (u_int32_t) original_addr.s_addr; if (ntohs(cu->data_type) == 101) /* Find and change our address */ - for (i = 0; (char *)(ci + 1) <= end && i < oc->client_count; i++, ci++) + for (i = 0; i < ci_count && i < client_count; i++) { +#ifdef _KERNEL + m = m_getptr(*ptr, s, &off); + // XXX to avoid crossing mbuf boundary with + // XXX off + sizeof(struct client_info) i should + // XXX m_split(m, off, M_TRYWAIT) first and + // XXX m_pullup(m, sizeof(struct client_info)), + // XXX and m_cat() later but I'm worried about + // XXX performance... + m = m_pullup(m, off + sizeof(struct client_info)); + s += sizeof(struct client_info); + ci = mtod(m, struct client_info *); + ci = (struct client_info *)&(((char *)ci)[off]); +#endif if (ci->address == (u_int32_t) alias_addr.s_addr) { ci->address = (u_int32_t) original_addr.s_addr; break; } +#ifndef _KERNEL + ci++; +#endif + } } } From owner-p4-projects@FreeBSD.ORG Thu Feb 8 21:31:13 2007 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 A2D7316A407; Thu, 8 Feb 2007 21:31:12 +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 5B49716A400 for ; Thu, 8 Feb 2007 21:31:12 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4CAA113C4A6 for ; Thu, 8 Feb 2007 21:31:12 +0000 (UTC) (envelope-from csjp@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 l18LVBLA017467 for ; Thu, 8 Feb 2007 21:31:12 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18LVBu5017457 for perforce@freebsd.org; Thu, 8 Feb 2007 21:31:11 GMT (envelope-from csjp@freebsd.org) Date: Thu, 8 Feb 2007 21:31:11 GMT Message-Id: <200702082131.l18LVBu5017457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 114260 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: Thu, 08 Feb 2007 21:31:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114260 Change 114260 by csjp@csjp_rnd01 on 2007/02/08 21:30:37 Change the prefetch algorithm to fetch the next packet's header instead of unconditionally prefetching everything. Affected files ... .. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#15 edit Differences ... ==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#15 (text+ko) ==== @@ -102,14 +102,9 @@ return; b = bp = bz->bz_bufa; p = ep = bp + bz->bz_buflen; - if (pflag) { - for (i = 0; i < bz->bz_buflen; - i += CACHE_LINE_SIZE) { - p += i; - __builtin_prefetch(p, 0, 2); - } - } while (bp < ep) { + if (pflag) + __builtin_prefetch(bp + bhp->bh_datalen, 0, 3); clen = bhp->bh_caplen; hlen = bhp->bh_hdrlen; p = (u_char *)bp + hlen; From owner-p4-projects@FreeBSD.ORG Fri Feb 9 03:45:16 2007 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 2332116A401; Fri, 9 Feb 2007 03:45:16 +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 AC97916A402 for ; Fri, 9 Feb 2007 03:45:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9A38B13C471 for ; Fri, 9 Feb 2007 03:45:15 +0000 (UTC) (envelope-from sam@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 l193jF6g094281 for ; Fri, 9 Feb 2007 03:45:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l193jE6e094270 for perforce@freebsd.org; Fri, 9 Feb 2007 03:45:14 GMT (envelope-from sam@freebsd.org) Date: Fri, 9 Feb 2007 03:45:14 GMT Message-Id: <200702090345.l193jE6e094270@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 Cc: Subject: PERFORCE change 114275 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, 09 Feb 2007 03:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=114275 Change 114275 by sam@sam_ebb on 2007/02/09 03:44:50 correct rssi units we, are using .5 dBm Reviewed by: sephe Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#61 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#61 (text+ko) ==== @@ -1285,7 +1285,7 @@ , ether_ntoa((const struct ether_addr *) sr->isr_bssid) , ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags) , getmaxrate(sr->isr_rates, sr->isr_nrates) - , sr->isr_rssi+sr->isr_noise, sr->isr_noise + , (sr->isr_rssi/2)+sr->isr_noise, sr->isr_noise , sr->isr_intval , getcaps(sr->isr_capinfo) ); @@ -1398,12 +1398,12 @@ if (si->isi_len < sizeof(*si)) break; vp = (u_int8_t *)(si+1); - printf("%s %4u %4d %3dM %4d %4d %6d %6d %-4.4s %-4.4s" + printf("%s %4u %4d %3dM %3.1f %4d %6d %6d %-4.4s %-4.4s" , ether_ntoa((const struct ether_addr*) si->isi_macaddr) , IEEE80211_AID(si->isi_associd) , ieee80211_mhz2ieee(si->isi_freq, si->isi_flags) , (si->isi_rates[si->isi_txrate] & IEEE80211_RATE_VAL)/2 - , si->isi_rssi + , si->isi_rssi/2. , si->isi_inact , si->isi_txseqs[0] , si->isi_rxseqs[0] From owner-p4-projects@FreeBSD.ORG Fri Feb 9 12:53:19 2007 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 3F44916A403; Fri, 9 Feb 2007 12:53:19 +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 F1AFF16A401 for ; Fri, 9 Feb 2007 12:53:18 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E2D0A13C441 for ; Fri, 9 Feb 2007 12:53:18 +0000 (UTC) (envelope-from sephe@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 l19CrIge004427 for ; Fri, 9 Feb 2007 12:53:18 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19CrIZc004423 for perforce@freebsd.org; Fri, 9 Feb 2007 12:53:18 GMT (envelope-from sephe@FreeBSD.org) Date: Fri, 9 Feb 2007 12:53:18 GMT Message-Id: <200702091253.l19CrIZc004423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114288 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, 09 Feb 2007 12:53:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114288 Change 114288 by sephe@sephe_zealot:sam_wifi on 2007/02/09 12:52:33 Avoid possible mbuf re-tap on error path. Obtained-from: DragonFly Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#80 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#80 (text+ko) ==== @@ -139,7 +139,7 @@ struct ieee80211_frame *wh; struct ieee80211_key *key; struct ether_header *eh; - int hdrspace; + int hdrspace, need_tap; u_int8_t dir, type, subtype; u_int8_t *bssid; u_int16_t rxseq; @@ -152,6 +152,7 @@ m_adj(m, -IEEE80211_CRC_LEN); m->m_flags &= ~M_HASFCS; } + need_tap = 1; /* mbuf need to be tapped. */ type = -1; /* undefined */ /* * In monitor mode, send everything directly to bpf. @@ -427,6 +428,7 @@ /* copy to listener after decrypt */ if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m); + need_tap = 0; /* * Finally, strip the 802.11 header. @@ -588,7 +590,7 @@ ifp->if_ierrors++; out: if (m != NULL) { - if (bpf_peers_present(ic->ic_rawbpf)) + if (bpf_peers_present(ic->ic_rawbpf) && need_tap) bpf_mtap(ic->ic_rawbpf, m); m_freem(m); } From owner-p4-projects@FreeBSD.ORG Fri Feb 9 13:34:11 2007 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 C929816A405; Fri, 9 Feb 2007 13:34:10 +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 8B07716A402 for ; Fri, 9 Feb 2007 13:34:10 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6358B13C47E for ; Fri, 9 Feb 2007 13:34:10 +0000 (UTC) (envelope-from sephe@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 l19DYAXL012298 for ; Fri, 9 Feb 2007 13:34:10 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19DYAxX012295 for perforce@freebsd.org; Fri, 9 Feb 2007 13:34:10 GMT (envelope-from sephe@FreeBSD.org) Date: Fri, 9 Feb 2007 13:34:10 GMT Message-Id: <200702091334.l19DYAxX012295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114289 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, 09 Feb 2007 13:34:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=114289 Change 114289 by sephe@sephe_zealot:sam_wifi on 2007/02/09 13:34:03 Return immediately, if m_pullup() fails on a fast frame. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#81 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#81 (text+ko) ==== @@ -493,6 +493,7 @@ ni->ni_macaddr, "fast-frame", "%s", "m_pullup(llc) failed"); ic->ic_stats.is_rx_tooshort++; + return type; } llc = (struct llc *)(mtod(m, u_int8_t *) + sizeof(struct ether_header)); From owner-p4-projects@FreeBSD.ORG Fri Feb 9 13:47:27 2007 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 60AB616A412; Fri, 9 Feb 2007 13:47:27 +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 3349216A400 for ; Fri, 9 Feb 2007 13:47:27 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0BAF313C4BD for ; Fri, 9 Feb 2007 13:47:27 +0000 (UTC) (envelope-from sephe@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 l19DlQE9013997 for ; Fri, 9 Feb 2007 13:47:26 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19DlQPW013993 for perforce@freebsd.org; Fri, 9 Feb 2007 13:47:26 GMT (envelope-from sephe@FreeBSD.org) Date: Fri, 9 Feb 2007 13:47:26 GMT Message-Id: <200702091347.l19DlQPW013993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114290 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, 09 Feb 2007 13:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=114290 Change 114290 by sephe@sephe_zealot:sam_wifi on 2007/02/09 13:46:27 Set ieee80211_node.ni_rxfragstamp if more fragments will come. This prevents pending fragments being reaped prematurely in station timeout routine. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#82 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#82 (text+ko) ==== @@ -683,6 +683,7 @@ *(u_int16_t *) lwh->i_seq = *(u_int16_t *) wh->i_seq; } if (more_frag) { /* more to come, save */ + ni->ni_rxfragstamp = ticks; ni->ni_rxfrag[0] = mfrag; mfrag = NULL; } From owner-p4-projects@FreeBSD.ORG Fri Feb 9 14:11:48 2007 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 7E9FC16A409; Fri, 9 Feb 2007 14:11:48 +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 345ED16A402 for ; Fri, 9 Feb 2007 14:11:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 20C8013C4A8 for ; Fri, 9 Feb 2007 14:11:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l19EBmGZ019571 for ; Fri, 9 Feb 2007 14:11:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19EAuWV018608 for perforce@freebsd.org; Fri, 9 Feb 2007 14:10:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 9 Feb 2007 14:10:56 GMT Message-Id: <200702091410.l19EAuWV018608@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 Cc: Subject: PERFORCE change 114291 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, 09 Feb 2007 14:11:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=114291 Change 114291 by rwatson@rwatson_cinnamon on 2007/02/09 14:10:44 Integrate TrustedBSD priv branch from base branch up to @112670. Affected files ... .. //depot/projects/trustedbsd/priv/sys/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/nexus_io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/conf/BWCT#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/include/armreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0/arm_init.s#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/bootiic/arm_init.S#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/bootspi/arm_init.S#3 delete .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/mci_device.c#3 delete .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#9 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#7 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.i386#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.pc98#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.powerpc#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sparc64#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sun4v#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.mk#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.post.mk#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_ps.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_watch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amd/amd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/asr/asr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/en/midway.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/flash/at45d.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/lance.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/md/md.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mly/mly.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/my/if_my.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/rp/rp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/trm/trm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/FILES#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uark.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/exception.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/locore.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/msi.c#1 branch .. //depot/projects/trustedbsd/priv/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/trap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm86.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/icu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/isa/pnpparse.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_event.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_idle.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_kse.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_lock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mac.c#4 delete .. //depot/projects/trustedbsd/priv/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_poll.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_proc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_subr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_switch.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_synch.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thread.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/ksched.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/p1003_1b.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/posix4_mib.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_core.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_lock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_prf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_rman.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_default.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vnode_if.src#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#6 integrate .. //depot/projects/trustedbsd/priv/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/isp/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/msk/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/uark/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/ethernet.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_llc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_media.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_ppp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_pppvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_vlan.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/netisr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/ppp_tty.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/route.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/igmp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/frag6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/mld6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/scope6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agp_intel.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agpreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_pcn.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_rl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_xl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/posix4/_semaphore.h#2 delete .. //depot/projects/trustedbsd/priv/sys/posix4/ksched.c#3 delete .. //depot/projects/trustedbsd/priv/sys/posix4/ksem.h#2 delete .. //depot/projects/trustedbsd/priv/sys/posix4/p1003_1b.c#4 delete .. //depot/projects/trustedbsd/priv/sys/posix4/posix4.h#2 delete .. //depot/projects/trustedbsd/priv/sys/posix4/posix4_mib.c#2 delete .. //depot/projects/trustedbsd/priv/sys/posix4/sched.h#2 delete .. //depot/projects/trustedbsd/priv/sys/posix4/semaphore.h#2 delete .. //depot/projects/trustedbsd/priv/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/param.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/asmacros.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tte_hash.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/autoconf.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/clock.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/counter.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_disasm.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/eeprom.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/elf_machdep.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/gdb_machdep.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/identcpu.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/in_cksum.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/iommu.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mem.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_bus.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_machdep.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/prof_machdep.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rtc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rwindow.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/sys_machdep.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/t1_copy.S#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tlb.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/_lock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/_mutex.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/_semaphore.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/copyright.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf_common.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/file.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/interrupt.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ksem.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/lock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/lock_profile.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/lockmgr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#9 delete .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mount.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mouse.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/pcpu.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/posix4.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/rtprio.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/runq.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sched.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sem.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/semaphore.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/soundcard.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysent.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/thr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/uio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/unpcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vmmeter.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/watchdog.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_fault.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_glue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_kern.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_kern.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_object.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 9 14:56:44 2007 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 BBF8C16A409; Fri, 9 Feb 2007 14:56:44 +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 93FDD16A400 for ; Fri, 9 Feb 2007 14:56:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 82D0F13C47E for ; Fri, 9 Feb 2007 14:56:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l19EuiGY032988 for ; Fri, 9 Feb 2007 14:56:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19EuiAb032985 for perforce@freebsd.org; Fri, 9 Feb 2007 14:56:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 9 Feb 2007 14:56:44 GMT Message-Id: <200702091456.l19EuiAb032985@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 Cc: Subject: PERFORCE change 114293 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, 09 Feb 2007 14:56:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114293 Change 114293 by rwatson@rwatson_cinnamon on 2007/02/09 14:55:50 Update for 7-CURRENT MAC include file changes. Affected files ... .. //depot/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.c#3 (text+ko) ==== @@ -45,10 +45,9 @@ #include #include #include -#include -#include #include +#include #include /* From owner-p4-projects@FreeBSD.ORG Fri Feb 9 14:59:49 2007 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 4805916A40B; Fri, 9 Feb 2007 14:59:49 +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 2019516A407 for ; Fri, 9 Feb 2007 14:59:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0D61213C4B3 for ; Fri, 9 Feb 2007 14:59:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l19ExmbM033150 for ; Fri, 9 Feb 2007 14:59:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19ExmTp033147 for perforce@freebsd.org; Fri, 9 Feb 2007 14:59:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 9 Feb 2007 14:59:48 GMT Message-Id: <200702091459.l19ExmTp033147@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 Cc: Subject: PERFORCE change 114294 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, 09 Feb 2007 14:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=114294 Change 114294 by rwatson@rwatson_cinnamon on 2007/02/09 14:59:00 Narrow scope of quota privileges allowed in jail by default: don't let superuser manipulate the usage counts or configuration of quotas. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#14 edit .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#14 (text+ko) ==== @@ -616,14 +616,11 @@ /* * Allow root in jail to manage a variety of quota - * properties. Some are a bit surprising and should be - * reconsidered. + * properties. These should likely be conditional on a + * configuration option. */ case PRIV_UFS_GETQUOTA: - case PRIV_UFS_QUOTAOFF: /* XXXRW: Slightly surprising. */ - case PRIV_UFS_QUOTAON: /* XXXRW: Slightly surprising. */ case PRIV_UFS_SETQUOTA: - case PRIV_UFS_SETUSE: /* XXXRW: Slightly surprising. */ /* * Since Jail relies on chroot() to implement file system ==== //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#6 (text+ko) ==== @@ -426,11 +426,7 @@ int error, flags; struct nameidata nd; - /* - * XXXRW: Can this be right? Jail is allowed to do this? - */ - error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAON, - SUSER_ALLOWJAIL); + error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAON, 0); if (error) return (error); @@ -524,11 +520,7 @@ struct inode *ip; int error; - /* - * XXXRW: This also seems wrong to allow in a jail? - */ - error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAOFF, - SUSER_ALLOWJAIL); + error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAOFF, 0); if (error) return (error); @@ -713,8 +705,7 @@ struct dqblk usage; int error; - error = priv_check_cred(td->td_ucred, PRIV_UFS_SETUSE, - SUSER_ALLOWJAIL); + error = priv_check_cred(td->td_ucred, PRIV_UFS_SETUSE, 0); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Fri Feb 9 16:14:37 2007 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 4F59B16A406; Fri, 9 Feb 2007 16:14:37 +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 D487316A401 for ; Fri, 9 Feb 2007 16:14:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C1ADB13C4B6 for ; Fri, 9 Feb 2007 16:14:36 +0000 (UTC) (envelope-from jhb@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 l19GEatq054552 for ; Fri, 9 Feb 2007 16:14:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19GEU1O054536 for perforce@freebsd.org; Fri, 9 Feb 2007 16:14:30 GMT (envelope-from jhb@freebsd.org) Date: Fri, 9 Feb 2007 16:14:30 GMT Message-Id: <200702091614.l19GEU1O054536@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 Cc: Subject: PERFORCE change 114301 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, 09 Feb 2007 16:14:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114301 Change 114301 by jhb@jhb_zion on 2007/02/09 16:13:43 IFC @114296. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#64 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#40 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#22 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#55 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#17 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#19 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#38 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#43 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#47 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#73 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.h#7 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#53 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#78 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#37 integrate .. //depot/projects/smpng/sys/conf/NOTES#135 integrate .. //depot/projects/smpng/sys/conf/files#196 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#35 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#61 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#62 integrate .. //depot/projects/smpng/sys/conf/options#134 integrate .. //depot/projects/smpng/sys/conf/options.sun4v#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#38 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#21 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#75 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#63 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#38 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#49 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#31 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#37 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#79 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#52 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#51 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#36 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#48 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#20 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#35 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#23 integrate .. //depot/projects/smpng/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/smpng/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/smpng/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#4 integrate .. //depot/projects/smpng/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/smpng/sys/dev/mc146818/mc146818reg.h#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#37 integrate .. //depot/projects/smpng/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#16 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#23 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#21 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#20 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#43 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#85 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#8 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#32 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#20 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#6 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#11 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#20 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#25 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#50 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#9 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#36 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#15 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#27 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#13 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#48 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#38 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#99 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#19 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#11 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#52 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#38 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#13 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#12 delete .. //depot/projects/smpng/sys/geom/geom_gpt.c#28 delete .. //depot/projects/smpng/sys/geom/geom_io.c#44 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#6 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part.h#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#85 integrate .. //depot/projects/smpng/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#124 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#105 integrate .. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/msi.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#80 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#15 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#14 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#16 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#51 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#41 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#32 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/smpng/sys/kern/init_main.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#105 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#41 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#67 integrate .. //depot/projects/smpng/sys/kern/sched_core.c#6 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#73 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#37 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#158 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#52 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#99 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#97 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#99 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#26 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#40 integrate .. //depot/projects/smpng/sys/modules/Makefile#134 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ath_rate_sample/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#15 integrate .. //depot/projects/smpng/sys/modules/ip_mroute_mod/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/le/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/msdosfs/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#66 integrate .. //depot/projects/smpng/sys/net/bpf_compat.h#5 delete .. //depot/projects/smpng/sys/net/bpfdesc.h#17 integrate .. //depot/projects/smpng/sys/net/if_loop.c#42 integrate .. //depot/projects/smpng/sys/net/if_tap.c#44 integrate .. //depot/projects/smpng/sys/net/if_tun.c#50 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#35 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#31 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#18 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#53 integrate .. //depot/projects/smpng/sys/netinet/in.c#35 integrate .. //depot/projects/smpng/sys/netinet/in.h#37 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#22 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#83 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#81 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#50 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#11 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#15 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#93 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#42 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#55 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#55 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#46 integrate .. //depot/projects/smpng/sys/netinet6/ah_core.c#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#39 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#21 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfs_subs.c#4 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#18 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#29 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#58 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#64 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#6 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#67 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#21 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#68 integrate .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#40 integrate .. //depot/projects/smpng/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/smpng/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#17 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#45 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#22 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#9 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#35 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#40 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#15 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#11 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#11 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#21 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#36 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#75 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#29 integrate .. //depot/projects/smpng/sys/sparc64/include/cache.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/frame.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/fsr.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/tsb.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#42 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#8 integrate .. //depot/projects/smpng/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/smpng/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pcb.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/smpng/sys/sun4v/include/utrap.h#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#7 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/interrupt.S#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/wbuf.S#5 integrate .. //depot/projects/smpng/sys/sys/_label.h#8 delete .. //depot/projects/smpng/sys/sys/apm.h#1 branch .. //depot/projects/smpng/sys/sys/ata.h#27 integrate .. //depot/projects/smpng/sys/sys/buf.h#45 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#8 integrate .. //depot/projects/smpng/sys/sys/conf.h#47 integrate .. //depot/projects/smpng/sys/sys/lock.h#41 integrate .. //depot/projects/smpng/sys/sys/mac.h#38 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#67 integrate .. //depot/projects/smpng/sys/sys/param.h#109 integrate .. //depot/projects/smpng/sys/sys/proc.h#177 integrate .. //depot/projects/smpng/sys/sys/runq.h#9 integrate .. //depot/projects/smpng/sys/sys/sched.h#26 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#55 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#44 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#61 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#91 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#36 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#61 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#68 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#16 integrate .. //depot/projects/smpng/sys/vm/uma.h#20 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#68 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#41 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#60 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#88 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#33 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#64 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1176,7 +1176,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1184,7 +1183,7 @@ setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DE, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DB, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); - setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); + setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 1); setidt(IDT_BP, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt(IDT_OF, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_BR, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); @@ -1207,6 +1206,12 @@ lidt(&r_idt); /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); + + /* * Initialize the console before we print anything out. */ cninit(); ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.281 2007/02/08 16:49:58 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -632,6 +632,8 @@ continue; if (cpu_info[apic_id].cpu_bsp) continue; + if (cpu_info[apic_id].cpu_disabled) + continue; /* Don't let hyperthreads service interrupts. */ if (hyperthreading_cpus > 1 && @@ -949,15 +951,12 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); if (ipi_bitmap & (1 << IPI_PREEMPT)) { + struct thread *running_thread = curthread; mtx_lock_spin(&sched_lock); - /* Don't preempt the idle thread */ - if (curthread != PCPU_GET(idlethread)) { - struct thread *running_thread = curthread; - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - } + if (running_thread->td_critnest > 1) + running_thread->td_owepreempt = 1; + else + mi_switch(SW_INVOL | SW_PREEMPT, NULL); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -120,6 +120,7 @@ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -176,6 +177,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/smpng/sys/amd64/amd64/msi.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -480,6 +480,30 @@ } int +msix_remap(int index, int irq) +{ + struct msi_intsrc *msi; + + sx_xlock(&msi_sx); + msi = (struct msi_intsrc *)intr_lookup_source(irq); + if (msi == NULL) { + sx_xunlock(&msi_sx); + return (ENOENT); + } + + /* Make sure this is an MSI-X message. */ + if (!msi->msi_msix) { + sx_xunlock(&msi_sx); + return (EINVAL); + } + + KASSERT(msi->msi_dev != NULL, ("unowned message")); + msi->msi_index = index; + sx_xunlock(&msi_sx); + return (0); +} + +int msix_release(int irq) { struct msi_intsrc *msi; ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -105,6 +105,7 @@ static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { @@ -135,6 +136,7 @@ DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), DEVMETHOD(pcib_release_msix, nexus_release_msix), { 0, 0 } @@ -510,6 +512,13 @@ } static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int nexus_release_msix(device_t pcib, device_t dev, int irq) { ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#55 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $ cpu HAMMER ident GENERIC @@ -43,7 +43,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/smpng/sys/amd64/include/clock.h#8 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -22,7 +22,8 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern struct mtx clock_lock; + +void i8254_init(void); /* * Driver to clock driver interface. ==== //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#5 (text+ko) ==== @@ -23,13 +23,13 @@ * (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/amd64/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 500 +#define GDB_BUFSZ (GDB_NREGS * 16) #define GDB_NREGS 56 #define GDB_REG_PC 16 ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#12 (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/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -152,6 +152,7 @@ void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); int msix_release(int irq); #endif /* !LOCORE */ ==== //depot/projects/smpng/sys/amd64/include/pcpu.h#5 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.46 2007/02/06 18:04:02 bde Exp $ */ #ifndef _MACHINE_PCPU_H_ -#define _MACHINE_PCPU_H_ +#define _MACHINE_PCPU_H_ #ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite +#error "sys/cdefs.h is a prerequisite for this file" #endif #ifdef _KERNEL @@ -51,16 +51,15 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ -#if defined(lint) - +#ifdef lint + extern struct pcpu *pcpup; - -#define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_PTR(member) (&pcpup->pc_ ## member) -#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) - -#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \ - && defined(__GNUCLIKE___OFFSETOF) + +#define PCPU_GET(member) (pcpup->pc_ ## member) +#define PCPU_PTR(member) (&pcpup->pc_ ## member) +#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) + +#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) /* * Evaluates to the byte offset of the per-cpu variable name. @@ -92,69 +91,39 @@ * Evaluates to the value of the per-cpu variable name. */ #define __PCPU_GET(name) __extension__ ({ \ - __pcpu_type(name) __result; \ + __pcpu_type(name) __res; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__result) == 1) { \ - u_char __b; \ - __asm __volatile("movb %%gs:%1,%0" \ - : "=r" (__b) \ - : "m" (*(u_char *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__b; \ - } else if (sizeof(__result) == 2) { \ - u_short __w; \ - __asm __volatile("movw %%gs:%1,%0" \ - : "=r" (__w) \ - : "m" (*(u_short *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__w; \ - } else if (sizeof(__result) == 4) { \ - u_int __i; \ - __asm __volatile("movl %%gs:%1,%0" \ - : "=r" (__i) \ - : "m" (*(u_int *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__i; \ - } else if (sizeof(__result) == 8) { \ - u_long __l; \ - __asm __volatile("movq %%gs:%1,%0" \ - : "=r" (__l) \ - : "m" (*(u_long *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__l; \ + if (sizeof(__res) == 1 || sizeof(__res) == 2 || \ + sizeof(__res) == 4 || sizeof(__res) == 8) { \ + __asm __volatile("mov %%gs:%1,%0" \ + : "=r" (__s) \ + : "m" (*(struct __s *)(__pcpu_offset(name)))); \ + *(struct __s *)(void *)&__res = __s; \ } else { \ - __result = *__PCPU_PTR(name); \ + __res = *__PCPU_PTR(name); \ } \ - \ - __result; \ + __res; \ }) /* * Sets the value of the per-cpu variable name to value val. */ #define __PCPU_SET(name, val) { \ - __pcpu_type(name) __val = (val); \ + __pcpu_type(name) __val; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__val) == 1) { \ - u_char __b; \ - __b = *(u_char *)&__val; \ - __asm __volatile("movb %1,%%gs:%0" \ - : "=m" (*(u_char *)(__pcpu_offset(name))) \ - : "r" (__b)); \ - } else if (sizeof(__val) == 2) { \ - u_short __w; \ - __w = *(u_short *)&__val; \ - __asm __volatile("movw %1,%%gs:%0" \ - : "=m" (*(u_short *)(__pcpu_offset(name))) \ - : "r" (__w)); \ - } else if (sizeof(__val) == 4) { \ - u_int __i; \ - __i = *(u_int *)&__val; \ - __asm __volatile("movl %1,%%gs:%0" \ - : "=m" (*(u_int *)(__pcpu_offset(name))) \ - : "r" (__i)); \ - } else if (sizeof(__val) == 8) { \ - u_long __l; \ - __l = *(u_long *)&__val; \ - __asm __volatile("movq %1,%%gs:%0" \ - : "=m" (*(u_long *)(__pcpu_offset(name))) \ - : "r" (__l)); \ + __val = (val); \ + if (sizeof(__val) == 1 || sizeof(__val) == 2 || \ + sizeof(__val) == 4 || sizeof(__val) == 8) { \ + __s = *(struct __s *)(void *)&__val; \ + __asm __volatile("mov %1,%%gs:%0" \ + : "=m" (*(struct __s *)(__pcpu_offset(name))) \ + : "r" (__s)); \ } else { \ *__PCPU_PTR(name) = __val; \ } \ @@ -172,12 +141,14 @@ __asm __volatile("movq %%gs:0,%0" : "=r" (td)); return (td); } -#define curthread (__curthread()) +#define curthread (__curthread()) + +#else /* !lint || defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) */ + +#error "this file needs to be ported to your compiler" -#else -#error this file needs to be ported to your compiler -#endif +#endif /* lint, etc. */ -#endif /* _KERNEL */ +#endif /* _KERNEL */ -#endif /* ! _MACHINE_PCPU_H_ */ +#endif /* !_MACHINE_PCPU_H_ */ ==== //depot/projects/smpng/sys/amd64/isa/clock.c#20 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); /* * Routines to handle clock hardware. @@ -103,11 +103,11 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) static int beeping = 0; +static struct mtx clock_lock; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; @@ -295,13 +295,6 @@ printf("DELAY(%d)...", n); #endif /* - * Guard against the timer being uninitialized if we are called - * early for console i/o. - */ - if (timer0_max_count == 0) - set_timer_freq(timer_freq, hz); - - /* * Read the counter first, so that the rest of the setup overhead is * counted. Guess the initial overhead is 20 usec (on most systems it * takes about 1.5 usec for each of the i/o's in getit(). The loop @@ -560,10 +553,15 @@ mtx_unlock_spin(&clock_lock); } -/* - * Initialize 8254 timer 0 early so that it can be used in DELAY(). - * XXX initialization of other timers is unintentionally left blank. - */ +/* This is separate from startrtclock() so that it can be called early. */ +void +i8254_init(void) +{ + + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + set_timer_freq(timer_freq, hz); +} + void startrtclock() { @@ -572,7 +570,6 @@ writertc(RTC_STATUSA, rtc_statusa); writertc(RTC_STATUSB, RTCSB_24HR); - set_timer_freq(timer_freq, hz); freq = calibrate_clocks(); #ifdef CLK_CALIBRATION_LOOP if (bootverbose) { ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#8 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.10 2006/12/20 20:17:34 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -662,6 +662,13 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 +#define LINUX_SO_PEERCRED 17 +#define LINUX_SO_RCVLOWAT 18 +#define LINUX_SO_SNDLOWAT 19 +#define LINUX_SO_RCVTIMEO 20 +#define LINUX_SO_SNDTIMEO 21 +#define LINUX_SO_TIMESTAMP 29 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#17 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 16:20:37 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 13:27:51 kib Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -453,14 +454,21 @@ linux_fork(struct thread *td, struct linux_fork_args *args) { int error; + struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(fork)) printf(ARGS(fork, "")); #endif - if ((error = fork(td, (struct fork_args *)args)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); + + if (error == 0) { + td->td_retval[0] = p2->p_pid; + td->td_retval[1] = 0; + } if (td->td_retval[1] == 1) td->td_retval[0] = 0; @@ -468,6 +476,14 @@ if (error) return (error); + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + return (0); } @@ -476,6 +492,7 @@ { int error; struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(vfork)) @@ -483,7 +500,7 @@ #endif /* exclude RFPPWAIT */ - if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { td->td_retval[0] = p2->p_pid; @@ -495,12 +512,25 @@ error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); + + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); + return (0); } @@ -523,7 +553,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (exit_signal >= LINUX_NSIG) + if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) @@ -561,6 +591,14 @@ error = fork1(td, ff, 0, &p2); if (error) return (error); + + if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 9 16:15:39 2007 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 1ECD016A403; Fri, 9 Feb 2007 16:15:39 +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 EDA7716A40D for ; Fri, 9 Feb 2007 16:15:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8FDEA13C4B5 for ; Fri, 9 Feb 2007 16:15:38 +0000 (UTC) (envelope-from jhb@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 l19GFcD9054806 for ; Fri, 9 Feb 2007 16:15:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19GFcAj054803 for perforce@freebsd.org; Fri, 9 Feb 2007 16:15:38 GMT (envelope-from jhb@freebsd.org) Date: Fri, 9 Feb 2007 16:15:38 GMT Message-Id: <200702091615.l19GFcAj054803@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 Cc: Subject: PERFORCE change 114302 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, 09 Feb 2007 16:15:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=114302 Change 114302 by jhb@jhb_zion on 2007/02/09 16:15:17 IFC @114298. Affected files ... .. //depot/projects/smpng/sys/dev/usb/ubsa.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#100 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#4 branch Differences ... ==== //depot/projects/smpng/sys/dev/usb/ubsa.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.21 2007/02/04 22:14:18 le Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.22 2007/02/09 15:59:28 le Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -232,6 +232,8 @@ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G }, /* Option GlobeTrotter 3G QUAD */ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD }, + /* Huawei Mobile */ + { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, { 0, 0 } }; ==== //depot/projects/smpng/sys/dev/usb/usbdevs#100 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.286 2007/02/04 22:14:18 le Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.287 2007/02/09 15:59:28 le Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -513,6 +513,7 @@ vendor TSUNAMI 0x1241 Tsunami vendor CREATIVE2 0x1292 Creative Labs vendor BELKIN2 0x1293 Belkin +vendor HUAWEI 0x12d1 Huawei Technologies vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility vendor LINKSYS4 0x13b1 Linksys @@ -1084,6 +1085,9 @@ /* HP products */ product HP2 C500 0x6002 PhotoSmart C500 +/* HUAWEI products */ +product HUAWEI MOBILE 0x1001 Huawei Mobile + /* IBM Corporation */ product IBM USBCDROMDRIVE 0x4427 USB CD-ROM Drive From owner-p4-projects@FreeBSD.ORG Fri Feb 9 17:45:32 2007 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 10CD416A409; Fri, 9 Feb 2007 17:45:32 +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 CB92016A407 for ; Fri, 9 Feb 2007 17:45:31 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A722E13C47E for ; Fri, 9 Feb 2007 17:45:31 +0000 (UTC) (envelope-from brueffer@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 l19HjV0Z084301 for ; Fri, 9 Feb 2007 17:45:31 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19HjV6X084295 for perforce@freebsd.org; Fri, 9 Feb 2007 17:45:31 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 9 Feb 2007 17:45:31 GMT Message-Id: <200702091745.l19HjV6X084295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 114306 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, 09 Feb 2007 17:45:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114306 Change 114306 by brueffer@brueffer_serenity on 2007/02/09 17:45:23 Correct references to setaudit(2). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#8 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -116,7 +116,7 @@ properties returned by .Xr getacflg 3 . The resulting mask may be set via a call to -.Xr setaudit 3 +.Xr setaudit 2 or related variants. .Pp The @@ -126,7 +126,7 @@ .Sh SEE ALSO .Xr getacflg 3 , .Xr libbsm 3 , -.Xr setaudit 3 , +.Xr setaudit 2 , .Xr audit_user 5 .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security From owner-p4-projects@FreeBSD.ORG Fri Feb 9 17:56:33 2007 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 723BB16A406; Fri, 9 Feb 2007 17:56:33 +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 2237C16A401 for ; Fri, 9 Feb 2007 17:56:33 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1145613C481 for ; Fri, 9 Feb 2007 17:56:33 +0000 (UTC) (envelope-from brueffer@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 l19HuWBm086124 for ; Fri, 9 Feb 2007 17:56:32 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19HuWlN086121 for perforce@freebsd.org; Fri, 9 Feb 2007 17:56:32 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 9 Feb 2007 17:56:32 GMT Message-Id: <200702091756.l19HuWlN086121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 114309 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, 09 Feb 2007 17:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=114309 Change 114309 by brueffer@brueffer_serenity on 2007/02/09 17:56:08 Bah, fix order. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#9 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -124,9 +124,9 @@ function XXXXXXXXXXXXXXXXX .Sh SEE ALSO +.Xr setaudit 2 , .Xr getacflg 3 , .Xr libbsm 3 , -.Xr setaudit 2 , .Xr audit_user 5 .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security From owner-p4-projects@FreeBSD.ORG Fri Feb 9 19:23:34 2007 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 8E6B316A406; Fri, 9 Feb 2007 19:23:34 +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 64AC916A402 for ; Fri, 9 Feb 2007 19:23:34 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 539A013C49D for ; Fri, 9 Feb 2007 19:23:34 +0000 (UTC) (envelope-from brueffer@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 l19JNYrT003761 for ; Fri, 9 Feb 2007 19:23:34 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19JNYP3003757 for perforce@freebsd.org; Fri, 9 Feb 2007 19:23:34 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 9 Feb 2007 19:23:34 GMT Message-Id: <200702091923.l19JNYP3003757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 114316 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, 09 Feb 2007 19:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=114316 Change 114316 by brueffer@brueffer_serenity on 2007/02/09 19:22:37 Document the getfauditflags() function (text taken from the source file). Also modify a sentence to actually make sense. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#10 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -114,15 +114,16 @@ .Fa username . If the user audit configuration is not found, the default system audit properties returned by -.Xr getacflg 3 . +.Xr getacflg 3 +are used. The resulting mask may be set via a call to .Xr setaudit 2 or related variants. .Pp The .Fn getfauditflags -function -XXXXXXXXXXXXXXXXX +function generates a new process audit state by combining the audit masks +passed as parameters with the system audit masks. .Sh SEE ALSO .Xr setaudit 2 , .Xr getacflg 3 , From owner-p4-projects@FreeBSD.ORG Fri Feb 9 20:18:52 2007 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 3AA4B16A405; Fri, 9 Feb 2007 20:18:52 +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 E371616A402 for ; Fri, 9 Feb 2007 20:18:51 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D033013C46B for ; Fri, 9 Feb 2007 20:18:51 +0000 (UTC) (envelope-from peter@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 l19KIp0k013388 for ; Fri, 9 Feb 2007 20:18:51 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19KINtg013370 for perforce@freebsd.org; Fri, 9 Feb 2007 20:18:23 GMT (envelope-from peter@freebsd.org) Date: Fri, 9 Feb 2007 20:18:23 GMT Message-Id: <200702092018.l19KINtg013370@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 Cc: Subject: PERFORCE change 114322 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, 09 Feb 2007 20:18:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114322 Change 114322 by peter@peter_overcee on 2007/02/09 20:16:42 IFC @114315 Affected files ... .. //depot/projects/hammer/Makefile.inc1#118 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#21 integrate .. //depot/projects/hammer/UPDATING#97 integrate .. //depot/projects/hammer/bin/sh/exec.c#9 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#6 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#5 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/hammer/contrib/bind9/README#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/hammer/contrib/bind9/version#6 integrate .. //depot/projects/hammer/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/hammer/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/hammer/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/hammer/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/hammer/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/hammer/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/hammer/contrib/ncurses/NEWS#2 integrate .. //depot/projects/hammer/contrib/ncurses/README#2 integrate .. //depot/projects/hammer/contrib/ncurses/README.emx#2 integrate .. //depot/projects/hammer/contrib/ncurses/README.glibc#2 delete .. //depot/projects/hammer/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/hammer/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/headers#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/hammer/contrib/ncurses/c++/modules#2 delete .. //depot/projects/hammer/contrib/ncurses/config.guess#2 integrate .. //depot/projects/hammer/contrib/ncurses/config.sub#2 integrate .. //depot/projects/hammer/contrib/ncurses/configure#2 integrate .. //depot/projects/hammer/contrib/ncurses/configure.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/hammer/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/hammer/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/hammer/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/hammer/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/hammer/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/hammer/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/hammer/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/hammer/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/hammer/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/hammer/contrib/ncurses/form/modules#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/hammer/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/hammer/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/hammer/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/install-sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/hammer/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/hammer/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/hammer/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/hammer/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/hammer/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/csort#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/hammer/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/hammer/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/hammer/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/hammer/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/hammer/contrib/ncurses/test/README#2 delete .. //depot/projects/hammer/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/hammer/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/hammer/contrib/ncurses/test/configure#2 delete .. //depot/projects/hammer/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/hammer/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/hammer/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/modules#2 delete .. //depot/projects/hammer/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/hammer/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/hammer/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/hammer/contrib/ncurses/test/view.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/hammer/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/hammer/etc/defaults/rc.conf#73 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/hammer/etc/network.subr#17 integrate .. //depot/projects/hammer/etc/periodic/security/800.loginfail#5 integrate .. //depot/projects/hammer/etc/rc.d/jail#21 integrate .. //depot/projects/hammer/etc/rc.d/netif#18 integrate .. //depot/projects/hammer/etc/rc.d/quota#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#63 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#16 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/Makefile#5 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.c#4 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.h#4 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/inflate.c#4 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/match.S#3 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/unlzh.c#3 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/unpack.c#3 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/unzip.c#3 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/hammer/include/Makefile#58 integrate .. //depot/projects/hammer/include/objformat.h#2 delete .. //depot/projects/hammer/include/rpc/auth_kerb.h#3 integrate .. //depot/projects/hammer/include/tgmath.h#3 integrate .. //depot/projects/hammer/lib/Makefile#59 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#5 integrate .. //depot/projects/hammer/lib/bind/config.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/code.h#4 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/hammer/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#36 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#21 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_string.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#27 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getobjformat.3#5 delete .. //depot/projects/hammer/lib/libc/gen/getobjformat.c#3 delete .. //depot/projects/hammer/lib/libc/gen/siglist.c#4 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/hammer/lib/libc/include/spinlock.h#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.3#8 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#6 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetpath.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/_flock_stub.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#32 integrate .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#8 integrate .. //depot/projects/hammer/lib/libc/sys/__error.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/chmod.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/quotactl.2#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#17 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_accept.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_getdetachstate.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_getstackaddr.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_getstacksize.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_init.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_setdetachstate.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_setstackaddr.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_setstacksize.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_bind.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_clean.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_close.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_cond.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_condattr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_condattr_init.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_connect.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#7 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_detach.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_dup.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_dup2.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_equal.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_execve.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_exit.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fchmod.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fchown.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fcntl.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fd.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_find_thread.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_flock.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fork.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fstat.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fstatfs.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fsync.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_gc.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_getdirentries.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_getpeername.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_getprio.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_getsockname.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_getsockopt.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_info.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#11 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_ioctl.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_join.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_kern.c#8 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_kill.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_listen.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_multi_np.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutex.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutexattr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_nanosleep.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_once.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_open.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_pipe.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_read.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_readv.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_recvfrom.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_recvmsg.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_resume_np.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_select.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_self.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sendmsg.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sendto.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_seterrno.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_setprio.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_setsockopt.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_shutdown.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#10 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigaction.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigmask.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigpending.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigprocmask.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigsuspend.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sigwait.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_single_np.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_socket.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_socketpair.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_spec.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_spinlock.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_suspend_np.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_wait4.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_write.c#7 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_writev.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_yield.c#2 integrate .. //depot/projects/hammer/lib/libform/Makefile#4 delete .. //depot/projects/hammer/lib/libkvm/kvm_getswapinfo.c#5 integrate .. //depot/projects/hammer/lib/libmenu/Makefile#4 delete .. //depot/projects/hammer/lib/libncurses/ncurses_cfg.h#2 delete .. //depot/projects/hammer/lib/libncurses/pathnames.h#3 delete .. //depot/projects/hammer/lib/libncurses/termcap.c#4 delete .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#11 integrate .. //depot/projects/hammer/lib/libpanel/Makefile#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_destroy.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getdetachstate.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstackaddr.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstacksize.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setdetachstate.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstackaddr.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstacksize.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_clean.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_close.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#21 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_destroy.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_init.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#20 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_equal.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fsync.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#23 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_kind_np.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_multi_np.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#20 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutexattr_destroy.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_open.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#37 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_read.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_readv.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_self.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_seterrno.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_setprio.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#28 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_single_np.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_symbols.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_write.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_writev.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_condattr.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_equal.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#20 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getprio.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kill.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_multi_np.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_self.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setprio.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_single_np.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_symbols.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_yield.c#3 integrate .. //depot/projects/hammer/lib/ncurses/Makefile#1 branch .. //depot/projects/hammer/lib/ncurses/Makefile.inc#1 branch .. //depot/projects/hammer/lib/ncurses/config.mk#1 branch .. //depot/projects/hammer/lib/ncurses/form/Makefile#1 branch .. //depot/projects/hammer/lib/ncurses/menu/Makefile#1 branch .. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#1 branch .. //depot/projects/hammer/lib/ncurses/ncurses/ncurses_cfg.h#1 branch .. //depot/projects/hammer/lib/ncurses/ncurses/pathnames.h#1 branch .. //depot/projects/hammer/lib/ncurses/ncurses/termcap.c#1 branch .. //depot/projects/hammer/lib/ncurses/panel/Makefile#1 branch .. //depot/projects/hammer/libexec/ftpd/ftpd.c#30 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#12 integrate .. //depot/projects/hammer/release/Makefile#89 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#16 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#9 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#6 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#32 integrate .. //depot/projects/hammer/sbin/Makefile#43 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#9 integrate .. //depot/projects/hammer/sbin/dhclient/clparse.c#3 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#9 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#13 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhcp.h#3 integrate .. //depot/projects/hammer/sbin/dhclient/tables.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/hammer/sbin/geom/misc/subr.c#7 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.h#8 integrate .. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#39 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#27 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#11 integrate .. //depot/projects/hammer/sbin/init/init.c#11 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#10 integrate .. //depot/projects/hammer/sbin/mount/Makefile#8 integrate .. //depot/projects/hammer/sbin/mount/mount.c#28 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#9 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#14 integrate .. //depot/projects/hammer/sbin/mount_nfs/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#13 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#13 integrate .. //depot/projects/hammer/sbin/mount_nfs4/Makefile#3 delete .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.8#6 delete .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.c#7 delete .. //depot/projects/hammer/sbin/quotacheck/quotacheck.8#6 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#11 integrate .. //depot/projects/hammer/share/dict/freebsd#6 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#11 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#48 integrate .. //depot/projects/hammer/share/man/man3/pthread.3#9 integrate .. //depot/projects/hammer/share/man/man4/altq.4#14 integrate .. //depot/projects/hammer/share/man/man4/an.4#8 integrate .. //depot/projects/hammer/share/man/man4/ata.4#28 integrate .. //depot/projects/hammer/share/man/man4/ath.4#33 integrate .. //depot/projects/hammer/share/man/man4/aue.4#12 integrate .. //depot/projects/hammer/share/man/man4/awi.4#11 integrate .. //depot/projects/hammer/share/man/man4/bce.4#3 integrate .. //depot/projects/hammer/share/man/man4/bfe.4#6 integrate .. //depot/projects/hammer/share/man/man4/bge.4#23 integrate .. //depot/projects/hammer/share/man/man4/dc.4#20 integrate .. //depot/projects/hammer/share/man/man4/de.4#12 integrate .. //depot/projects/hammer/share/man/man4/ed.4#14 integrate .. //depot/projects/hammer/share/man/man4/em.4#15 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#15 integrate .. //depot/projects/hammer/share/man/man4/hme.4#7 integrate .. //depot/projects/hammer/share/man/man4/icmp.4#9 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#13 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#12 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#14 integrate .. //depot/projects/hammer/share/man/man4/joy.4#6 integrate .. //depot/projects/hammer/share/man/man4/le.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#19 integrate .. //depot/projects/hammer/share/man/man4/msk.4#2 integrate .. //depot/projects/hammer/share/man/man4/mxge.4#3 integrate .. //depot/projects/hammer/share/man/man4/my.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_deflate.4#2 integrate .. //depot/projects/hammer/share/man/man4/nve.4#7 integrate .. //depot/projects/hammer/share/man/man4/ral.4#10 integrate .. //depot/projects/hammer/share/man/man4/re.4#19 integrate .. //depot/projects/hammer/share/man/man4/rl.4#17 integrate .. //depot/projects/hammer/share/man/man4/sf.4#7 integrate .. //depot/projects/hammer/share/man/man4/sis.4#11 integrate .. //depot/projects/hammer/share/man/man4/sk.4#12 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/hammer/share/man/man4/ste.4#12 integrate .. //depot/projects/hammer/share/man/man4/stge.4#2 integrate .. //depot/projects/hammer/share/man/man4/tap.4#7 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#17 integrate .. //depot/projects/hammer/share/man/man4/tun.4#7 integrate .. //depot/projects/hammer/share/man/man4/ubsa.4#7 integrate .. //depot/projects/hammer/share/man/man4/udav.4#6 integrate .. //depot/projects/hammer/share/man/man4/ural.4#9 integrate .. //depot/projects/hammer/share/man/man4/vr.4#13 integrate .. //depot/projects/hammer/share/man/man4/wi.4#27 integrate .. //depot/projects/hammer/share/man/man4/xl.4#15 integrate .. //depot/projects/hammer/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#9 integrate .. //depot/projects/hammer/share/man/man5/quota.user.5#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#76 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#6 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#16 integrate .. //depot/projects/hammer/share/man/man9/Makefile#66 integrate .. //depot/projects/hammer/share/man/man9/disk.9#6 integrate .. //depot/projects/hammer/share/man/man9/hashinit.9#3 integrate .. //depot/projects/hammer/share/man/man9/pmap_extract.9#3 integrate .. //depot/projects/hammer/share/man/man9/sf_buf.9#1 branch .. //depot/projects/hammer/share/man/man9/style.9#25 integrate .. //depot/projects/hammer/share/man/man9/vm_map.9#7 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#35 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#31 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#32 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#14 integrate .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#9 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#13 integrate .. //depot/projects/hammer/share/syscons/keymaps/fr.dvorak.acc.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/hr.iso.kbd#2 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#157 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#123 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#39 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#92 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#39 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#9 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#58 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#36 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#20 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#37 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#2 integrate .. //depot/projects/hammer/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/hammer/sys/arm/include/md_var.h#4 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#19 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#26 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#32 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.h#6 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#32 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#18 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#38 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#28 integrate .. //depot/projects/hammer/sys/conf/NOTES#113 integrate .. //depot/projects/hammer/sys/conf/files#145 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 9 20:49:30 2007 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 8371C16A405; Fri, 9 Feb 2007 20:49:30 +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 50AE316A401 for ; Fri, 9 Feb 2007 20:49:30 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 403B013C4B3 for ; Fri, 9 Feb 2007 20:49:30 +0000 (UTC) (envelope-from brueffer@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 l19KnUDW027933 for ; Fri, 9 Feb 2007 20:49:30 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19KnTpx027928 for perforce@freebsd.org; Fri, 9 Feb 2007 20:49:29 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 9 Feb 2007 20:49:29 GMT Message-Id: <200702092049.l19KnTpx027928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 114323 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, 09 Feb 2007 20:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=114323 Change 114323 by brueffer@brueffer_serenity on 2007/02/09 20:48:54 Fix reference to audit(8). Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#17 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#17 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -50,7 +50,7 @@ Changes to this entry can only be enacted by restarting the audit system. See -.Xr audit 1 +.Xr audit 8 for a description of how to restart the audit system. .It Va flags Specifies which audit event classes are audited for all users. From owner-p4-projects@FreeBSD.ORG Sat Feb 10 01:57:08 2007 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 BE84016A401; Sat, 10 Feb 2007 01:57:07 +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 7003216A402 for ; Sat, 10 Feb 2007 01:57:07 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6299E13C478 for ; Sat, 10 Feb 2007 01:57:07 +0000 (UTC) (envelope-from trhodes@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 l1A1v7wG010151 for ; Sat, 10 Feb 2007 01:57:07 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1A1v77c010148 for perforce@freebsd.org; Sat, 10 Feb 2007 01:57:07 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 10 Feb 2007 01:57:07 GMT Message-Id: <200702100157.l1A1v77c010148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 114334 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: Sat, 10 Feb 2007 01:57:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114334 Change 114334 by trhodes@trhodes_local on 2007/02/10 01:57:00 Fix a spelling error. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#25 $ */ #include @@ -865,7 +865,7 @@ syslog(LOG_ERR, "Could not create audit startup event."); else { /* - * XXXCSJP Perhaps we wan't more robust audit records for + * XXXCSJP Perhaps we want more robust audit records for * audit start up and shutdown. This might include capturing * failures to initialize the audit subsystem? */ From owner-p4-projects@FreeBSD.ORG Sat Feb 10 03:32:10 2007 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 8926716A4DC; Sat, 10 Feb 2007 03:32:10 +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 536B516A494 for ; Sat, 10 Feb 2007 03:32:10 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 461E013C48D for ; Sat, 10 Feb 2007 03:32:10 +0000 (UTC) (envelope-from mjacob@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 l1A3WA7w027447 for ; Sat, 10 Feb 2007 03:32:10 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1A3WAFs027444 for perforce@freebsd.org; Sat, 10 Feb 2007 03:32:10 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 10 Feb 2007 03:32:10 GMT Message-Id: <200702100332.l1A3WAFs027444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114336 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: Sat, 10 Feb 2007 03:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=114336 Change 114336 by mjacob@mjexp on 2007/02/10 03:31:41 Add putative untested 2432 (PCI-E) support. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#9 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#9 (text+ko) ==== @@ -259,6 +259,10 @@ #define PCI_PRODUCT_QLOGIC_ISP2422 0x2422 #endif +#ifndef PCI_PRODUCT_QLOGIC_ISP2432 +#define PCI_PRODUCT_QLOGIC_ISP2432 0x2432 +#endif + #ifndef PCI_PRODUCT_QLOGIC_ISP6312 #define PCI_PRODUCT_QLOGIC_ISP6312 0x6312 #endif @@ -304,6 +308,9 @@ #define PCI_QLOGIC_ISP2422 \ ((PCI_PRODUCT_QLOGIC_ISP2422 << 16) | PCI_VENDOR_QLOGIC) +#define PCI_QLOGIC_ISP2432 \ + ((PCI_PRODUCT_QLOGIC_ISP2432 << 16) | PCI_VENDOR_QLOGIC) + #define PCI_QLOGIC_ISP6312 \ ((PCI_PRODUCT_QLOGIC_ISP6312 << 16) | PCI_VENDOR_QLOGIC) @@ -400,6 +407,9 @@ case PCI_QLOGIC_ISP2422: device_set_desc(dev, "Qlogic ISP 2422 PCI FC-AL Adapter"); break; + case PCI_QLOGIC_ISP2432: + device_set_desc(dev, "Qlogic ISP 2432 PCI FC-AL Adapter"); + break; case PCI_QLOGIC_ISP6312: device_set_desc(dev, "Qlogic ISP 6312 PCI FC-AL Adapter"); break; @@ -957,7 +967,8 @@ pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] = PCI_MBOX_REGS2300_OFF; } - if (pci_get_devid(dev) == PCI_QLOGIC_ISP2422) { + if (pci_get_devid(dev) == PCI_QLOGIC_ISP2422 || + pci_get_devid(dev) == PCI_QLOGIC_ISP2432) { mdvp = &mdvec_2400; basetype = ISP_HA_FC_2400; psize = sizeof (fcparam); From owner-p4-projects@FreeBSD.ORG Sat Feb 10 03:57:46 2007 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 4ED7616A407; Sat, 10 Feb 2007 03:57:46 +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 E14DB16A400 for ; Sat, 10 Feb 2007 03:57:45 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D1D2813C441 for ; Sat, 10 Feb 2007 03:57:45 +0000 (UTC) (envelope-from mjacob@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 l1A3vjtV031567 for ; Sat, 10 Feb 2007 03:57:45 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1A3vhxi031563 for perforce@freebsd.org; Sat, 10 Feb 2007 03:57:43 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 10 Feb 2007 03:57:43 GMT Message-Id: <200702100357.l1A3vhxi031563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114338 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: Sat, 10 Feb 2007 03:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=114338 Change 114338 by mjacob@mjexp on 2007/02/10 03:56:54 IFC Affected files ... .. //depot/projects/mjexp/UPDATING#5 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#5 integrate .. //depot/projects/mjexp/etc/network.subr#4 integrate .. //depot/projects/mjexp/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/mjexp/etc/rc.d/netif#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/mjexp/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/mjexp/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/mjexp/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/mjexp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/mjexp/sbin/dhclient/clparse.c#2 integrate .. //depot/projects/mjexp/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/mjexp/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/mjexp/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/mjexp/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/mjexp/sbin/dhclient/tables.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/mjexp/sbin/mount/mount.c#5 integrate .. //depot/projects/mjexp/share/man/man4/ata.4#4 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#5 integrate .. //depot/projects/mjexp/share/man/man4/enc.4#2 integrate .. //depot/projects/mjexp/share/man/man4/icmp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/joy.4#3 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/mjexp/share/man/man4/tun.4#4 integrate .. //depot/projects/mjexp/share/man/man4/uark.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ubsa.4#3 integrate .. //depot/projects/mjexp/share/man/man5/linsysfs.5#4 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/mjexp/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/mjexp/share/man/man9/firmware.9#2 integrate .. //depot/projects/mjexp/share/man/man9/ieee80211_ioctl.9#2 integrate .. //depot/projects/mjexp/share/syscons/keymaps/hr.iso.kbd#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/mjexp/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/mjexp/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/mjexp/sys/arm/conf/EP80219#3 integrate .. //depot/projects/mjexp/sys/conf/NOTES#11 integrate .. //depot/projects/mjexp/sys/conf/files#11 integrate .. //depot/projects/mjexp/sys/conf/files.powerpc#4 integrate .. //depot/projects/mjexp/sys/conf/options#10 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/mjexp/sys/fs/cd9660/TODO#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/mjexp/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/mjexp/sys/geom/geom_apple.c#2 delete .. //depot/projects/mjexp/sys/geom/geom_gpt.c#3 delete .. //depot/projects/mjexp/sys/geom/part/g_part.c#1 branch .. //depot/projects/mjexp/sys/geom/part/g_part.h#1 branch .. //depot/projects/mjexp/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/mjexp/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/mjexp/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/mjexp/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/mjexp/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/mjexp/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/kern/kern_sig.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_switch.c#6 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#10 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#5 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/modules/geom/Makefile#5 integrate .. //depot/projects/mjexp/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/mjexp/sys/net/if_loop.c#2 integrate .. //depot/projects/mjexp/sys/net/if_tap.c#4 integrate .. //depot/projects/mjexp/sys/net/if_tun.c#5 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/mjexp/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/mjexp/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/mjexp/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/sys/_label.h#2 delete .. //depot/projects/mjexp/sys/sys/apm.h#1 branch .. //depot/projects/mjexp/sys/sys/mac.h#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#8 integrate .. //depot/projects/mjexp/sys/sys/runq.h#4 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#5 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.h#2 integrate .. //depot/projects/mjexp/sys/vm/vm_contig.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/mjexp/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/mjexp/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/mjexp/usr.bin/ctags/C.c#2 integrate .. //depot/projects/mjexp/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/mjexp/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/mjexp/usr.bin/getent/getent.c#2 integrate .. //depot/projects/mjexp/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/mjexp/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/mjexp/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#4 integrate .. //depot/projects/mjexp/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/mjexp/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/mjexp/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/pciconf.8#3 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/mjexp/usr.sbin/setfmac/setfmac.c#2 integrate Differences ... ==== //depot/projects/mjexp/UPDATING#5 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070207: + Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing + has been removed. Its functionality may be achieved by explicitly + configuring gif(4) interfaces and using the 'phyint' keyword in + mrouted.conf. + XORP does not support source-routed IPv4 multicast tunnels nor the + integrated IPIP tunneling, therefore it is not affected by this + change. The __FreeBSD_version macro has been bumped to 700030. + 20061221: Support for PCI Message Signalled Interrupts has been re-enabled in the bge driver, only for those chips which are @@ -703,4 +712,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.470 2006/12/22 03:03:31 jdp Exp $ +$FreeBSD: src/UPDATING,v 1.471 2007/02/07 16:04:11 bms Exp $ ==== //depot/projects/mjexp/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.303 2007/01/20 04:24:19 mpp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.304 2007/02/09 12:11:27 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -178,11 +178,15 @@ sppp_interfaces="" # List of sppp interfaces. #sppp_interfaces="isp0" # example: sppp over ISDN #spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'" -gif_interfaces="NO" # List of GIF tunnels (or "NO"). +gif_interfaces="" # List of GIF tunnels. #gif_interfaces="gif0 gif1" # Examples typically for a router. # Choose correct tunnel addrs. #gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router. #gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router. +fec_interfaces="" # List of Fast EtherChannels. +#fec_interfaces="fec0 fec1" +#fecconfig_fec0="fxp0 dc0" # Examples typically for two NICs +#fecconfig_fec1="em0 em1 bge0 bge1" # Examples typically for four NICs # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). ==== //depot/projects/mjexp/etc/network.subr#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ +# $FreeBSD: src/etc/network.subr,v 1.177 2007/02/09 12:11:26 flz Exp $ # # @@ -455,26 +455,89 @@ debug "Destroyed clones: ${_list}" } +# Create netgraph nodes. +# +ng_mkpeer() { + ngctl -f - 2> /dev/null </dev/null 2>&1 + ifconfig $i tunnel ${peers} + ifconfig $i up + ;; + esac + done +} + +# ng_fec_create ifn +# Configure Fast EtherChannel for interface $ifn. Returns 0 if FEC +# arguments were found and configured; returns !0 otherwise. +ng_fec_create() { + local req_iface iface bogus + req_iface="$1" + + ngctl shutdown ${req_iface}: > /dev/null 2>&1 + + bogus="" + while true; do + iface=`ng_create_one fec dummy fec` + if [ -z "${iface}" ]; then + exit 2 + fi + if [ "${iface}" = "${req_iface}" ]; then + break + fi + bogus="${bogus} ${iface}" + done + + for iface in ${bogus}; do + ngctl shutdown ${iface}: + done +} + +fec_up() { + for i in ${fec_interfaces}; do + ng_fec_create $i + for j in `get_if_var $i fecconfig_IF`; do + case ${j} in '') continue ;; *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up + ngctl msg ${i}: add_iface "\"${j}\"" ;; esac done - ;; - esac + done } # ==== //depot/projects/mjexp/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.6 2006/03/05 15:45:38 matteo Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | grep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/mjexp/etc/rc.d/netif#3 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.21 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ # # PROVIDE: netif @@ -57,6 +57,9 @@ # Create cloned interfaces clone_up + # Create Fast EtherChannel interfaces + fec_up + # Create IPv6<-->IPv4 tunnels gif_up ==== //depot/projects/mjexp/lib/libarchive/archive_read.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.28 2007/02/01 06:18:16 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.29 2007/02/05 16:30:40 cperciva Exp $"); #ifdef HAVE_ERRNO_H #include @@ -65,10 +65,8 @@ unsigned char *nulls; a = (struct archive *)malloc(sizeof(*a)); - if (a == NULL) { - archive_set_error(a, ENOMEM, "Can't allocate archive object"); + if (a == NULL) return (NULL); - } memset(a, 0, sizeof(*a)); a->user_uid = geteuid(); ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_none.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.13 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.14 2007/02/05 16:30:40 cperciva Exp $"); #include #ifdef HAVE_ERRNO_H @@ -301,7 +301,11 @@ /* * If a client_skipper was provided, try that first. */ +#if ARCHIVE_API_VERSION < 2 if ((a->client_skipper != NULL) && (request < SSIZE_MAX)) { +#else + if (a->client_skipper != NULL) { +#endif bytes_skipped = (a->client_skipper)(a, a->client_data, request); if (bytes_skipped < 0) { /* error */ @@ -333,7 +337,8 @@ if (bytes_read == 0) { /* We hit EOF before we satisfied the skip request. */ archive_set_error(a, ARCHIVE_ERRNO_MISC, - "Truncated input file (need to skip %d bytes)", (int)request); + "Truncated input file (need to skip %jd bytes)", + (intmax_t)request); return (ARCHIVE_FATAL); } assert(bytes_read >= 0); /* precondition for cast below */ ==== //depot/projects/mjexp/lib/libkvm/kvm_getswapinfo.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.26 2004/07/31 18:49:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.27 2007/02/07 17:43:10 jhb Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -49,18 +50,34 @@ #include "kvm_private.h" -#define NL_SWAPBLIST 0 -#define NL_SWDEVT 1 -#define NL_NSWDEV 2 -#define NL_DMMAX 3 +static struct nlist kvm_swap_nl[] = { + { "_swtailq" }, /* list of swap devices and sizes */ + { "_dmmax" }, /* maximum size of a swap block */ + { NULL } +}; + +#define NL_SWTAILQ 0 +#define NL_DMMAX 1 static int kvm_swap_nl_cached = 0; static int unswdev; /* number of found swap dev's */ static int dmmax; +static int kvm_getswapinfo_kvm(kvm_t *, struct kvm_swap *, int, int); static int kvm_getswapinfo_sysctl(kvm_t *, struct kvm_swap *, int, int); +static int nlist_init(kvm_t *); static int getsysctl(kvm_t *, char *, void *, size_t); +#define KREAD(kd, addr, obj) \ + (kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj)) +#define KGET(idx, var) \ + KGET2(kvm_swap_nl[(idx)].n_value, var, kvm_swap_nl[(idx)].n_name) +#define KGET2(addr, var, msg) \ + if (KREAD(kd, (u_long)(addr), (var))) { \ + _kvm_err(kd, kd->program, "cannot read %s", msg); \ + return (-1); \ + } + #define GETSWDEVNAME(dev, str, flags) \ if (dev == NODEV) { \ strlcpy(str, "[NFS swap]", sizeof(str)); \ @@ -91,8 +108,50 @@ if (ISALIVE(kd)) { return kvm_getswapinfo_sysctl(kd, swap_ary, swap_max, flags); } else { - return -1; + return kvm_getswapinfo_kvm(kd, swap_ary, swap_max, flags); + } +} + +int +kvm_getswapinfo_kvm( + kvm_t *kd, + struct kvm_swap *swap_ary, + int swap_max, + int flags +) { + int i, ttl; + TAILQ_HEAD(, swdevt) swtailq; + struct swdevt *sp, swinfo; + struct kvm_swap tot; + + if (!nlist_init(kd)) + return (-1); + + bzero(&tot, sizeof(tot)); + KGET(NL_SWTAILQ, &swtailq); + sp = TAILQ_FIRST(&swtailq); + for (i = 0; sp != NULL; i++) { + KGET2(sp, &swinfo, "swinfo"); + ttl = swinfo.sw_nblks - dmmax; + if (i < swap_max - 1) { + bzero(&swap_ary[i], sizeof(swap_ary[i])); + swap_ary[i].ksw_total = ttl; + swap_ary[i].ksw_used = swinfo.sw_used; + swap_ary[i].ksw_flags = swinfo.sw_flags; + GETSWDEVNAME(swinfo.sw_dev, swap_ary[i].ksw_devname, + flags); + } + tot.ksw_total += ttl; + tot.ksw_used += swinfo.sw_used; + sp = TAILQ_NEXT(&swinfo, sw_list); } + + if (i >= swap_max) + i = swap_max - 1; + if (i >= 0) + swap_ary[i] = tot; + + return(i); } #define GETSYSCTL(kd, name, var) \ @@ -168,6 +227,36 @@ } static int +nlist_init(kvm_t *kd) +{ + TAILQ_HEAD(, swdevt) swtailq; + struct swdevt *sp, swinfo; + + if (kvm_swap_nl_cached) + return (1); + + if (kvm_nlist(kd, kvm_swap_nl) < 0) + return (0); + + /* Required entries */ + if (kvm_swap_nl[NL_SWTAILQ].n_value == 0) { + _kvm_err(kd, kd->program, "unable to find swtailq"); + return (0); + } + + if (kvm_swap_nl[NL_DMMAX].n_value == 0) { + _kvm_err(kd, kd->program, "unable to find dmmax"); + return (0); + } + + /* Get globals, type of swap */ + KGET(NL_DMMAX, &dmmax); + + kvm_swap_nl_cached = 1; + return (1); +} + +static int getsysctl ( kvm_t *kd, char *name, ==== //depot/projects/mjexp/libexec/ftpd/ftpd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.210 2006/03/01 16:13:17 ume Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.211 2007/02/09 17:18:39 yar Exp $"); /* * FTP server. @@ -1871,20 +1871,12 @@ #ifdef TCP_NOPUSH /* * Turn off push flag to keep sender TCP from sending short packets - * at the boundaries of each write(). Should probably do a SO_SNDBUF - * to set the send buffer size as well, but that may not be desirable - * in heavy-load situations. + * at the boundaries of each write(). */ on = 1; if (setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof on) < 0) syslog(LOG_WARNING, "data setsockopt (TCP_NOPUSH): %m"); #endif -#ifdef SO_SNDBUF - on = 65536; - if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &on, sizeof on) < 0) - syslog(LOG_WARNING, "data setsockopt (SO_SNDBUF): %m"); -#endif - return (fdopen(s, mode)); bad: /* Return the real value of errno (close may change it) */ ==== //depot/projects/mjexp/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@