Date: Sun, 28 Apr 2002 20:41:50 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10432 for review Message-ID: <200204290341.g3T3foa22537@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204290341.g3T3foa22537>