From owner-p4-projects  Sun Apr 28 20:41:56 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E5ADF37B420; Sun, 28 Apr 2002 20:41:51 -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 1B08D37B419
	for <perforce@freebsd.org>; Sun, 28 Apr 2002 20:41:51 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3T3foa22537
	for perforce@freebsd.org; Sun, 28 Apr 2002 20:41:50 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 28 Apr 2002 20:41:50 -0700 (PDT)
Message-Id: <200204290341.g3T3foa22537@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 10432 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=10432

Change 10432 by rwatson@rwatson_curry on 2002/04/28 20:41:09

	Reduce spurious diff's from main tree -- probably due to mismerges
	at some point during an integ.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/net/if_stf.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/net/if_stf.c#14 (text+ko) ====

@@ -585,7 +585,7 @@
 
 	sc = (struct stf_softc *)encap_getarg(m);
 
-	if (sc == NULL) {
+	if (sc == NULL || (sc->sc_if.if_flags & IFF_UP) == 0) {
 		m_freem(m);
 		return;
 	}
@@ -596,11 +596,6 @@
 	mac_create_mbuf_from_ifnet(ifp, m);
 #endif
 
-	if (ifp->if_flags & IFF_UP) {
-		m_free(m);
-		return;
-	}
-
 	/*
 	 * perform sanity check against outer src/dst.
 	 * for source, perform ingress filter as well.

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