Date: Sun, 30 Oct 2005 19:50:23 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 86080 for review Message-ID: <200510301950.j9UJoNrW064915@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=86080 Change 86080 by rwatson@rwatson_zoo on 2005/10/30 19:50:08 Integrate netsmp; loop back solisten() change to pass new backlog to protocol. Affected files ... .. //depot/projects/netsmp/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_cm.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_var.h#3 integrate .. //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_load.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/netsmp/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#6 integrate .. //depot/projects/netsmp/src/sys/sys/protosw.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/socketvar.h#5 integrate Differences ... ==== //depot/projects/netsmp/src/sys/boot/pc98/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.38 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.39 2005/10/30 15:59:08 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -75,13 +75,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th +FILES+= screen.4th frames.4th beastie.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc +FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.52 2005/10/25 19:48:47 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.53 2005/10/30 17:23:01 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -391,7 +391,6 @@ CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, ih->ih_handler, ih->ih_argument, ih->ih_name); ih->ih_handler(ih->ih_argument); - return; } critical_exit(); ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.250 2005/10/27 04:26:35 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.251 2005/10/30 19:44:38 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" ==== //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.148 2005/09/18 10:30:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.149 2005/10/30 19:44:39 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" ==== //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.156 2005/09/23 12:41:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.157 2005/10/30 19:44:39 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/netsmp/src/sys/netatm/atm_aal5.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.21 2005/01/07 01:45:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.22 2005/10/30 19:44:39 rwatson Exp $"); #include <sys/param.h> #include <sys/lock.h> ==== //depot/projects/netsmp/src/sys/netatm/atm_cm.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.33 2005/02/21 21:58:16 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.34 2005/10/30 19:44:39 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netsmp/src/sys/netatm/atm_socket.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.24 2005/06/10 16:49:20 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.25 2005/10/30 19:44:39 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netsmp/src/sys/netatm/atm_var.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.26 2005/02/21 21:58:16 rwatson Exp $ + * @(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.27 2005/10/30 19:44:39 rwatson Exp $ * */ ==== //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_load.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.22 2005/06/10 16:49:20 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.23 2005/10/30 19:44:39 rwatson Exp $"); #ifndef ATM_IP_MODULE #include "opt_atm.h" ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.4 2005/01/07 01:45:43 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.5 2005/10/30 19:44:39 rwatson Exp $ */ #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_ ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.4 2005/01/11 01:39:53 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.5 2005/10/30 19:44:39 rwatson Exp $ */ #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_ ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.16 2005/02/21 21:58:16 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.17 2005/10/30 19:44:40 rwatson Exp $ */ #include <sys/param.h> ==== //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.17 2005/04/06 18:55:58 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.18 2005/10/30 19:44:40 rwatson Exp $ */ #include <sys/param.h> ==== //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.126 2005/08/23 14:42:40 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.127 2005/10/30 19:44:40 rwatson Exp $ */ #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/netipx/spx_usrreq.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.62 2005/02/21 21:58:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.63 2005/10/30 19:44:40 rwatson Exp $"); #include <sys/param.h> #include <sys/lock.h> ==== //depot/projects/netsmp/src/sys/sys/param.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.249 2005/10/05 23:36:19 imp Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.250 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700003 /* Master, propagated to newvers */ +#define __FreeBSD_version 700004 /* Master, propagated to newvers */ #ifndef LOCORE #include <sys/types.h> ==== //depot/projects/netsmp/src/sys/sys/protosw.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.47 2005/08/11 15:35:58 obrien Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.48 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_PROTOSW_H_ ==== //depot/projects/netsmp/src/sys/sys/socketvar.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.141 2005/07/09 12:24:40 jhb Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.142 2005/10/30 19:44:40 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510301950.j9UJoNrW064915>