From owner-p4-projects@FreeBSD.ORG  Sat Jun 28 20:48:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 923861065671; Sat, 28 Jun 2008 20:48: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 540E11065670
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:48:00 +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 408D38FC12
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:48:00 +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 m5SKm0td011278
	for <perforce@FreeBSD.org>; Sat, 28 Jun 2008 20:48:00 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKm0Z7011276
	for perforce@freebsd.org; Sat, 28 Jun 2008 20:48:00 GMT
	(envelope-from gk@FreeBSD.org)
Date: Sat, 28 Jun 2008 20:48:00 GMT
Message-Id: <200806282048.m5SKm0Z7011276@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 144240 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:48:00 -0000

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

Change 144240 by gk@gk_h1 on 2008/06/28 20:47:23

	Check for tag in ipfw_check_out also.
	There is no longer need to store ethernet header in stack before passing it
	into ipfw_chk. And it's better to be avoided anyway.

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#7 edit

Differences ...

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

@@ -96,7 +96,6 @@
 	struct ng_ipfw_tag *ng_tag;
 	struct m_tag *tag_ether_hdr;
 	struct m_tag *dn_tag;
-	struct ether_header eh;
 	int ipfw = 0;
 	int divert;
 	int tee;
@@ -119,10 +118,8 @@
 
 	tag_ether_hdr = m_tag_locate(*m0, MTAG_ETHER, MTAG_ETHER_HEADER,
 	    NULL);
-	if (tag_ether_hdr != NULL) {
-		eh = *(struct ether_header *)(tag_ether_hdr + 1);
-		args.eh = &eh;
-	}
+	if (tag_ether_hdr != NULL)
+		args.eh = (struct ether_header *)(tag_ether_hdr + 1);
 
 again:
 	dn_tag = m_tag_find(*m0, PACKET_TAG_DUMMYNET, NULL);
@@ -225,6 +222,7 @@
 {
 	struct ip_fw_args args;
 	struct ng_ipfw_tag *ng_tag;
+	struct m_tag *tag_ether_hdr;
 	struct m_tag *dn_tag;
 	int ipfw = 0;
 	int divert;
@@ -246,6 +244,11 @@
 		m_tag_delete(*m0, (struct m_tag *)ng_tag);
 	}
 
+	tag_ether_hdr = m_tag_locate(*m0, MTAG_ETHER, MTAG_ETHER_HEADER,
+	    NULL);
+	if (tag_ether_hdr != NULL)
+		args.eh = (struct ether_header *)(tag_ether_hdr + 1);
+
 again:
 	dn_tag = m_tag_find(*m0, PACKET_TAG_DUMMYNET, NULL);
 	if (dn_tag != NULL) {