From owner-p4-projects@FreeBSD.ORG Wed Jul 16 12:17:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE4321065673; Wed, 16 Jul 2008 12:17:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A26A21065670 for ; Wed, 16 Jul 2008 12:17:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9818C8FC0A for ; Wed, 16 Jul 2008 12:17:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6GCH0FM042146 for ; Wed, 16 Jul 2008 12:17:00 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6GCH0Ys042144 for perforce@freebsd.org; Wed, 16 Jul 2008 12:17:00 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 16 Jul 2008 12:17:00 GMT Message-Id: <200807161217.m6GCH0Ys042144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 145324 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, 16 Jul 2008 12:17:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=145324 Change 145324 by ed@ed_dull on 2008/07/16 12:16:47 IFC my commits, related to TTY's. Affected files ... .. //depot/projects/mpsafetty/bin/stty/print.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/mpsafetty/sys/sys/ioctl_compat.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/ttycom.h#2 edit .. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#2 edit Differences ... ==== //depot/projects/mpsafetty/bin/stty/print.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.21 2008/07/16 11:20:04 ed Exp $"); #include ==== //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.231 2008/07/15 15:38:47 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.232 2008/07/16 10:55:50 rwatson Exp $"); #include "opt_ipfw.h" #include "opt_inet6.h" @@ -848,9 +848,9 @@ /* * Depending on whether or not the application has bound or connected - * the application, we may have to do varying levels of work. The - * optimal case is for a connected UDP socket, as a global lock isn't - * required. + * the socket, we may have to do varying levels of work. The optimal + * case is for a connected UDP socket, as a global lock isn't + * required at all. * * In order to decide which we need, we require stability of the * inpcb binding, which we ensure by acquiring a read lock on the ==== //depot/projects/mpsafetty/sys/sys/ioctl_compat.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ioctl_compat.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.11 2008/06/14 10:42:18 ed Exp $ + * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.12 2008/07/16 11:20:04 ed Exp $ */ #ifndef _SYS_IOCTL_COMPAT_H_ ==== //depot/projects/mpsafetty/sys/sys/ttycom.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ttycom.h 8.1 (Berkeley) 3/28/94 - * $FreeBSD: src/sys/sys/ttycom.h,v 1.26 2008/04/15 08:33:32 davidxu Exp $ + * $FreeBSD: src/sys/sys/ttycom.h,v 1.27 2008/07/16 11:23:15 ed Exp $ */ #ifndef _SYS_TTYCOM_H_ ==== //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.103 2008/05/14 00:22:57 remko Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.104 2008/07/16 11:20:04 ed Exp $"); #include #include