From owner-svn-src-stable@FreeBSD.ORG  Wed Apr 25 09:56:36 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3CA5D106564A;
	Wed, 25 Apr 2012 09:56:36 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 270BC8FC1F;
	Wed, 25 Apr 2012 09:56:36 +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 q3P9uaOV090716;
	Wed, 25 Apr 2012 09:56:36 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3P9uZZr090714;
	Wed, 25 Apr 2012 09:56:35 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201204250956.q3P9uZZr090714@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Wed, 25 Apr 2012 09:56:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234682 - stable/8/sys/netgraph
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2012 09:56:36 -0000

Author: melifaro
Date: Wed Apr 25 09:56:35 2012
New Revision: 234682
URL: http://svn.freebsd.org/changeset/base/234682

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

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

Modified: stable/8/sys/netgraph/ng_patch.c
==============================================================================
--- stable/8/sys/netgraph/ng_patch.c	Wed Apr 25 09:55:34 2012	(r234681)
+++ stable/8/sys/netgraph/ng_patch.c	Wed Apr 25 09:56:35 2012	(r234682)
@@ -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;