From owner-cvs-src@FreeBSD.ORG  Tue Mar 28 10:16:40 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 7FDCF16A400;
	Tue, 28 Mar 2006 10:16:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F48743D46;
	Tue, 28 Mar 2006 10:16:40 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2SAGdFf011461;
	Tue, 28 Mar 2006 10:16:40 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SAGdtL011459;
	Tue, 28 Mar 2006 10:16:39 GMT (envelope-from rwatson)
Message-Id: <200603281016.k2SAGdtL011459@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 28 Mar 2006 10:16:39 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/netinet6 ipsec.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 28 Mar 2006 10:16:40 -0000

rwatson     2006-03-28 10:16:39 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet6         ipsec.c 
  Log:
  Remove manual assignment of m_pkthdr from one mbuf to another in
  ipsec_copypkt(), as this is already handled by the call to M_MOVE_PKTHDR(),
  which also knows how to correctly handle MAC m_tags.  This corrects a panic
  when running with MAC and KAME IPSEC.
  
  PR:             kern/94599
  Submitted by:   zhouyi zhou <zhouyi04 at ios dot cn>
  Reviewed by:    bz
  MFC after:      3 days
  
  Revision  Changes    Path
  1.44      +0 -9      src/sys/netinet6/ipsec.c