From owner-p4-projects@FreeBSD.ORG  Sat Jun 28 20:37:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D80F1065673; Sat, 28 Jun 2008 20:37:50 +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 D38E2106566C
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:37:49 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BFE9A8FC15
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:37:49 +0000 (UTC)
	(envelope-from gk@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 m5SKbnlY001232
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:37:49 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKbnCX001230
	for perforce@freebsd.org; Sat, 28 Jun 2008 20:37:49 GMT
	(envelope-from gk@FreeBSD.org)
Date: Sat, 28 Jun 2008 20:37:49 GMT
Message-Id: <200806282037.m5SKbnCX001230@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 144238 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2008 20:37:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=144238

Change 144238 by gk@gk_h1 on 2008/06/28 20:37:47

	Include opt_ipfw.h before checking IPFIREWALL define. Without this fix
	previous revision was nop.
	Remove stale XXX comment.

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#7 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#7 (text+ko) ====

@@ -79,6 +79,7 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipfw.h"
 #include "opt_carp.h"
 
 #include <sys/param.h>
@@ -2951,7 +2952,6 @@
 	if (((bifp ? bifp->if_flags : 0) | (ifp ? ifp->if_flags : 0)) & IFF_L2TAG) {
 		mtag_ether_header = m_tag_locate(*mp, MTAG_ETHER, MTAG_ETHER_HEADER,
 		    NULL);
-		/* XXX ??? can packet be tagged by another interface */
 		if (mtag_ether_header == NULL) {
 			mtag_ether_header = m_tag_alloc(MTAG_ETHER, MTAG_ETHER_HEADER,
 					ETHER_HDR_LEN, M_NOWAIT);