From owner-cvs-src@FreeBSD.ORG  Sun Nov 23 19:57:05 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C7E5216A4D0; Sun, 23 Nov 2003 19:57:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6018143FF5; Sun, 23 Nov 2003 19:57:04 -0800 (PST)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAO3v4XJ052127;
	Sun, 23 Nov 2003 19:57:04 -0800 (PST)
	(envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAO3v3d3052126;
	Sun, 23 Nov 2003 19:57:03 -0800 (PST)
	(envelope-from sam)
Message-Id: <200311240357.hAO3v3d3052126@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 23 Nov 2003 19:57:03 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet ip_fw2.c src/sys/sys mbuf.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Nov 2003 03:57:06 -0000

sam         2003/11/23 19:57:03 PST

  FreeBSD src repository

  Modified files:
    sys/netinet          ip_fw2.c 
    sys/sys              mbuf.h 
  Log:
  Correct a problem where ipfw-generated packets were being returned
  for ipfw processing w/o an indication the packets were generated
  by ipfw--and so should not be processed (this manifested itself
  as a LOR.)  The flag bit in the mbuf that was used to mark the
  packets was not listed in M_COPYFLAGS so if a packet had a header
  prepended (as done by IPsec) the flag was lost.  Correct this by
  defining a new M_PROTO6 flag and use it to mark packets that need
  this processing.
  
  Reviewed by:    bms
  Approved by:    re (rwatson)
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.49      +9 -5      src/sys/netinet/ip_fw2.c
  1.128     +3 -2      src/sys/sys/mbuf.h