From owner-svn-src-all@FreeBSD.ORG  Wed Apr 25 12:02:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6494B1065674;
	Wed, 25 Apr 2012 12:02:07 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F3E48FC25;
	Wed, 25 Apr 2012 12:02:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3PC27Pt097589;
	Wed, 25 Apr 2012 12:02:07 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3PC27qc097587;
	Wed, 25 Apr 2012 12:02:07 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201204251202.q3PC27qc097587@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 25 Apr 2012 12:02:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234683 - stable/7/sys/netgraph
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2012 12:02:07 -0000

Author: ae
Date: Wed Apr 25 12:02:06 2012
New Revision: 234683
URL: http://svn.freebsd.org/changeset/base/234683

Log:
  MFC r234574 (by melifaro):
    Fix panic in ng_patch(4) caused by checksum flags being added to mbuf flags.
  
    Tested by:        Maxim Ignatenko <gelraen.ua@gmail.com>

Modified:
  stable/7/sys/netgraph/ng_patch.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/netgraph/ng_patch.c
==============================================================================
--- stable/7/sys/netgraph/ng_patch.c	Wed Apr 25 09:56:35 2012	(r234682)
+++ stable/7/sys/netgraph/ng_patch.c	Wed Apr 25 12:02:06 2012	(r234683)
@@ -517,7 +517,7 @@ ng_patch_rcvdata(hook_p hook, item_p ite
 			return (ENOMEM);
 		}
 		do_patch(priv, m);
-		m->m_flags |= priv->config->csum_flags;
+		m->m_pkthdr.csum_flags |= priv->config->csum_flags;
 	}
 
 	target = NULL;