From owner-p4-projects  Tue Apr 30 23:36:12 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36C9837B417; Tue, 30 Apr 2002 23:35:54 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id D187B37B433
	for <perforce@freebsd.org>; Tue, 30 Apr 2002 23:35:43 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g416ZhH86336
	for perforce@freebsd.org; Tue, 30 Apr 2002 23:35:43 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Apr 2002 23:35:43 -0700 (PDT)
Message-Id: <200205010635.g416ZhH86336@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 10571 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10571

Change 10571 by peter@peter_daintree on 2002/04/30 23:35:02

	IFC @10570  (I botched something last time)

Affected files ...

... //depot/projects/ia64/sys/alpha/alpha/mem.c#3 integrate
... //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#3 integrate
... //depot/projects/ia64/sys/net/if_spppsubr.c#4 integrate
... //depot/projects/ia64/sys/netinet/ip_fw.c#6 integrate

Differences ...

==== //depot/projects/ia64/sys/alpha/alpha/mem.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.39 2002/02/27 18:31:35 jhb Exp $
+ * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.40 2002/05/01 06:24:51 peter Exp $
  */
 
 /*
@@ -59,8 +59,6 @@
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 
-#include <machine/frame.h>
-#include <machine/psl.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif

==== //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.4 2002/05/01 03:07:40 obrien Exp $
+# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.5 2002/05/01 03:52:40 obrien Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
@@ -62,5 +62,5 @@
 
 METHOD u_int32_t setrecsrc {
 	struct snd_mixer *m;
-	u_int32_t src
+	u_int32_t src;
 };

==== //depot/projects/ia64/sys/net/if_spppsubr.c#4 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.92 2002/04/04 21:03:28 jhb Exp $
+ * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.93 2002/05/01 04:18:36 obrien Exp $
  */
 
 #include <sys/param.h>
@@ -5029,7 +5029,7 @@
 	}
 
 	switch (subcmd) {
-	case SPPPIOGDEFS:
+	case (int)SPPPIOGDEFS:
 		if (cmd != SIOCGIFGENERIC) {
 			rv = EINVAL;
 			break;
@@ -5064,7 +5064,7 @@
 			     sizeof(struct spppreq));
 		break;
 
-	case SPPPIOSDEFS:
+	case (int)SPPPIOSDEFS:
 		if (cmd != SIOCSIFGENERIC) {
 			rv = EINVAL;
 			break;

==== //depot/projects/ia64/sys/netinet/ip_fw.c#6 (text+ko) ====

@@ -13,7 +13,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.183 2002/02/27 18:32:17 jhb Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.184 2002/05/01 06:29:16 cjc Exp $
  */
 
 #define        DEB(x)
@@ -1470,8 +1470,12 @@
 			break;
 
 bogusfrag:
-		if (fw_verbose && ip != NULL)
-			ipfw_report(NULL, ip, offset, ip_len, rif, oif);
+		if (fw_verbose) {
+			if (ip != NULL)
+				ipfw_report(NULL, ip, offset, ip_len, rif, oif);
+			else
+				printf("pullup failed\n");
+		}
 		goto dropit;
 
 		}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message